From 473738928ebd8d3b9575f29377f1a1f21533d57e619d9258d796e91efbd41273 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 13 Sep 2024 12:05:56 +0000 Subject: [PATCH 1/2] [info=0794408a855c1ae7db949d27296ec4151338fc189317846e9a1c3c0d093c98b8] OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=54 --- .gitattributes | 25 ++++++ .gitignore | 1 + _multibuild | 3 + _scmsync.obsinfo | 4 + baselibs.conf | 1 + build.specials.obscpio | 3 + libjxl.changes | 184 +++++++++++++++++++++++++++++++++++++++++ libjxl.spec | 184 +++++++++++++++++++++++++++++++++++++++++ skcms.tar | 3 + system-jpeg.diff | 29 +++++++ v0.10.3.tar.gz | 3 + v0.11.0.tar.gz | 3 + 12 files changed, 443 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 _scmsync.obsinfo create mode 100644 baselibs.conf create mode 100644 build.specials.obscpio create mode 100644 libjxl.changes create mode 100644 libjxl.spec create mode 100644 skcms.tar create mode 100644 system-jpeg.diff create mode 100644 v0.10.3.tar.gz create mode 100644 v0.11.0.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d9861d7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,25 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +skcms.tar filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..6bf7c9f --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + gtk + diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..2415148 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1726229129 +commit: 0794408a855c1ae7db949d27296ec4151338fc189317846e9a1c3c0d093c98b8 +url: https://src.opensuse.org/jengelh/libjxl +revision: master diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..0d34773 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libjxl0_10 diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..6c5db59 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd4d3d7731ff81b30310101486eb0698c8be4a1a8eb83e73e8054e70e470f80 +size 256 diff --git a/libjxl.changes b/libjxl.changes new file mode 100644 index 0000000..e1c071e --- /dev/null +++ b/libjxl.changes @@ -0,0 +1,184 @@ +------------------------------------------------------------------- +Fri Sep 13 11:48:46 UTC 2024 - Jan Engelhardt + +- 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 + +- 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 + +- Update to release 0.10.2 + * Fix unspecified bugs in (lossless) encoding and streaming mode + +------------------------------------------------------------------- +Wed Feb 28 16:19:26 UTC 2024 - Jan Engelhardt + +- Update to release 0.10.1 + * reduce allocations and fixing speed regressions since 0.9.0 + * resolve some bug in streaming encoding + +------------------------------------------------------------------- +Thu Feb 22 00:12:54 UTC 2024 - Jan Engelhardt + +- Update to release 0.10 + * decoder: added ``JxlDecoderGetBoxSizeContents`` for getting the + size of the content of a box without the headers. + * encoder: implemented new API functions for streaming encoding. + +------------------------------------------------------------------- +Wed Feb 7 12:16:34 UTC 2024 - Jan Engelhardt + +- Update to release 0.9.2 + * Fixed some unspecified bugs in the gdk-pixbuf plugin + +------------------------------------------------------------------- +Wed Jan 3 05:11:31 UTC 2024 - Stefan Brüns + +- Remove cjxl/djxl manpages from gtk flavor installation, these + are part of the tools subpackage from the main flavor. + +------------------------------------------------------------------- +Fri Dec 22 15:54:38 UTC 2023 - Jan Engelhardt + +- Update to release 0.9 + * Encoder API: + * Add JxlEncoderSetExtraChannelDistance to adjust the quality + of extra channels (like alpha) separately. + * New API functions for streaming encoding. + * New options for more fine-grained control over metadata + preservation when using JxlEncoderAddJPEGFrame. + * New function JxlEncoderSetUpsamplingMode to change the + upsampling method, e.g. to use nearest-neighbor upsampling + for pixel art. + * New function JxlEncoderDistanceFromQuality for convenience to + calculate a distance given a quality. + * Decoder API: Implemented JxlDecoderSetOutputColorProfile and + JxlDecoderSetCms to enable decoding to desired colorspace. + * Deprecated functions removed from encoder and decoder APIs. + * Command-line tools: + * cjxl can now be used to explicitly add/update/strip + Exif/XMP/JUMBF metadata using the decoder-hints syntax, e.g. + cjxl input.ppm -x exif=input.exif output.jxl + * djxl can now be used to extract Exif/XMP/JUMBF metadata. + +------------------------------------------------------------------- +Thu Sep 21 13:34:05 UTC 2023 - Jan Engelhardt + +- Switch from LCMS to SKCMS: libjxl core can use either, but + plugins can only use SKCMS. Exercising two CMS simultaneously + also is silly. Delete 0001-Remove-LCMS-mutex.patch . + +------------------------------------------------------------------- +Sat Sep 16 06:58:55 UTC 2023 - Atri Bhattacharya + +- Build plugins: + * Add _service file to generate skcms tarball (needed to build + plugins). + * Add skcms tarball as source and copy extracted dir to + ./third_party/ so cmake can find it. + * Split out new packages: + * gdk-pixbuf-loader-jxl: Pixbuf loader for supported apps. + * gimp-plugin-jxl: Plugin to allow gimp to work with JPEG XL + files. + * jxl-thumbnailer: Thumbnailer and mime files to allow + generating thumbnails for JPEG XL files. + +------------------------------------------------------------------- +Wed Jun 14 13:00:09 UTC 2023 - Jan Engelhardt + +- Update to release 0.8.2 + * Fix an integer underflow bug in patch decoding. + +------------------------------------------------------------------- +Fri Jun 9 08:16:39 UTC 2023 - Martin Pluskal + +- Build package in correct phase +- Use macros for ldconfig + +------------------------------------------------------------------- +Mon Apr 17 07:36:23 UTC 2023 - Jan Engelhardt + +- Refresh 0001-Remove-LCMS-mutex.patch + +------------------------------------------------------------------- +Fri Feb 10 08:14:35 UTC 2023 - Dirk Müller + +- build glibc hwcaps optimized overlay + +------------------------------------------------------------------- +Sun Feb 5 14:16:53 UTC 2023 - Jan Engelhardt + +- Update to release 0.8.1 + * Allow fast-lossless for 16-bit float input + * Fix OOB read in exif.h + +------------------------------------------------------------------- +Wed Jan 18 15:13:51 UTC 2023 - Jan Engelhardt + +- Update to release 0.8 + * API: new function JxlDecoderSetImageBitDepth and + JxlEncoderSetFrameBitDepth to set the bit depth of buffers. + * encoder API: add an effort 10 option for lossless + compression; using this setting requires calling + JxlEncoderAllowExpertOptions. +- Enable PNG utilities [boo#1205107] + +------------------------------------------------------------------- +Mon Dec 19 12:35:30 UTC 2022 - Antonio Larrosa + +- Add patch (applied reversed) to revert the requirement for an + updated liblcms2 library when we have an older one. This allows + libjxl to build in SLE15 SP4/SP5 (and Leap 15.4/15.5): + * 0001-Remove-LCMS-mutex.patch + +------------------------------------------------------------------- +Thu Dec 15 11:32:45 UTC 2022 - Simon Vogl + +- Added missing baselibs.conf so that 32bit library packages + become available + +------------------------------------------------------------------- +Thu Sep 22 07:03:57 UTC 2022 - Enrico Belleri + +- Update to 0.7.0: + * new functions for retrieving associated alpha channel with + premultiplied or unpremultiplied colors, for blending + information for extra channels in the non-coalesced case, for + getting the intended downsampling ratio of progressive steps, + for disabling rendering of spot colors. + * Added ability to add metadata boxes, to set several encoder + options, to check required codestream compatibility level, + for force-emitting the box-based container format, to store + JPEG metadata for lossless reconstruction, to encode + arbitrary extra channels. + +------------------------------------------------------------------- +Sat Jul 23 14:33:36 UTC 2022 - Jan Engelhardt + +- Initial package (version 0.7~779.f5d6e29) build.opensuse.org diff --git a/libjxl.spec b/libjxl.spec new file mode 100644 index 0000000..2a3cc5e --- /dev/null +++ b/libjxl.spec @@ -0,0 +1,184 @@ +# +# spec file for package libjxl-gtk +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define lname libjxl0_11 +%if "@BUILD_FLAVOR@" == "gtk" +Name: libjxl-gtk +%bcond_without gtk +%else +Name: libjxl +%bcond_with gtk +%endif +Version: 0.11.0 +Release: 0 +Summary: JPEG XL reference implementation +License: BSD-3-Clause +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 +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 +%endif +BuildRequires: giflib-devel >= 5.1 +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(libavif) +BuildRequires: pkgconfig(libbrotlicommon) +BuildRequires: pkgconfig(libbrotlidec) +BuildRequires: pkgconfig(libbrotlienc) +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 +%endif + +%description +JPEG XL is a raster-graphics file format that supports both lossy and +lossless compression. + +This is the reference implementation of JPEG XL, with encoder and decoder. + +%package -n %lname +Summary: Library for encoding and decoding JPEG XL raster graphic images + +%description -n %lname +JPEG XL is a raster-graphics file format that supports both lossy and +lossless compression. + +%package devel +Summary: Development for libjxl, an en-/decoder for JPEG XL +Requires: %lname = %version + +%description devel +JPEG XL is a raster-graphics file format that supports both lossy and +lossless compression. + +This is the reference implementation of JPEG XL, with encoder and decoder. + +%package tools +Summary: Command-line utilities to convert from/to JPEG XL + +%description tools +Command-line utilities to convert from/to JPEG XL. + +%package -n gdk-pixbuf-loader-jxl +Summary: A gdk-pixbuf loader for JPEG-XL using libjxl +Supplements: (%lname and gdk-pixbuf) +%if %{with gtk} +%gdk_pixbuf_loader_requires +%endif + +%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 + +%description -n jxl-thumbnailer +This package provides a thumbnailer to render for JPEG XL file thumbnails, +for example, on file-browsers. + +%prep +%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=ON +%cmake_build + +%install +%cmake_install +b="%buildroot" +rm -fv "$b/%_libdir"/*.a +%if %{with gtk} +rm -Rf "$b/%_libdir"/libjxl* "$b/%_bindir" "$b/%_includedir" "$b/%_libdir/pkgconfig" "$b/%_mandir" +%endif + +%ldconfig_scriptlets -n %lname + +%post -n gdk-pixbuf-loader-jxl +%gdk_pixbuf_loader_post + +%postun -n gdk-pixbuf-loader-jxl +%gdk_pixbuf_loader_postun + +%if %{without gtk} + +%files -n %lname +%license LICENSE +%_libdir/libjxl*.so.* + +%files tools +%_bindir/?jpegli +%_bindir/*xl* +%_mandir/man*/*xl* + +%files devel +%_includedir/jxl/ +%_libdir/libjxl*.so +%_libdir/pkgconfig/*.pc + +%else + +%files -n gdk-pixbuf-loader-jxl +%_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 + +%endif + +%changelog diff --git a/skcms.tar b/skcms.tar new file mode 100644 index 0000000..e4cc563 --- /dev/null +++ b/skcms.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8335d994cd09b5a8456e6cd9f3ac94933337925aa918d525d91ee0ef4b732212 +size 14899200 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.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 diff --git a/v0.11.0.tar.gz b/v0.11.0.tar.gz new file mode 100644 index 0000000..d7469ee --- /dev/null +++ b/v0.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce4ec8bb37a435a73ac18c4c9ff56c2dc6c98892bf3f53a328e3eca42efb9cf +size 1873614 From 58450ba9b75cc67c7fb9ba7c8a89413cf50203d3ab8eb2e61b858b9a8c71f8a7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 13 Sep 2024 16:31:27 +0000 Subject: [PATCH 2/2] [info=dde18a82cc8520925316701dd6ada8caf660924c5ca4a8ff972ed14279cb51d9] OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=55 --- _scmsync.obsinfo | 4 ++-- baselibs.conf | 2 +- build.specials.obscpio | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 2415148..41eb55e 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1726229129 -commit: 0794408a855c1ae7db949d27296ec4151338fc189317846e9a1c3c0d093c98b8 +mtime: 1726245075 +commit: dde18a82cc8520925316701dd6ada8caf660924c5ca4a8ff972ed14279cb51d9 url: https://src.opensuse.org/jengelh/libjxl revision: master diff --git a/baselibs.conf b/baselibs.conf index 0d34773..cbe1690 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libjxl0_10 +libjxl0_11 diff --git a/build.specials.obscpio b/build.specials.obscpio index 6c5db59..ca57032 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bd4d3d7731ff81b30310101486eb0698c8be4a1a8eb83e73e8054e70e470f80 +oid sha256:2518d277a5709ee8bee2803cf39b2544fd6b45186fa8f6728981167da5ed8ab9 size 256