diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 278417f..dcd5901 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1736604926 -commit: 0cab574f27973c9eb4aa885d2073ff343a07b33a407ba8a92b1ba2e765a49f14 +mtime: 1737578039 +commit: 37c7554d87456e87445abf3614eba90b3c23438c1c839148f13bff1596f1e870 url: https://src.opensuse.org/jengelh/libjxl revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 18ab72a..0558104 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec3881ad1f1dd1df40a92c855bbb74d76f443715e3fe346586b373a193257647 +oid sha256:afc8a9ac2bad75b7e60d7dc6fb600c34a072fe0e8efc3277f2778376b019aca2 size 256 diff --git a/libjxl.changes b/libjxl.changes index ba124c6..972c8af 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 22 17:29:34 UTC 2025 - Michael Gorse + +- Remove the gimp plugin. It is for 2.10, and factory now has gimp + 3.0. + +------------------------------------------------------------------- +Wed Jan 22 15:56:09 UTC 2025 - Michael Gorse + +- Always require lcms2 for the gtk build. It is needed when + building plugins, and, if gimp is disabled, it needs to be + specified explicitly. + ------------------------------------------------------------------- Fri Jan 10 21:34:13 UTC 2025 - Michael Gorse diff --git a/libjxl.spec b/libjxl.spec index 0671f28..3f55191 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -17,11 +17,6 @@ %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 @@ -45,10 +40,7 @@ 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 +BuildRequires: pkgconfig(lcms2) >= 2.12 %endif BuildRequires: giflib-devel >= 5.1 BuildRequires: pkgconfig(OpenEXR) @@ -110,13 +102,6 @@ Supplements: (%lname and gdk-pixbuf) %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 @@ -182,11 +167,6 @@ 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 %_datadir/thumbnailers/*.thumbnailer