public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libheif] rawhide: Update to 1.23.1, make PLUGIN_DIRECTORY private
@ 2026-08-09 20:38 Simone Caronni
  0 siblings, 0 replies; only message in thread
From: Simone Caronni @ 2026-08-09 20:38 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/libheif
Branch : rawhide
Commit : fc61f909b48e7257a9e00ee919a981c4d11f7db2
Author : Simone Caronni <negativo17@gmail.com>
Date   : 2026-08-09T22:32:46+02:00
Stats  : +29/-29 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/libheif/c/fc61f909b48e7257a9e00ee919a981c4d11f7db2?branch=rawhide

Log:
Update to 1.23.1, make PLUGIN_DIRECTORY private

---
diff --git a/libheif-multilib-plugin-dir.patch b/libheif-multilib-plugin-dir.patch
new file mode 100644
index 0000000..258bd38
--- /dev/null
+++ b/libheif-multilib-plugin-dir.patch
@@ -0,0 +1,20 @@
+--- libheif-1.23.1/libheif/api/libheif/heif_version.h.in	2026-06-26 10:21:07.000000000 +0200
++++ libheif-1.23.1/libheif/api/libheif/heif_version.h.in	2026-08-09 19:23:25.365746828 +0200
+@@ -33,6 +33,4 @@
+ /* Version string */
+ #define LIBHEIF_VERSION "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
+ 
+-#define LIBHEIF_PLUGIN_DIRECTORY "@PLUGIN_DIRECTORY@"
+-
+ #endif  // LIBHEIF_HEIF_VERSION_H
+--- libheif-1.23.1/libheif/CMakeLists.txt	2026-06-26 10:21:07.000000000 +0200
++++ libheif-1.23.1/libheif/CMakeLists.txt	2026-08-09 19:29:13.883250637 +0200
+@@ -216,6 +216,8 @@ endif()
+ # Needed to find libheif/heif_version.h while compiling the library
+ target_include_directories(heif PRIVATE ${libheif_BINARY_DIR} ${libheif_SOURCE_DIR}/libheif ${libheif_SOURCE_DIR}/libheif/api)
+ 
++target_compile_definitions(heif PRIVATE LIBHEIF_PLUGIN_DIRECTORY="${PLUGIN_DIRECTORY}")
++
+ # Propagate include/libheif to consume the headers from other projects
+ target_include_directories(heif
+         PUBLIC

diff --git a/libheif.spec b/libheif.spec
index 4a06ec3..a18a918 100644
--- a/libheif.spec
+++ b/libheif.spec
@@ -10,10 +10,10 @@
 # gdk-pixbuf2 -> glycin-libs
 # glycin-libs -> glycin-loaders
 # glycin-loaders -> libheif
-%bcond bootstrap 0
+%bcond bootstrap 1
 
 Name:           libheif
-Version:        1.21.2
+Version:        1.23.1
 Release:        %autorelease
 Summary:        HEIF and AVIF file format decoder and encoder
 
@@ -21,6 +21,11 @@ License:        LGPL-3.0-or-later and MIT
 URL:            https://github.com/strukturag/libheif
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:         libheif-no-hevc-tests.patch
+# Fix multilib issues: PLUGIN_DIRECTORY is derived from CMAKE_INSTALL_LIBDIR, the
+# macro has exactly one user, get_plugin_paths() in libheif/init.cc, which is internal
+# to the library, so pass it as a private compile definition instead of exporting it in
+# a public header.
+Patch1:         libheif-multilib-plugin-dir.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -96,8 +101,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
-%patch 0 -p1
+%autosetup -p1
 rm -rf third-party/
 
 
@@ -143,30 +147,6 @@ rm -rf third-party/
 %install
 %cmake_install
 
-# fix multilib issues: Rename the provided file with platform-bits in name.
-# Create platform independent file inplace of the provided one and conditionally
-# include the required one.
-# $1 - filename.h to process.
-function multilibFileVersions(){
-mv $1 ${1%%.h}-%{__isa_bits}.h
-
-local basename=$(basename $1)
-
-cat >$1 <<EOF
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include "${basename%%.h}-32.h"
-#elif __WORDSIZE == 64
-# include "${basename%%.h}-64.h"
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-EOF
-}
-
-multilibFileVersions %{buildroot}%{_includedir}/%{name}/heif_version.h
-
 
 %check
 %ctest

diff --git a/sources b/sources
index 44b2f71..6289161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libheif-1.21.2.tar.gz) = c953cb9c3a4c0f1052f4d1e0475143cfea6c0a1ab787acb33a2fd173e0460b665717a56a99b864226dfe62bd139c92a66fe5dec75b91e2a333b77a0571e3c5a8
+SHA512 (libheif-1.23.1.tar.gz) = ebb0bf74d6d1ae2d39a7cefcec0f4a04006fee330e147c49c863f6d4febb45e82ccebf36cc4e30812bd3591918ee8964fbde9a3a4793c5f60eaf30a0e011add0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-09 20:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-09 20:38 [rpms/libheif] rawhide: Update to 1.23.1, make PLUGIN_DIRECTORY private Simone Caronni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox