diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:40:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:40:54 +0000 |
| commit | dffd44fab9ebc557b9538d4035801b6493057461 (patch) | |
| tree | cefadb8fb6f9657b7f97b3b6dab9525e2006d32a /debian | |
| parent | Releasing progress-linux version 125.0.1-1~progress7.99u1. (diff) | |
| download | firefox-dffd44fab9ebc557b9538d4035801b6493057461.tar.xz firefox-dffd44fab9ebc557b9538d4035801b6493057461.zip | |
Merging debian version 125.0.1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/browser.install.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/debian/browser.install.in b/debian/browser.install.in index 7d9fe9a82c..965812d22f 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 31b5745936..9b8653c34b 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 <glandium@debian.org> Thu, 18 Apr 2024 09:47:44 +0900 + firefox (125.0.1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/rules b/debian/rules index 625f326b92..b5514f5484 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 $@ |