Enable glycin-jxl loader

We now have rust-jxl-oxide packaged in Fedora.
This commit is contained in:
Kalev Lember 2023-11-14 23:42:26 +01:00
parent e8b782e7d9
commit 6edf9a0380
2 changed files with 1 additions and 31 deletions

View File

@ -1,28 +0,0 @@
From fe89df0302d3bc40796260773c862c59269d0528 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 19 Sep 2023 15:00:59 +0200
Subject: [PATCH 2/4] Disable JPEG-XL (missing dependencies)
---
Cargo.toml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
index 18cbdf4..01da486 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,5 +17,10 @@ opt-level = 3
[workspace]
resolver = "2"
-members = [ "loaders/*", "tests"]
+members = [
+ "loaders/glycin-heif",
+ "loaders/glycin-image-rs",
+ "loaders/glycin-svg",
+ "tests",
+]
default-members = [ ]
--
2.41.0

View File

@ -36,8 +36,6 @@ 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
# jxl rust wrapper isn't packaged yet
Patch: 0002-Disable-JPEG-XL-missing-dependencies.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
@ -76,7 +74,7 @@ rm -rf vendor
%build
%meson \
-Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-svg \
-Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-jxl,glycin-svg \
-Dtest_skip_install=true \
%{nil}