From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- media-libs/libheif/Manifest | 5 +- ...TDIR_when_generating_heif-convert_symlink.patch | 22 +++++ media-libs/libheif/libheif-1.18.1.ebuild | 101 +++++++++++++++++++++ media-libs/libheif/libheif-9999.ebuild | 8 +- 4 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch create mode 100644 media-libs/libheif/libheif-1.18.1.ebuild (limited to 'media-libs/libheif') diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index 18ebaae115c7..e193f391f9f9 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -1,6 +1,9 @@ +AUX libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch 1378 BLAKE2B 5e5ba6be675ae555eea2f7a3956da64846c9ef6cc6c291fe27b306cb00fb25511e75fd029927ffd1bee6b8907ad36632758f98edbf4c864190659a741ab9a731 SHA512 e13f53612c308b5aa12aab6f098a209be9927f8226571e6d6207e4ddbb67bf6e1aee64a0de416e0e2cf1406304746a1475d1462153e0880d5f4cc9938f826c8a 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 EBUILD libheif-1.15.2-r1.ebuild 2058 BLAKE2B 4769aaea2e7165a43dc8761d944ff77df1ca87ed6fe4bef4f291075db39c44b151f46198e1e74683072ad3a26aced9f259a71db8a5512cf74cec047c1750073b SHA512 108ed5a9a7ab77110dc53189ae90f245672f39e76784678cb007b560b8284e862ae4142cd6abf484bdfb0029c41bfdec9aa5c352fa9ba1439d39fb3cdd63af96 EBUILD libheif-1.17.6.ebuild 2258 BLAKE2B 1ef40abfff4b9c0e6274a77c058858ea98116e157e8e3bfac3630d559ce0238112009bd16b8d7fa0dc49aa0460bb8ba3e03e836c0e11eec1f2065cc16ac65b60 SHA512 f7f3c152697c0f4c4f20e81964b0012cfa23fef3e884d6d2ad28ad010c374ba68f022e834091d121b2de1edb0017c2a1a10bea70790668a0a7c836dbea5f0853 -EBUILD libheif-9999.ebuild 2258 BLAKE2B 1ef40abfff4b9c0e6274a77c058858ea98116e157e8e3bfac3630d559ce0238112009bd16b8d7fa0dc49aa0460bb8ba3e03e836c0e11eec1f2065cc16ac65b60 SHA512 f7f3c152697c0f4c4f20e81964b0012cfa23fef3e884d6d2ad28ad010c374ba68f022e834091d121b2de1edb0017c2a1a10bea70790668a0a7c836dbea5f0853 +EBUILD libheif-1.18.1.ebuild 2392 BLAKE2B 03533e87d002d71b20f6b5596fecac4a2484d00b7a340e91f0dd836c5d83dd075d04b020dae47ce96a2065ed8ad24a349285c5dffe8f363acc10b53bc27a6e44 SHA512 ea84b7c42d923aa309b2b6367d5b5b0aed2445b285ce7785b466aa6bfd91897acffa7f951a2585dc20b3c45ae5426c8ba4ef36a883c7c3ae5bd4daa243fa7feb +EBUILD libheif-9999.ebuild 2392 BLAKE2B 03533e87d002d71b20f6b5596fecac4a2484d00b7a340e91f0dd836c5d83dd075d04b020dae47ce96a2065ed8ad24a349285c5dffe8f363acc10b53bc27a6e44 SHA512 ea84b7c42d923aa309b2b6367d5b5b0aed2445b285ce7785b466aa6bfd91897acffa7f951a2585dc20b3c45ae5426c8ba4ef36a883c7c3ae5bd4daa243fa7feb MISC metadata.xml 809 BLAKE2B f26844fa79747ac286a0130cb8cb2b4f0e771ed7fa3f9fe29a3fbd71876902c868dc32305f928cedbb88dcadab3c07cb4f85c647369adc904c7c9c463dd05343 SHA512 754ef9004dc664cca658bfbd0392fce837557efe1b92aefe198dd529cb388048f49e37648c7338829d6ecd87ea953efd0f66895191aea7bd39730c2f7240f032 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 +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 +} diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild index a4c096fce0e6..af5f70f0dcf7 100644 --- a/media-libs/libheif/libheif-9999.ebuild +++ b/media-libs/libheif/libheif-9999.ebuild @@ -40,16 +40,18 @@ DEPEND=" go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] ) - x265? ( media-libs/x265:=[${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() { - default - if use test ; then # bug 865351 rm tests/catch.hpp || die -- cgit v1.2.3