Subject: [PATCH 1/2] Bug 1539075 - Disable nightly requirement for JPEG XL and enable it by default. r?tnikkel,saschanaz

From: Robert-André Mauchin <[email-masked]>
Date: Fri, 10 May 2024 13:50:30 +0200

---
 modules/libpref/init/StaticPrefList.yaml | 4 ++++
 toolkit/moz.configure                    | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index f3c7eb14d9c2c..78dc4bf5ce108 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -7175,7 +7175,11 @@
 # Whether we attempt to decode JXL images or not.
 - name: image.jxl.enabled
   type: RelaxedAtomicBool
+#if defined(MOZ_JXL)
+  value: true
+#else
   value: false
+#endif
   mirror: always
 
 #---------------------------------------------------------------------------
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 6ad16dc1b7c1f..c02c2d9e97131 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -769,9 +769,9 @@ 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("--enable-jxl")
+def jxl(value):
+    if value:
         return True

-- 
2.44.0