commit ee01b8c66ca7a78c448c16a7b8fda9bce4a8551e Author: MSVSphere Packaging Team Date: Tue Nov 26 16:06:28 2024 +0300 import glycin-loaders-0.1.2-5.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..54465e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/glycin-loaders-0.1.2.tar.xz diff --git a/.glycin-loaders.metadata b/.glycin-loaders.metadata new file mode 100644 index 0000000..0f5f872 --- /dev/null +++ b/.glycin-loaders.metadata @@ -0,0 +1 @@ +794aa9fb173c2602db9776507dde798477bf7f32 SOURCES/glycin-loaders-0.1.2.tar.xz diff --git a/SOURCES/0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch b/SOURCES/0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch new file mode 100644 index 0000000..6bcc7c0 --- /dev/null +++ b/SOURCES/0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch @@ -0,0 +1,67 @@ +From be5633a760b751f00e434cbee41468930ac95dbd Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +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 { + //Hdr(codecs::hdr::HdrDecoder), + Ico(codecs::ico::IcoDecoder), + Jpeg(codecs::jpeg::JpegDecoder), +- OpenExr(codecs::openexr::OpenExrDecoder), + Png(codecs::png::PngDecoder), + Pnm(codecs::pnm::PnmDecoder), + Qoi(codecs::qoi::QoiDecoder), +@@ -164,9 +163,6 @@ impl ImageRsDecoder { + 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 { + //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 { + //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 + diff --git a/SPECS/glycin-loaders.spec b/SPECS/glycin-loaders.spec new file mode 100644 index 0000000..b8c706a --- /dev/null +++ b/SPECS/glycin-loaders.spec @@ -0,0 +1,201 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 5; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%bcond_without check + +%if 0%{?rhel} +%global bundled_rust_deps 1 +%else +%global bundled_rust_deps 0 +%endif + +%global tarball_version %%(echo %{version} | tr '~' '.') + +Name: glycin-loaders +Version: 0.1.2 +Release: %autorelease +Summary: Sandboxed image rendering + +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# LGPL-2.1-or-later +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# 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.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 + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +%if 0%{?rhel} +BuildRequires: rust-toolset +%else +BuildRequires: cargo-rpm-macros +%endif +BuildRequires: git-core +BuildRequires: meson +BuildRequires: pkgconfig(gtk4) + +%description +Sandboxed and extendable image decoding. + + +%prep +%autosetup -p1 -n glycin-loaders-%{tarball_version} + +%if 0%{?bundled_rust_deps} +%cargo_prep -v vendor +%else +rm -rf vendor +%cargo_prep +%endif + + +%if ! 0%{?bundled_rust_deps} +%generate_buildrequires +%cargo_generate_buildrequires +%endif + + +%build +%meson \ + -Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-jxl,glycin-svg \ + -Dtest_skip_install=true \ + %{nil} + +%meson_build + +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies +%if 0%{?bundled_rust_deps} +%cargo_vendor_manifest +%endif + + +%install +%meson_install + + +%if %{with check} +%check +# Something is wrong with the test setup and tests fail with +# "No such file or directory" +%meson_test || : +%endif + + +%files +%license LICENSE LICENSE-LGPL-2.1 LICENSE-MPL-2.0 +%license LICENSE.dependencies +%if 0%{?bundled_rust_deps} +%license cargo-vendor.txt +%endif +%doc NEWS README.md +%{_libexecdir}/glycin-loaders/ +%{_datadir}/glycin-loaders/ + + +%changelog +* Tue Nov 26 2024 MSVSphere Packaging Team - 0.1.2-5 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 0.1.2-5 +- Bump release for June 2024 mass rebuild + +* Thu Feb 01 2024 Yaakov Selkowitz - 0.1.2-4 +- Update Rust macro usage + +* Wed Jan 24 2024 Fedora Release Engineering - 0.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Nov 14 2023 Kalev Lember - 0.1.2-1 +- Update to 0.1.2 + +* Tue Nov 14 2023 Kalev Lember - 0.1.1-7 +- Update license tag for dependencies + +* Tue Nov 14 2023 Kalev Lember - 0.1.1-6 +- Enable glycin-jxl loader + +* Mon Nov 13 2023 Yaakov Selkowitz - 0.1.1-5 +- Fix RHEL build + +* Thu Nov 09 2023 Kalev Lember - 0.1.1-4 +- Enable glycin-heif loader + +* Sun Oct 01 2023 Kalev Lember - 0.1.1-3 +- Drop downstream patch to use librsvg pre-release version + +* Thu Sep 21 2023 Kalev Lember - 0.1.1-2 +- Enable heif support now that rust-libheif-rs is packaged + +* Tue Sep 19 2023 Fabio Valentini - 0.1.1-1 +- Update to version 0.1.1 + +* Thu Sep 07 2023 Kalev Lember - 0.1~rc-4 +- ExcludeArch i686 for + https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval + +* Thu Sep 07 2023 Kalev Lember - 0.1~rc-3 +- Skip install during self tests + +* Thu Sep 07 2023 Kalev Lember - 0.1~rc-2 +- Use bundled rust deps on RHEL + +* Wed Sep 06 2023 Kalev Lember - 0.1~rc-1 +- Update to 0.1.rc + +* Wed Aug 23 2023 Kalev Lember - 0.1~beta.4-2 +- Enable qoi support now that it's available in rust-image + +* Wed Aug 23 2023 Kalev Lember - 0.1~beta.4-1 +- Update to 0.1.0-beta.4 +- Upstream relicensed to 'MPL-2.0 OR LGPL-2.1-or-later' + +* Tue Aug 22 2023 Kalev Lember - 0.1~beta.3-3 +- Re-enable tests, but ignore the results for now + +* Tue Aug 22 2023 Kalev Lember - 0.1~beta.3-2 +- Temorarily disable tests + +* Tue Aug 22 2023 Kalev Lember - 0.1~beta.3-1 +- Update to 0.1.beta.3 + +* Mon Aug 21 2023 Kalev Lember - 0.1~beta.2-2 +- Update the license tag to reflect the licenses of all rust dependencies +- Use LGPL-2.1-only for the project license until we get confirmation from + upstream + +* Mon Aug 21 2023 Kalev Lember - 0.1~beta.2-1 +- Initial Fedora packaging (rhbz#2233278) +## END: Generated by rpmautospec