pool/libjxl
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1182024 from graphics

Browse Source 
- Enable cjpegli, djpegli tools
- Add system-jpeg.diff

OBS-URL: https://build.opensuse.org/request/show/1182024
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libjxl?expand=0&rev=17
This commit is contained in:
Ana Guerrero 2024-06-22 11:22:49 +00:00 committed by Git OBS Bridge
commit 7fa6c7264b
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjxl.changes
View File

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

6
libjxl.spec
View File

@ -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
@ -112,7 +113,7 @@ 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
@ -122,7 +123,7 @@ mv skcms third_party/
-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 +149,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*

29
system-jpeg.diff Normal file
View File

@ -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}")