From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- media-libs/libheif/Manifest | 6 +-- media-libs/libheif/libheif-1.12.0-r1.ebuild | 73 +++++++++++++++++++++++++++++ media-libs/libheif/libheif-1.12.0.ebuild | 73 ----------------------------- media-libs/libheif/libheif-9999.ebuild | 10 ++-- media-libs/libheif/metadata.xml | 1 - 5 files changed, 81 insertions(+), 82 deletions(-) create mode 100644 media-libs/libheif/libheif-1.12.0-r1.ebuild delete mode 100644 media-libs/libheif/libheif-1.12.0.ebuild (limited to 'media-libs/libheif') diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index 6228d1e032be..7cb371975ecc 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -1,4 +1,4 @@ DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294 -EBUILD libheif-1.12.0.ebuild 1835 BLAKE2B c21969387578f87523a38ff435138b3cd08e8fdf4c882b68fb828866201bbe187b773c2d320c82566587be7646d220fcd7aad24768584fdfa9742ebbd750fcd0 SHA512 5f188ca76492d5b6288b0daf0c43093cff79adfb26e86d2439725ce0f99e7afcf49b6085231e020eefe1b68604d3292543937a60d1522fb5553d90484fecc9f7 -EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7 -MISC metadata.xml 888 BLAKE2B de7d9a5aa166d517b8b15b36ba3dc465cb438b162e9c8807df8bd5a901d18e492ae78fa5232868b95f66b6a47f52ce9a93d0d14bfa4a614daf0b1bbbcdac93d8 SHA512 e5f46f35e8e30c38318e074e5492e08dd6e17d1c7627bedd6d7962410dfb6025141f8e2e5c45b66d2f1e64a93ee6b41bc020ab7ca5e6cbacff80d33a00c222c3 +EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a +EBUILD libheif-9999.ebuild 1803 BLAKE2B 28cd644e40633597b07806b39f19cfdc8251132f99d5687337f68e4cbfadf578f4cee9aa198888a610c1df515e9824ada89b36a326cc6211ea30a704fb7fa7f3 SHA512 8e5af8dd952faf2bd431631ffae82faeb7adfa4cdd369741a1f031cbb12676dbead9157fbaeb16bc365da4034ab82deac627e9cfd4bbfd2e9b098a996d8ebd8a +MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f diff --git a/media-libs/libheif/libheif-1.12.0-r1.ebuild b/media-libs/libheif/libheif-1.12.0-r1.ebuild new file mode 100644 index 000000000000..f90f0e7b6ccb --- /dev/null +++ b/media-libs/libheif/libheif-1.12.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools 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 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/1.12" +IUSE="+aom gdk-pixbuf go rav1e test +threads x265" +REQUIRED_USE="test? ( go )" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-lang/go )" +DEPEND=" + media-libs/dav1d:=[${MULTILIB_USEDEP}] + media-libs/libde265:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/jpeg: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:= ) + x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i -e 's:-Werror::' configure.ac || die + + eautoreconf + + # prevent "stat heif-test.go: no such file or directory" + multilib_copy_sources +} + +multilib_src_configure() { + export GO111MODULE=auto + local econf_args=( + --enable-libde265 + --disable-static + $(multilib_is_native_abi && use go || echo --disable-go) + $(use_enable aom) + $(use_enable gdk-pixbuf) + $(use_enable rav1e) + $(use_enable threads multithreading) + $(use_enable x265) + ) + ECONF_SOURCE="${S}" econf "${econf_args[@]}" +} + +multilib_src_test() { + default + emake -C go test +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild deleted file mode 100644 index 6dc4980f1f24..000000000000 --- a/media-libs/libheif/libheif-1.12.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools 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 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/1.12" -IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265" -REQUIRED_USE="test? ( go libde265 )" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-lang/go )" -DEPEND=" - media-libs/dav1d:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) - go? ( dev-lang/go ) - libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] ) - rav1e? ( media-video/rav1e:= ) - x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i -e 's:-Werror::' configure.ac || die - - eautoreconf - - # prevent "stat heif-test.go: no such file or directory" - multilib_copy_sources -} - -multilib_src_configure() { - export GO111MODULE=auto - local econf_args=( - --disable-static - $(multilib_is_native_abi && use go || echo --disable-go) - $(use_enable aom) - $(use_enable libde265) - $(use_enable gdk-pixbuf) - $(use_enable rav1e) - $(use_enable threads multithreading) - $(use_enable x265) - ) - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_test() { - default - emake -C go test -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild index 05d7c5f68ed0..a1837ad0964d 100644 --- a/media-libs/libheif/libheif-9999.ebuild +++ b/media-libs/libheif/libheif-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" @@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif" LICENSE="GPL-3" SLOT="0/1.12" -IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265" -REQUIRED_USE="test? ( go libde265 )" +IUSE="+aom gdk-pixbuf go rav1e test +threads x265" +REQUIRED_USE="test? ( go )" RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" DEPEND=" media-libs/dav1d:=[${MULTILIB_USEDEP}] + media-libs/libde265:=[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/jpeg:0=[${MULTILIB_USEDEP}] aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) go? ( dev-lang/go ) - libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" @@ -50,10 +50,10 @@ src_prepare() { multilib_src_configure() { export GO111MODULE=auto local econf_args=( + --enable-libde265 --disable-static $(multilib_is_native_abi && use go || echo --disable-go) $(use_enable aom) - $(use_enable libde265) $(use_enable gdk-pixbuf) $(use_enable rav1e) $(use_enable threads multithreading) diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml index c8f0f34e8094..2d2f28772dda 100644 --- a/media-libs/libheif/metadata.xml +++ b/media-libs/libheif/metadata.xml @@ -9,7 +9,6 @@ Use media-libs/libaom for AVIF encoding/decoding Enable x11-libs/gdk-pixbuf plugin Enable building dev-lang/go code/examples - Use media-libs/libde265 for HEIF decoding Use media-video/rav1e for AVIF encoding Use media-libs/x265 for HEIF encoding -- cgit v1.2.3