| 1 |
commit: 947ba1da0999c9c613d32c92cbeb59579aa466d6 |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 19 08:01:31 2021 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 19 08:02:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947ba1da |
| 7 |
|
| 8 |
media-libs/libheif: Enable libde265 unconditionally |
| 9 |
|
| 10 |
- Since libheif can't decode HEIF file without it it's not a good idea |
| 11 |
to disable libde265 support, so let's just enable it unconditionally |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/813669 |
| 14 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{libheif-1.12.0.ebuild => libheif-1.12.0-r1.ebuild} | 8 ++++---- |
| 17 |
media-libs/libheif/libheif-9999.ebuild | 10 +++++----- |
| 18 |
media-libs/libheif/metadata.xml | 1 - |
| 19 |
3 files changed, 9 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0-r1.ebuild |
| 22 |
similarity index 90% |
| 23 |
rename from media-libs/libheif/libheif-1.12.0.ebuild |
| 24 |
rename to media-libs/libheif/libheif-1.12.0-r1.ebuild |
| 25 |
index 6dc4980f1f2..f90f0e7b6cc 100644 |
| 26 |
--- a/media-libs/libheif/libheif-1.12.0.ebuild |
| 27 |
+++ b/media-libs/libheif/libheif-1.12.0-r1.ebuild |
| 28 |
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif" |
| 29 |
|
| 30 |
LICENSE="GPL-3" |
| 31 |
SLOT="0/1.12" |
| 32 |
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265" |
| 33 |
-REQUIRED_USE="test? ( go libde265 )" |
| 34 |
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265" |
| 35 |
+REQUIRED_USE="test? ( go )" |
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
BDEPEND="test? ( dev-lang/go )" |
| 39 |
DEPEND=" |
| 40 |
media-libs/dav1d:=[${MULTILIB_USEDEP}] |
| 41 |
+ media-libs/libde265:=[${MULTILIB_USEDEP}] |
| 42 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 43 |
sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 44 |
virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 45 |
aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] ) |
| 46 |
gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) |
| 47 |
go? ( dev-lang/go ) |
| 48 |
- libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] ) |
| 49 |
rav1e? ( media-video/rav1e:= ) |
| 50 |
x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )" |
| 51 |
RDEPEND="${DEPEND}" |
| 52 |
@@ -50,10 +50,10 @@ src_prepare() { |
| 53 |
multilib_src_configure() { |
| 54 |
export GO111MODULE=auto |
| 55 |
local econf_args=( |
| 56 |
+ --enable-libde265 |
| 57 |
--disable-static |
| 58 |
$(multilib_is_native_abi && use go || echo --disable-go) |
| 59 |
$(use_enable aom) |
| 60 |
- $(use_enable libde265) |
| 61 |
$(use_enable gdk-pixbuf) |
| 62 |
$(use_enable rav1e) |
| 63 |
$(use_enable threads multithreading) |
| 64 |
|
| 65 |
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild |
| 66 |
index 05d7c5f68ed..a1837ad0964 100644 |
| 67 |
--- a/media-libs/libheif/libheif-9999.ebuild |
| 68 |
+++ b/media-libs/libheif/libheif-9999.ebuild |
| 69 |
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then |
| 70 |
inherit git-r3 |
| 71 |
else |
| 72 |
SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz" |
| 73 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 74 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
| 75 |
fi |
| 76 |
|
| 77 |
DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" |
| 78 |
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif" |
| 79 |
|
| 80 |
LICENSE="GPL-3" |
| 81 |
SLOT="0/1.12" |
| 82 |
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265" |
| 83 |
-REQUIRED_USE="test? ( go libde265 )" |
| 84 |
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265" |
| 85 |
+REQUIRED_USE="test? ( go )" |
| 86 |
RESTRICT="!test? ( test )" |
| 87 |
|
| 88 |
BDEPEND="test? ( dev-lang/go )" |
| 89 |
DEPEND=" |
| 90 |
media-libs/dav1d:=[${MULTILIB_USEDEP}] |
| 91 |
+ media-libs/libde265:=[${MULTILIB_USEDEP}] |
| 92 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 93 |
sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 94 |
virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 95 |
aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] ) |
| 96 |
gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] ) |
| 97 |
go? ( dev-lang/go ) |
| 98 |
- libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] ) |
| 99 |
rav1e? ( media-video/rav1e:= ) |
| 100 |
x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )" |
| 101 |
RDEPEND="${DEPEND}" |
| 102 |
@@ -50,10 +50,10 @@ src_prepare() { |
| 103 |
multilib_src_configure() { |
| 104 |
export GO111MODULE=auto |
| 105 |
local econf_args=( |
| 106 |
+ --enable-libde265 |
| 107 |
--disable-static |
| 108 |
$(multilib_is_native_abi && use go || echo --disable-go) |
| 109 |
$(use_enable aom) |
| 110 |
- $(use_enable libde265) |
| 111 |
$(use_enable gdk-pixbuf) |
| 112 |
$(use_enable rav1e) |
| 113 |
$(use_enable threads multithreading) |
| 114 |
|
| 115 |
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml |
| 116 |
index c8f0f34e809..2d2f28772dd 100644 |
| 117 |
--- a/media-libs/libheif/metadata.xml |
| 118 |
+++ b/media-libs/libheif/metadata.xml |
| 119 |
@@ -9,7 +9,6 @@ |
| 120 |
<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag> |
| 121 |
<flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag> |
| 122 |
<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag> |
| 123 |
- <flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag> |
| 124 |
<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag> |
| 125 |
<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag> |
| 126 |
</use> |
Archives