From 31cac1da081d526ea96e7bc6952720bc2b0d4e34 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Fri, 2 Dec 2022 17:45:49 +0000 Subject: [PATCH] Allow JXL in non-nightly builds --- assets/mozconfig.new | 1 + assets/mozconfig.new.without-bootstrap | 1 + assets/mozconfig.sample.1 | 1 + assets/mozconfig.windows | 2 ++ assets/patches.txt | 1 + .../allow-JXL-in-non-nightly-browser.patch | 30 +++++++++++++++++++ 6 files changed, 36 insertions(+) create mode 100644 patches/allow-JXL-in-non-nightly-browser.patch diff --git a/assets/mozconfig.new b/assets/mozconfig.new index b35f829..1952f10 100644 --- a/assets/mozconfig.new +++ b/assets/mozconfig.new @@ -7,6 +7,7 @@ ac_add_options --disable-default-browser-agent ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-hardening +ac_add_options --enable-jxl ac_add_options --enable-optimize ac_add_options --enable-release ac_add_options --enable-rust-simd diff --git a/assets/mozconfig.new.without-bootstrap b/assets/mozconfig.new.without-bootstrap index eb25f31..f2442f0 100644 --- a/assets/mozconfig.new.without-bootstrap +++ b/assets/mozconfig.new.without-bootstrap @@ -7,6 +7,7 @@ ac_add_options --disable-default-browser-agent ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-hardening +ac_add_options --enable-jxl ac_add_options --enable-optimize ac_add_options --enable-release ac_add_options --enable-rust-simd diff --git a/assets/mozconfig.sample.1 b/assets/mozconfig.sample.1 index 3592a43..baf50a0 100644 --- a/assets/mozconfig.sample.1 +++ b/assets/mozconfig.sample.1 @@ -15,6 +15,7 @@ ac_add_options --disable-default-browser-agent ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-hardening +ac_add_options --enable-jxl ac_add_options --enable-optimize ac_add_options --enable-release ac_add_options --enable-rust-simd diff --git a/assets/mozconfig.windows b/assets/mozconfig.windows index 408a784..31edb3f 100644 --- a/assets/mozconfig.windows +++ b/assets/mozconfig.windows @@ -5,6 +5,8 @@ ac_add_options --disable-tests ac_add_options --enable-release ac_add_options --enable-hardening +ac_add_options --enable-jxl + ac_add_options --disable-debug #ac_add_options --enable-debug diff --git a/assets/patches.txt b/assets/patches.txt index ab758d1..47eab5b 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -1,4 +1,5 @@ patches/allow-ubo-private-mode.patch +patches/allow-JXL-in-non-nightly-browser.patch patches/bootstrap-without-vcs.patch patches/context-menu.patch patches/custom-ubo-assets-bootstrap-location.patch diff --git a/patches/allow-JXL-in-non-nightly-browser.patch b/patches/allow-JXL-in-non-nightly-browser.patch new file mode 100644 index 0000000..df6de42 --- /dev/null +++ b/patches/allow-JXL-in-non-nightly-browser.patch @@ -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 +