public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michel Lind <salimma@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/libheif] f45: Better target the pixbuf-loader removal
Date: Thu, 24 Sep 2026 09:59:29 GMT	[thread overview]
Message-ID: <179024396996.1.17187294984689924935.rpms-libheif-30b771ed6fd8@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/libheif
            Branch : f45
            Commit : 30b771ed6fd8a3b70cb5f1ad2f7b1fe7558d5302
            Author : Michel Lind <salimma@fedoraproject.org>
            Date   : 2026-09-24T10:05:28+01:00
            Stats  : +42/-4 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/libheif/c/30b771ed6fd8a3b70cb5f1ad2f7b1fe7558d5302?branch=f45

            Log:
            Better target the pixbuf-loader removal

- It should not have a floating Obsolete
- Restore the subpackage in EL <= 10
- Properly conditional it, and av1 support, with bconds

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

---
diff --git a/libheif.spec b/libheif.spec
index ad486cb..c1081fb 100644
--- a/libheif.spec
+++ b/libheif.spec
@@ -12,6 +12,20 @@
 # glycin-loaders -> libheif
 %bcond bootstrap 0
 
+%if 0%{?rhel} && 0%{?rhel} <= 9
+%bcond av1 0
+%else
+%bcond av1 1
+%endif
+
+# pixbuf loader removed originally in commit
+# d6b92efe1f1495dcc7019c83b4f97e6830434427
+%if 0%{?rhel} && 0%{?rhel} <= 10
+%bcond pixbuf_loader 1
+%else
+%bcond pixbuf_loader 0
+%endif
+
 Name:           libheif
 Version:        1.23.5
 Release:        %autorelease
@@ -46,13 +60,17 @@ BuildRequires:  pkgconfig(zlib)
 # https://bugzilla.redhat.com/show_bug.cgi?id=2393742
 BuildRequires:  pkgconfig(openh264)
 %endif
-%if ! (0%{?rhel} && 0%{?rhel} <= 9)
+
+%if %{with av1}
 BuildRequires:  pkgconfig(libsharpyuv)
 BuildRequires:  pkgconfig(rav1e)
 BuildRequires:  pkgconfig(SvtAv1Enc)
 %endif
 
-Obsoletes:      heif-pixbuf-loader < %{version}-%{release}
+%if %{without pixbuf_loader}
+Obsoletes:      heif-pixbuf-loader < 1.20.2-5
+%endif
+
 Recommends:     %{name}-ffmpeg%{_isa}
 
 %description
@@ -75,7 +93,7 @@ file format decoder and encoder.
 %ifnarch %{ix86}
 %{_libdir}/%{name}/%{name}-openh264dec.so
 %endif
-%if ! (0%{?rhel} && 0%{?rhel} <= 9)
+%if %{with av1}
 %{_libdir}/%{name}/%{name}-rav1e.so
 %{_libdir}/%{name}/%{name}-svtenc.so
 %endif
@@ -101,6 +119,24 @@ can make use of hardware decoders.
 
 # ----------------------------------------------------------------------
 
+%if %{with pixbuf_loader}
+%if !%{with bootstrap}
+%package -n     heif-pixbuf-loader
+Summary:        HEIF image loader for GTK+ applications
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gdk-pixbuf2%{?_isa}
+
+%description -n heif-pixbuf-loader
+This package provides a plugin to load HEIF files in GTK+ applications.
+
+%files -n heif-pixbuf-loader
+%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-heif.so
+%endif
+%endif
+
+# ----------------------------------------------------------------------
+
 %package        tools
 Summary:        Tools for manipulating HEIF files
 License:        MIT
@@ -173,7 +209,7 @@ rm -rf third-party/
  -DWITH_OpenH264_DECODER=ON \
  -DWITH_OpenH264_DECODER_PLUGIN=ON \
 %endif
-%if ! (0%{?rhel} && 0%{?rhel} <= 9)
+%if %{with av1}
  -DWITH_RAV1E=ON \
  -DWITH_RAV1E_PLUGIN=ON \
  -DWITH_SvtEnc=ON \
@@ -183,7 +219,9 @@ rm -rf third-party/
  -DWITH_EXAMPLE_HEIF_VIEW=OFF \
 %endif
  -DWITH_UNCOMPRESSED_CODEC=ON \
+%if %{without pixbuf_loader}
  -DWITH_GDK_PIXBUF=OFF \
+%endif
  -Wno-dev
 
 %cmake_build

                 reply	other threads:[~2026-09-24  9:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179024396996.1.17187294984689924935.rpms-libheif-30b771ed6fd8@fedoraproject.org \
    --to=salimma@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox