commit:     8d9c9b8d228091278121da82bec2a47d506ac2ba
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Wed Jul 24 16:12:31 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 09:34:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9c9b8d

media-libs/libheif: Bump to 1.18.1

Thanks-to: eli-schwartz
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36951
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 media-libs/libheif/Manifest                        |   1 +
 ...TDIR_when_generating_heif-convert_symlink.patch |  22 +++++
 media-libs/libheif/libheif-1.18.1.ebuild           | 101 +++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 909676530c35..c09dfaf8e1a2 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,2 +1,3 @@
 DIST libheif-1.15.2.tar.gz 1749773 BLAKE2B 
788ecf59c936bfae9544bedd5fa50fd74f04adf29f804994bc208d2a5339b13984baf78a508babd80fa0d48381b2cc0bfb1e1140de97437b8c0336378a64fcb6
 SHA512 
79f22dad084bbe965dae7b8f92fc119dbdde7a04577ca9c7bc28b1a022a06f0ae64d3fbd11e82d6907f0fd678a31d98275e508a51a6bd0a9e8675c93790f1996
 DIST libheif-1.17.6.tar.gz 1433302 BLAKE2B 
937a1ddfd86c4d50a609e24d00c07e0d1924a5532e36293f83fd67a38f4c13186cb5c4837598000d6d3516ec1965fdc6709ef825c327fd5ce3ea2194008b6efd
 SHA512 
47d93df4f584979cea26af74cd8543b13398356b5fd46b1b378f7738cee471e80b7e117f6ce307674a549182f5ce22a577c6e79a6e72fe166421efc4be04687a
+DIST libheif-1.18.1.tar.gz 1524386 BLAKE2B 
07c01c273460618d56b9259c2930da34632fffdcc2338480277e678ab173126bc9d6882a33dc459ed7cdacd7e636ff8d13c406c76c046afc47166609e9595942
 SHA512 
0b37b834882af8368fc550e75245f4cf487c71a041833ba5e7887155e289e9c2058b41724524091347f297cfdec45b537796a97f4c43531aecf9f0a099753f41

diff --git 
a/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch
 
b/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch
new file mode 100644
index 000000000000..aee9049751aa
--- /dev/null
+++ 
b/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch
@@ -0,0 +1,22 @@
+From 337aa421f68c0274eb0db047646160b05fdde4a0 Mon Sep 17 00:00:00 2001
+From: Dirk Farin <[email protected]>
+Date: Wed, 24 Jul 2024 16:11:43 +0200
+Subject: [PATCH] fix installing heif-convert symlink in DESTDIR (#1249)
+
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 8ac3114370..fc9d2f2ca0 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -34,7 +34,7 @@ install(FILES heif-dec.1 DESTINATION 
${CMAKE_INSTALL_MANDIR}/man1)
+ 
+ # create symbolic link from the old name `heif-convert` to `heif-dec`
+ if(NOT WIN32)
+-  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-dec${CMAKE_EXECUTABLE_SUFFIX}
 
${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
++  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
heif-dec${CMAKE_EXECUTABLE_SUFFIX} 
\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
+ else()
+   install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-dec${CMAKE_EXECUTABLE_SUFFIX}
 
${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
+ endif()

diff --git a/media-libs/libheif/libheif-1.18.1.ebuild 
b/media-libs/libheif/libheif-1.18.1.ebuild
new file mode 100644
index 000000000000..af5f70f0dcf7
--- /dev/null
+++ b/media-libs/libheif/libheif-1.18.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="https://github.com/strukturag/libheif.git";
+       inherit git-r3
+else
+       
SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz";
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif";
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+       test? (
+               dev-cpp/catch
+               dev-lang/go
+       )
+"
+DEPEND="
+       media-libs/dav1d:=[${MULTILIB_USEDEP}]
+       media-libs/libde265:=[${MULTILIB_USEDEP}]
+       media-libs/libpng:0=[${MULTILIB_USEDEP}]
+       media-libs/tiff:=[${MULTILIB_USEDEP}]
+       sys-libs/zlib:=[${MULTILIB_USEDEP}]
+       media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+       aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+       gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+       go? ( dev-lang/go )
+       rav1e? ( media-video/rav1e:= )
+       svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] )
+       x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+# https://github.com/strukturag/libheif/issues/1249
+PATCHES=( 
"${FILESDIR}"/${P}-prepend_DESTDIR_when_generating_heif-convert_symlink.patch )
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/libheif/heif_version.h
+)
+
+src_prepare() {
+       if use test ; then
+               # bug 865351
+               rm tests/catch.hpp || die
+               ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp 
tests/catch.hpp || die
+       fi
+
+       cmake_src_prepare
+
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
+       export GO111MODULE=auto
+       local mycmakeargs=(
+               -DENABLE_PLUGIN_LOADING=true
+               -DWITH_LIBDE265=true
+               -DWITH_AOM_DECODER=$(usex aom)
+               -DWITH_AOM_ENCODER=$(usex aom)
+               -DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
+               -DWITH_RAV1E="$(multilib_native_usex rav1e)"
+               -DWITH_SvtEnc="$(usex svt-av1)"
+               -DWITH_X265=$(usex x265)
+               -DWITH_KVAZAAR=true
+               -DWITH_JPEG_DECODER=true
+               -DWITH_JPEG_ENCODER=true
+               -DWITH_OpenJPEG_DECODER=true
+               -DWITH_OpenJPEG_ENCODER=true
+       )
+       cmake_src_configure
+}
+
+multilib_src_compile() {
+       default
+       cmake_src_compile
+}
+
+multilib_src_test() {
+       default
+}
+
+multilib_src_install() {
+       cmake_src_install
+}
+
+multilib_src_install_all() {
+       einstalldocs
+}

Reply via email to