mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 05:33:03 -05:00
Merge branch 'jxl' into 'main'
Allow JXL in non-nightly builds See merge request librewolf-community/browser/source!47
This commit is contained in:
commit
653df8e8fb
6 changed files with 36 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
30
patches/allow-JXL-in-non-nightly-browser.patch
Normal file
30
patches/allow-JXL-in-non-nightly-browser.patch
Normal 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
|
||||
|
Loading…
Reference in a new issue