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/rules | |
| 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/rules')
| -rwxr-xr-x | debian/rules | 5 |
1 files changed, 1 insertions, 4 deletions
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 $@ |