v107.0; add jxl patch and enable it

This commit is contained in:
ohfp 2022-11-16 12:41:31 +01:00
parent 69e0b71cdf
commit 8b0b13b8be
3 changed files with 37 additions and 4 deletions

View file

@ -0,0 +1,30 @@
From 55d449fbb8855ce34c047a4b031f0bd1d9f782e8 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Wed, 16 Nov 2022 09:53:57 +0100
Subject: [PATCH] allow JXL in non nightly browser
---
toolkit/moz.configure | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index c99b4d628c54..0b1b1614620a 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -703,9 +703,10 @@ set_define("MOZ_AV1", av1)
option("--disable-jxl", help="Disable jxl image support")
-@depends("--disable-jxl", milestone.is_nightly)
-def jxl(value, is_nightly):
- if is_nightly and value:
+@depends("--disable-jxl")
+def jxl(value):
+ enabled = bool(value)
+ if enabled:
return True
--
2.38.1

View file

@ -89,6 +89,9 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
# required for 95.0 for now, it seems
ac_add_options --without-wasm-sandboxed-libraries
# experimental JXL support
ac_add_options --enable-jxl
END
# allow setting limited resource usage via ENV / CI:
@ -116,9 +119,6 @@ END
export LDFLAGS+=" -Wl,--no-keep-memory -Wl"
# libav related aarch64 build failure
wget https://github.com/mozilla/gecko-dev/commit/60858bce4bb1b426c07ec0e9e7f627f59b8aca45.patch -O "${_PATCHES_DIR}/aarch64_libav.patch"
patch -Np1 -i "${_PATCHES_DIR}/aarch64_libav.patch"
else
cat >>${CI_PROJECT_DIR}/mozconfig <<END
# ubuntu seems to recommend this
@ -147,6 +147,9 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
# might make the build just a tiny bit cleaner, not really required though
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
# experimental: allow enabling JPEG XL in non-nightly browser
patch -Np1 -i ${CI_PROJECT_DIR}/0001-allow-JXL-in-non-nightly-browser.patch
# Remove some pre-installed addons that might be questionable
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch

View file

@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
_SETTINGS_TAG=${SETTINGS_TAG:-'7.2-hotfix'}
_SETTINGS_TAG=${SETTINGS_TAG:-'486637e9dfd1352e427e73eef354d22bfbd026f5'}
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball