diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 4738cb9..e8e63f0 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1725435535 -commit: 8ffd1acb5c33d96dc84027e35083d2ad9e5d9d9eef1019198827ff0c512bb42c +mtime: 1725435714 +commit: 805ed64ff6380a7813ecab1474879bc2f84a519eeda6b4974e69ec85e36d5751 url: https://src.opensuse.org/jengelh/libjxl revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 83eb2d3..9a8c01c 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31a908c151b7d0738ee5ecf513a7558bff5c5fd6160ae4e11faf27c05833b66d +oid sha256:81712f13ede9f7fdfdca8dad21a2ce21dfc01134b2db43c6013e312bee234094 size 256 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}")