Update to 1.0.1 and sync with Fedora

Resolves: RHEL-58017

.gitignore

@@ -4,3 +4,4 @@
 /glycin-loaders-0.1.rc.tar.xz
 /glycin-loaders-0.1.1.tar.xz
 /glycin-loaders-0.1.2.tar.xz
+/glycin-loaders-1.0.1.tar.xz

0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch

@@ -1,67 +0,0 @@
-From be5633a760b751f00e434cbee41468930ac95dbd Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Tue, 19 Sep 2023 15:00:17 +0200
-Subject: [PATCH 1/4] Drop OpenEXR decoders since they are not enabled in the
- image crate
-
----
- loaders/glycin-image-rs/glycin-image-rs.conf       | 4 ----
- loaders/glycin-image-rs/src/bin/glycin-image-rs.rs | 6 ------
- 2 files changed, 10 deletions(-)
-
-diff --git a/loaders/glycin-image-rs/glycin-image-rs.conf b/loaders/glycin-image-rs/glycin-image-rs.conf
-index c96067f3..91508e60 100644
---- a/loaders/glycin-image-rs/glycin-image-rs.conf
-+++ b/loaders/glycin-image-rs/glycin-image-rs.conf
-@@ -36,10 +36,6 @@ Exec = @EXEC@
- #[loader:image/vnd.radiance]
- #Exec = @EXEC@
- 
--# OpenEXR
--[loader:image/x-exr]
--Exec = @EXEC@
--
- # PNM
- [loader:image/x-portable-bitmap]
- Exec = @EXEC@
-diff --git a/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs b/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
-index d331d94e..699d50dc 100644
---- a/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
-+++ b/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
-@@ -141,7 +141,6 @@ pub enum ImageRsDecoder<T: std::io::Read + std::io::Seek> {
-     //Hdr(codecs::hdr::HdrDecoder<T>),
-     Ico(codecs::ico::IcoDecoder<T>),
-     Jpeg(codecs::jpeg::JpegDecoder<T>),
--    OpenExr(codecs::openexr::OpenExrDecoder<T>),
-     Png(codecs::png::PngDecoder<T>),
-     Pnm(codecs::pnm::PnmDecoder<T>),
-     Qoi(codecs::qoi::QoiDecoder<T>),
-@@ -164,9 +163,6 @@ impl ImageRsDecoder<Reader> {
-                 Self::Ico(codecs::ico::IcoDecoder::new(data).context_failed()?)
-             }
-             "image/jpeg" => Self::Jpeg(codecs::jpeg::JpegDecoder::new(data).context_failed()?),
--            "image/x-exr" => {
--                Self::OpenExr(codecs::openexr::OpenExrDecoder::new(data).context_failed()?)
--            }
-             "image/png" => Self::Png(codecs::png::PngDecoder::new(data).context_failed()?),
-             "image/x-portable-bitmap"
-             | "image/x-portable-graymap"
-@@ -196,7 +192,6 @@ impl<'a, T: std::io::Read + std::io::Seek + 'a> ImageRsDecoder<T> {
-             //Self::Hdr(d) => ImageInfo::from_decoder(d, "Radiance HDR"),
-             Self::Ico(d) => ImageInfo::from_decoder(d, "ICO"),
-             Self::Jpeg(d) => ImageInfo::from_decoder(d, "JPEG"),
--            Self::OpenExr(d) => ImageInfo::from_decoder(d, "OpenEXR"),
-             Self::Png(d) => ImageInfo::from_decoder(d, "PNG"),
-             Self::Pnm(d) => ImageInfo::from_decoder(d, "PNM"),
-             Self::Qoi(d) => ImageInfo::from_decoder(d, "QOI"),
-@@ -215,7 +210,6 @@ impl<'a, T: std::io::Read + std::io::Seek + 'a> ImageRsDecoder<T> {
-             //Self::Hdr(d) => Frame::from_decoder(d),
-             Self::Ico(d) => Frame::from_decoder(d),
-             Self::Jpeg(d) => Frame::from_decoder(d),
--            Self::OpenExr(d) => Frame::from_decoder(d),
-             Self::Png(d) => Frame::from_decoder(d),
-             Self::Pnm(d) => Frame::from_decoder(d),
-             Self::Qoi(d) => Frame::from_decoder(d),
--- 
-2.41.0
-

0004-Bump-libheif-rs-dep-0.21.0.patch

@@ -1,23 +0,0 @@
-From 170e9905a6c4b8c890450ef00322376bef4454bf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Thu, 21 Sep 2023 22:11:50 +0200
-Subject: [PATCH 4/4] Bump libheif-rs dep 0.21.0
-
----
- loaders/glycin-heif/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loaders/glycin-heif/Cargo.toml b/loaders/glycin-heif/Cargo.toml
-index b23b70f..1fd011d 100644
---- a/loaders/glycin-heif/Cargo.toml
-+++ b/loaders/glycin-heif/Cargo.toml
-@@ -11,5 +11,5 @@ rust-version.workspace = true
- 
- [dependencies]
- glycin-utils = "0.1.0"
--libheif-rs = "0.20.0"
-+libheif-rs = "0.21.0"
- safe-transmute = "0.11.2"
--- 
-2.41.0
-

glycin-loaders.spec

@@ -1,4 +1,6 @@
-%bcond_without check
+%bcond check 1
+%bcond heif %{undefined rhel}
+%bcond jpegxl %{undefined rhel}
 
 %if 0%{?rhel}
 %global bundled_rust_deps 1
@@ -9,7 +11,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           glycin-loaders
-Version:        0.1.2
+Version:        1.0.1
 Release:        %autorelease
 Summary:        Sandboxed image rendering
 
@@ -20,6 +22,7 @@ Summary:        Sandboxed image rendering
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 # BSD-2-Clause
+# GPL-3.0-or-later
 # LGPL-2.1-or-later
 # MIT
 # MIT OR Apache-2.0
@@ -29,16 +32,10 @@ Summary:        Sandboxed image rendering
 # MPL-2.0 OR LGPL-2.1-or-later
 # Unlicense OR MIT
 # Zlib OR Apache-2.0 OR MIT
-License:        (Apache-2.0 OR MIT) AND BSD-3-Clause AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND LGPL-2.1-or-later AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (MPL-2.0 OR LGPL-2.1-or-later) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MPL-2.0 OR LGPL-2.1-or-later) AND (Unlicense OR MIT)
 # LICENSE.dependencies contains a full license breakdown
 URL:            https://gitlab.gnome.org/sophie-h/glycin
-Source0:        https://download.gnome.org/sources/glycin-loaders/0.1/glycin-loaders-%{tarball_version}.tar.xz
-# Fedora-packaged rust-image doesn't have openexr support
-Patch:          0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch
-%if 0%{?fedora}
-# Bump libheif-rs dep to the version that's in Fedora
-Patch:          0004-Bump-libheif-rs-dep-0.21.0.patch
-%endif
+Source0:        https://download.gnome.org/sources/glycin-loaders/1.0/glycin-loaders-%{tarball_version}.tar.xz
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -51,6 +48,14 @@ BuildRequires:  cargo-rpm-macros
 BuildRequires:  git-core
 BuildRequires:  meson
 BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libseccomp)
+%if %{with heif}
+BuildRequires:  pkgconfig(libheif)
+%endif
+%if %{with jpegxl}
+BuildRequires:  pkgconfig(libjxl)
+%endif
+BuildRequires:  pkgconfig(cairo)
 
 %description
 Sandboxed and extendable image decoding.
@@ -75,7 +80,7 @@ rm -rf vendor
 
 %build
 %meson \
-  -Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-jxl,glycin-svg \
+  -Dloaders=%{?with_heif:glycin-heif,}glycin-image-rs,%{?with_jpegxl:glycin-jxl,}glycin-svg \
   -Dtest_skip_install=true \
   %{nil}
 

sources

@@ -1 +1 @@
-SHA512 (glycin-loaders-0.1.2.tar.xz) = ff373582714470c1b942e1aa831f0df3e34acbccc6ba74f7111f9b3666fb0067e75d532c1f5774180261176947dd7faf36d90da961bccf708246affc5f45164c
+SHA512 (glycin-loaders-1.0.1.tar.xz) = 6e5c02c8f04b130dbfc1e27a1db10bb23c815dcc35cb1623344b2f53ed8845cbb7af5142a826a2276d388723a2503e8e304adff1963baf886e316e122d114609