From 882026ed26b61960e35a584dfc046a087badba890581c2f531ff047cb624d774 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 11 Jan 2025 14:11:09 +0000 Subject: [PATCH 1/2] [info=a137511cd9237d286046448730b9a53b65b5881a062f57dd8a086f1bc1b30afd] OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=58 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libjxl.changes | 7 +++++++ libjxl.spec | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index c2c9a5a..0809305 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1733868365 -commit: f8edeee22641f43b72f45d9bd91410deebf180416ee6fe78798a119d87595360 +mtime: 1736546727 +commit: a137511cd9237d286046448730b9a53b65b5881a062f57dd8a086f1bc1b30afd url: https://src.opensuse.org/jengelh/libjxl revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 9004e11..6bc2377 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a966e700481bec573adaf2902d25462967f8b11c1e1ec5b930130ec0168f0e +oid sha256:230b276afc208623f502f6971ca6fe76bc32bf4f3bb2c232a465640bb7f2dff5 size 256 diff --git a/libjxl.changes b/libjxl.changes index 5eb247d..ba124c6 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 10 21:34:13 UTC 2025 - Michael Gorse + +- 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 diff --git a/libjxl.spec b/libjxl.spec index 0d2d7e7..91fcecb 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -17,6 +17,11 @@ %define lname libjxl0_11 +%if "@BUILD_FLAVOR@" == "gtk" && 0%{?is_opensuse} +%bcond_without gimp +%else +%bcond_with gimp +%endif %if "@BUILD_FLAVOR@" == "gtk" Name: libjxl-gtk %bcond_without gtk @@ -40,11 +45,16 @@ 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) @@ -100,12 +110,14 @@ Supplements: (%lname and gdk-pixbuf) %description -n gdk-pixbuf-loader-jxl This package provides a libjxl-based gdk-pixbuf loader for JPEG XL files. +%if %{with gimp} %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. +%endif %package -n jxl-thumbnailer Summary: Generate thumbnails for JPEG XL files @@ -172,8 +184,10 @@ 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 From 65dacef8a48322ba976f22a3f6c7fce1cf3e5e12067a7836fc8033af4ac71502 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 11 Jan 2025 14:15:47 +0000 Subject: [PATCH 2/2] [info=0cab574f27973c9eb4aa885d2073ff343a07b33a407ba8a92b1ba2e765a49f14] OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=59 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libjxl.spec | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 0809305..278417f 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1736546727 -commit: a137511cd9237d286046448730b9a53b65b5881a062f57dd8a086f1bc1b30afd +mtime: 1736604926 +commit: 0cab574f27973c9eb4aa885d2073ff343a07b33a407ba8a92b1ba2e765a49f14 url: https://src.opensuse.org/jengelh/libjxl revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 6bc2377..18ab72a 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:230b276afc208623f502f6971ca6fe76bc32bf4f3bb2c232a465640bb7f2dff5 +oid sha256:ec3881ad1f1dd1df40a92c855bbb74d76f443715e3fe346586b373a193257647 size 256 diff --git a/libjxl.spec b/libjxl.spec index 91fcecb..0671f28 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -110,14 +110,12 @@ Supplements: (%lname and gdk-pixbuf) %description -n gdk-pixbuf-loader-jxl This package provides a libjxl-based gdk-pixbuf loader for JPEG XL files. -%if %{with gimp} %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. -%endif %package -n jxl-thumbnailer Summary: Generate thumbnails for JPEG XL files