Delete URL of Source2

googlesource.com archives are completely unstable even in short
timespans (26 minutes) and untrackable.

$ diff -u <(head -n1 b2e69.tar.gz_v1) <(head -n1 b2e69.tar.gz_v2)
-./PaxHeaders.X/.bazelrc0100644 0000000 0000000 00000000034 15147411356 013733 xustar000000000 0000000 28 mtime=1771967214.3860000
+./PaxHeaders.X/.bazelrc0100644 0000000 0000000 00000000034 15147414554 013736 xustar000000000 0000000 28 mtime=1771968876.2230000

baselibs.conf

@@ -1 +1 @@
-libjxl0_10
+libjxl0_11

libjxl.changes

@@ -1,3 +1,72 @@
+-------------------------------------------------------------------
+Wed Feb 11 12:04:04 UTC 2026 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.11.2
+  * Fix tile dimension in low memory rendering pipeline
+  * Fix number of channels for gray-to-gray color transform
+    [CVE-2026-1837]
+  * djxl: reject decoding JXL files if "packed" representation size
+    overflows size_t
+
+-------------------------------------------------------------------
+Wed Jan 22 17:29:34 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Remove the gimp plugin. It is for 2.10, and factory now has gimp
+  3.0.
+
+-------------------------------------------------------------------
+Wed Jan 22 15:56:09 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Always require lcms2 for the gtk build. It is needed when
+  building plugins, and, if gimp is disabled, it needs to be
+  specified explicitly.
+
+-------------------------------------------------------------------
+Fri Jan 10 21:34:13 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Disable gimp plugin on SLFO. Gimp is currently unavailable there.
+- Re-add lcms2 dependency for s390x. It is used instead of skcms
+  on big-endian architectures.
+
+-------------------------------------------------------------------
+Tue Nov 26 20:55:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.11.1 (boo#1233763 boo#1233785)
+  * Huffman lookup table size fix [CVE-2024-11403]
+  * Check height limit in modular trees [CVE-2024-11498]
+
+-------------------------------------------------------------------
+Fri Sep 13 11:48:46 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.11.0
+  * Added Gain Map API: ``JxlGainMapBundle`` struct and API
+    functions to read and write gain map
+    ``bundlesJxlGainMapWriteBundle`` and ``JxlGainMapReadBundle``
+    as well as handling compressed ICC profiles:
+    ``JxlICCProfileEncode`` and ``JxlICCProfileDecode``.
+  * Decoder API: added ``JXL_DEC_BOX_COMPLETE`` event to signal
+    that the output buffer for the current box has received all
+    contents.
+
+-------------------------------------------------------------------
+Fri Aug 30 11:16:35 UTC 2024 - Cliff Zhao <qzhao@suse.com>
+
+- Update libjxl.spec:
+  Add compiler condition to fix SLE-15-SP7 ppc64le build env.
+  (bsc#1229831)
+
+-------------------------------------------------------------------
+Sat Jun 29 03:56:34 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.10.3
+  * fix bug in huffman-rle-gradient (e1) specialized decode path
+
+-------------------------------------------------------------------
+Thu Jun 20 21:01:12 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Enable cjpegli, djpegli tools
+- Add system-jpeg.diff
+
 -------------------------------------------------------------------
 Fri Mar  8 10:49:26 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

libjxl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libjxl
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define lname   libjxl0_10
+%define lname   libjxl0_11
 %if "@BUILD_FLAVOR@" == "gtk"
 Name:           libjxl-gtk
 %bcond_without gtk
@@ -24,7 +24,7 @@ Name:           libjxl-gtk
 Name:           libjxl
 %bcond_with gtk
 %endif
-Version:        0.10.2
+Version:        0.11.2
 Release:        0
 Summary:        JPEG XL reference implementation
 License:        BSD-3-Clause
@@ -32,18 +32,24 @@ URL:            https://jpegxl.info/
 #Git-Clone:     https://github.com/libjxl/libjxl
 Source:         https://github.com/libjxl/libjxl/archive/refs/tags/v%version.tar.gz
 Source1:        baselibs.conf
-Source2:        skcms.tar
+# `git ls-tree <jxl_tag> third_party/skcms` gives the SKCMS revision needed for a particular libjxl release
+%define skcms_commit b2e692629c1fb19342517d7fb61f1cf83d075492
+#changes-too-damn-often: https://skia.googlesource.com/skcms/+archive/%skcms_commit.tar.gz
+Source2:        %skcms_commit.tar.gz
+Patch1:         system-jpeg.diff
 BuildRequires:  asciidoc
 BuildRequires:  c++_compiler
 BuildRequires:  cmake
 BuildRequires:  pkg-config
 %if %{with gtk}
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.36
-BuildRequires:  pkgconfig(gimp-2.0) >= 2.10
-BuildRequires:  pkgconfig(gimpui-2.0) >= 2.10
+BuildRequires:  pkgconfig(lcms2) >= 2.12
 %endif
 BuildRequires:  giflib-devel >= 5.1
 BuildRequires:  pkgconfig(OpenEXR)
+%ifarch s390x
+BuildRequires:  pkgconfig(lcms2) >= 2.12
+%endif
 BuildRequires:  pkgconfig(libavif)
 BuildRequires:  pkgconfig(libbrotlicommon)
 BuildRequires:  pkgconfig(libbrotlidec)
@@ -52,6 +58,9 @@ BuildRequires:  pkgconfig(libhwy) >= 1.0.7
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libwebp)
+%if 0%{?sle_version} == 150700
+BuildRequires:  gcc10-c++
+%endif
 %{?suse_build_hwcaps_libs}
 %if %{with gtk}
 Provides:       bundled(skcms) = 0
@@ -96,13 +105,6 @@ Supplements:    (%lname and gdk-pixbuf)
 %description -n gdk-pixbuf-loader-jxl
 This package provides a libjxl-based gdk-pixbuf loader for JPEG XL files.
 
-%package -n gimp-plugin-jxl
-Summary:        Plugin for GIMP to enable working with JPEG XL files
-Supplements:    (%lname and gimp)
-
-%description -n gimp-plugin-jxl
-This package provides a plugin for GIMP 2.0 to enable it to work with JPEG XL files.
-
 %package -n jxl-thumbnailer
 Summary:        Generate thumbnails for JPEG XL files
 BuildArch:      noarch
@@ -112,17 +114,24 @@ This package provides a thumbnailer to render for JPEG XL file thumbnails,
 for example, on file-browsers.
 
 %prep
-%setup -n libjxl-%version -a2
-mv skcms third_party/
+%autosetup -n libjxl-%version -p1
+# can't use %%autosetup -a2 because archive has no leading path
+mkdir -p third_party/skcms/
+tar -xf %{SOURCE2} -C third_party/skcms/
 
 %build
+%if 0%{?sle_version} == 150700
+export CC=gcc-10
+export CXX=g++-10
+%endif
+
 %cmake -DJPEGXL_FORCE_SYSTEM_HWY=ON -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
 	-DJPEGXL_FORCE_SYSTEM_LCMS2=OFF -DBUILD_TESTING=OFF \
 %if %{with gtk}
 	-DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_ENABLE_SKCMS=ON \
 %endif
 	-DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-	-DJPEGXL_ENABLE_JPEGLI=OFF
+	-DJPEGXL_ENABLE_JPEGLI=ON
 %cmake_build
 
 %install
@@ -148,6 +157,7 @@ rm -Rf "$b/%_libdir"/libjxl* "$b/%_bindir" "$b/%_includedir" "$b/%_libdir/pkgcon
 %_libdir/libjxl*.so.*
 
 %files tools
+%_bindir/?jpegli
 %_bindir/*xl*
 %_mandir/man*/*xl*
 
@@ -162,9 +172,6 @@ rm -Rf "$b/%_libdir"/libjxl* "$b/%_bindir" "$b/%_includedir" "$b/%_libdir/pkgcon
 %_datadir/mime/packages/*
 %_libdir/gdk-pixbuf-2.0/*/loaders/libpixbufloader-jxl.so
 
-%files -n gimp-plugin-jxl
-%_libdir/gimp/2.0/plug-ins/file-jxl/
-
 %files -n jxl-thumbnailer
 %dir %_datadir/thumbnailers
 %_datadir/thumbnailers/*.thumbnailer

skcms.tar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8335d994cd09b5a8456e6cd9f3ac94933337925aa918d525d91ee0ef4b732212
-size 14899200

system-jpeg.diff

@@ -0,0 +1,29 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2024-06-20 23:00:14.684111062 +0200
+
+There are many legit reasons to depend on bundled software, but this ain't one of them!
+
+---
+ lib/jpegli.cmake |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+Index: libjxl-0.10.2/lib/jpegli.cmake
+===================================================================
+--- libjxl-0.10.2.orig/lib/jpegli.cmake
++++ libjxl-0.10.2/lib/jpegli.cmake
+@@ -23,12 +23,9 @@ elseif(JPEGLI_LIBJPEG_LIBRARY_SOVERSION
+   set(JPEG_LIB_VERSION 80)
+ endif()
+ 
+-configure_file(
+-  ../third_party/libjpeg-turbo/jconfig.h.in include/jpegli/jconfig.h)
+-configure_file(
+-  ../third_party/libjpeg-turbo/jpeglib.h include/jpegli/jpeglib.h COPYONLY)
+-configure_file(
+-  ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY)
++configure_file(/usr/include/jconfig.h include/jpegli/jconfig.h)
++configure_file(/usr/include/jpeglib.h include/jpegli/jpeglib.h COPYONLY)
++configure_file(/usr/include/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY)
+ 
+ add_library(jpegli-static STATIC EXCLUDE_FROM_ALL "${JPEGXL_INTERNAL_JPEGLI_SOURCES}")
+ target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")

v0.10.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91
-size 1912303