From efbf625b6208d406b5b391dec93a8cf58325aefb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:40:45 +0200 Subject: Adding debian version 125.0.1-2. Signed-off-by: Daniel Baumann --- debian/browser.install.in | 2 -- debian/changelog | 7 +++++++ debian/rules | 5 +---- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/browser.install.in b/debian/browser.install.in index e9ef2760a8..24bce1971a 100644 --- a/debian/browser.install.in +++ b/debian/browser.install.in @@ -29,10 +29,8 @@ usr/lib/@browser@/libreplace_jemalloc.so usr/lib/@browser@/libmozgtk.so usr/lib/@browser@/libmozwayland.so usr/lib/@browser@/liblgpllibs.so -%if MOZ_FFVPX usr/lib/@browser@/libmozavcodec.so usr/lib/@browser@/libmozavutil.so -%endif %if DEB_HOST_ARCH == i386 || DEB_HOST_ARCH == amd64 || DEB_HOST_ARCH == arm64 || DEB_HOST_ARCH == armhf || DEB_HOST_ARCH == armel usr/lib/@browser@/libmozsandbox.so %endif diff --git a/debian/changelog b/debian/changelog index e5a53fb21f..de495e44e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +firefox (125.0.1-2) unstable; urgency=medium + + * debian/browser.install.in, debian/rules: Install libmozav*.so on all + archs. + + -- Mike Hommey Thu, 18 Apr 2024 09:47:44 +0900 + firefox (125.0.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/rules b/debian/rules index be8cbf1f0b..15b0396129 100755 --- a/debian/rules +++ b/debian/rules @@ -122,9 +122,6 @@ endif ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) CONFIGURE_FLAGS += --enable-debug endif -ifneq (,$(filter %i386 %amd64 armel armhf arm64,$(DEB_HOST_ARCH))) - MOZ_FFVPX = 1 -endif ifneq (,$(filter armel armhf arm64 riscv64,$(DEB_HOST_ARCH))) MOZ_ENABLE_V4L2 = 1 endif @@ -180,7 +177,7 @@ debian/l10n/$(PRODUCT)-l10n.control: %: %.in $(call lazy,LIBAVCODEC,$$(shell awk -F\" '/libavcodec\.so\./ { sub(/libavcodec\.so\./,"", $$$$2); p = "libavcodec" $$$$2 " | libavcodec-extra" $$$$2; if (d) { d = d " | " p } else { d = p } } END { print d }' dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp)) -$(PREPROCESSED_FILES): VARS = GRE_VERSION PRODUCT_DOWNLOAD_NAME $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST TRANSITION MOZ_FFVPX MOZ_ENABLE_V4L2 CRASH_REPORTER DEB_HOST_ARCH +$(PREPROCESSED_FILES): VARS = GRE_VERSION PRODUCT_DOWNLOAD_NAME $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST TRANSITION MOZ_ENABLE_V4L2 CRASH_REPORTER DEB_HOST_ARCH debian/control: VARS += L10N_PACKAGES_DEPS PRODUCT LIBAVCODEC $(PREPROCESSED_FILES): MOZ_OBJDIR=debian/objdir MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $(PYTHON) ./mach python python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< -o $@ -- cgit v1.2.3