Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

8 changed files with 9 additions and 113 deletions

View File

@ -1,4 +0,0 @@
mtime: 1736604926
commit: 0cab574f27973c9eb4aa885d2073ff343a07b33a407ba8a92b1ba2e765a49f14
url: https://src.opensuse.org/jengelh/libjxl
revision: master

View File

@ -1 +1 @@
libjxl0_11
libjxl0_10

View File

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

View File

@ -1,49 +1,3 @@
-------------------------------------------------------------------
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>

View File

@ -1,5 +1,5 @@
#
# spec file for package libjxl-gtk
# spec file for package libjxl
#
# Copyright (c) 2024 SUSE LLC
#
@ -16,12 +16,7 @@
#
%define lname libjxl0_11
%if "@BUILD_FLAVOR@" == "gtk" && 0%{?is_opensuse}
%bcond_without gimp
%else
%bcond_with gimp
%endif
%define lname libjxl0_10
%if "@BUILD_FLAVOR@" == "gtk"
Name: libjxl-gtk
%bcond_without gtk
@ -29,7 +24,7 @@ Name: libjxl-gtk
Name: libjxl
%bcond_with gtk
%endif
Version: 0.11.1
Version: 0.10.2
Release: 0
Summary: JPEG XL reference implementation
License: BSD-3-Clause
@ -38,23 +33,17 @@ 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
BuildRequires: pkg-config
%if %{with gtk}
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.36
%if %{with gimp}
BuildRequires: pkgconfig(gimp-2.0) >= 2.10
BuildRequires: pkgconfig(gimpui-2.0) >= 2.10
%endif
%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)
@ -63,9 +52,6 @@ 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
@ -126,22 +112,17 @@ This package provides a thumbnailer to render for JPEG XL file thumbnails,
for example, on file-browsers.
%prep
%autosetup -n libjxl-%version -a2 -p1
%setup -n libjxl-%version -a2
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=ON
-DJPEGXL_ENABLE_JPEGLI=OFF
%cmake_build
%install
@ -167,7 +148,6 @@ rm -Rf "$b/%_libdir"/libjxl* "$b/%_bindir" "$b/%_includedir" "$b/%_libdir/pkgcon
%_libdir/libjxl*.so.*
%files tools
%_bindir/?jpegli
%_bindir/*xl*
%_mandir/man*/*xl*
@ -182,10 +162,8 @@ rm -Rf "$b/%_libdir"/libjxl* "$b/%_bindir" "$b/%_includedir" "$b/%_libdir/pkgcon
%_datadir/mime/packages/*
%_libdir/gdk-pixbuf-2.0/*/loaders/libpixbufloader-jxl.so
%if %{with gimp}
%files -n gimp-plugin-jxl
%_libdir/gimp/2.0/plug-ins/file-jxl/
%endif
%files -n jxl-thumbnailer
%dir %_datadir/thumbnailers

View File

@ -1,29 +0,0 @@
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}")

3
v0.10.2.tar.gz Normal file
View File

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

BIN
v0.11.1.tar.gz (Stored with Git LFS)

Binary file not shown.