diff --git a/libjxl.changes b/libjxl.changes index 376beaa..4a3551a 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Aug 30 11:16:35 UTC 2024 - Cliff Zhao + +- 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 + +- 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 + +- Enable cjpegli, djpegli tools +- Add system-jpeg.diff + ------------------------------------------------------------------- Fri Mar 8 10:49:26 UTC 2024 - Jan Engelhardt diff --git a/libjxl.spec b/libjxl.spec index 2f7d9c0..8791b26 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -1,5 +1,5 @@ # -# spec file for package libjxl +# spec file for package libjxl-gtk # # Copyright (c) 2024 SUSE LLC # @@ -24,7 +24,7 @@ Name: libjxl-gtk Name: libjxl %bcond_with gtk %endif -Version: 0.10.2 +Version: 0.10.3 Release: 0 Summary: JPEG XL reference implementation License: BSD-3-Clause @@ -33,6 +33,7 @@ URL: https://jpegxl.info/ Source: https://github.com/libjxl/libjxl/archive/refs/tags/v%version.tar.gz Source1: baselibs.conf Source2: skcms.tar +Patch1: system-jpeg.diff BuildRequires: asciidoc BuildRequires: c++_compiler BuildRequires: cmake @@ -52,6 +53,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 @@ -112,17 +116,22 @@ This package provides a thumbnailer to render for JPEG XL file thumbnails, for example, on file-browsers. %prep -%setup -n libjxl-%version -a2 +%autosetup -n libjxl-%version -a2 -p1 mv skcms third_party/ %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* diff --git a/system-jpeg.diff b/system-jpeg.diff new file mode 100644 index 0000000..3a2d05b --- /dev/null +++ b/system-jpeg.diff @@ -0,0 +1,29 @@ +From: Jan Engelhardt +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}") diff --git a/v0.10.2.tar.gz b/v0.10.2.tar.gz deleted file mode 100644 index 92a4920..0000000 --- a/v0.10.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91 -size 1912303 diff --git a/v0.10.3.tar.gz b/v0.10.3.tar.gz new file mode 100644 index 0000000..70f6158 --- /dev/null +++ b/v0.10.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0191411cfcd927eebe5392d030fe4283fe27ba1685ab7265104936e0b4283a6 +size 1912351