| 1 |
commit: 7e5ad988066758717d00cbb360d708a6e71ab6e2 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 16 17:58:01 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 16 18:01:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5ad988 |
| 7 |
|
| 8 |
media-libs/libheif: Add USE=go, disable for non-native ABIs |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 11 |
Closes: https://bugs.gentoo.org/696850 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/libheif/libheif-1.7.0.ebuild | 16 +++++++--------- |
| 15 |
media-libs/libheif/libheif-9999.ebuild | 13 ++++++------- |
| 16 |
media-libs/libheif/metadata.xml | 3 +++ |
| 17 |
3 files changed, 16 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libheif/libheif-1.7.0.ebuild b/media-libs/libheif/libheif-1.7.0.ebuild |
| 20 |
index e62a26c8f09..c7406ee8a8e 100644 |
| 21 |
--- a/media-libs/libheif/libheif-1.7.0.ebuild |
| 22 |
+++ b/media-libs/libheif/libheif-1.7.0.ebuild |
| 23 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif" |
| 24 |
|
| 25 |
LICENSE="GPL-3" |
| 26 |
SLOT="0/1.6" |
| 27 |
-IUSE="static-libs test +threads" |
| 28 |
+IUSE="go static-libs test +threads" |
| 29 |
RESTRICT="!test? ( test )" |
| 30 |
|
| 31 |
BDEPEND="test? ( dev-lang/go )" |
| 32 |
@@ -28,11 +28,11 @@ DEPEND=" |
| 33 |
media-libs/x265:=[${MULTILIB_USEDEP}] |
| 34 |
sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 35 |
virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 36 |
+ go? ( dev-lang/go ) |
| 37 |
" |
| 38 |
RDEPEND="${DEPEND}" |
| 39 |
- |
| 40 |
PATCHES=( |
| 41 |
- "${FILESDIR}/${P}-aom.patch" |
| 42 |
+ "${FILESDIR}"/${P}-aom.patch |
| 43 |
) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
@@ -47,18 +47,16 @@ src_prepare() { |
| 47 |
} |
| 48 |
|
| 49 |
multilib_src_configure() { |
| 50 |
- local myeconfargs=( |
| 51 |
- $(use_enable threads multithreading) |
| 52 |
+ local econf_args=( |
| 53 |
+ $(multilib_is_native_abi && use_enable go || echo --disable-go) |
| 54 |
$(use_enable static-libs static) |
| 55 |
+ $(use_enable threads multithreading) |
| 56 |
) |
| 57 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 58 |
+ ECONF_SOURCE="${S}" econf "${econf_args[@]}" |
| 59 |
} |
| 60 |
|
| 61 |
multilib_src_install_all() { |
| 62 |
find "${ED}" -name '*.la' -delete || die |
| 63 |
- if ! use static-libs ; then |
| 64 |
- find "${ED}" -name "*.a" -delete || die |
| 65 |
- fi |
| 66 |
} |
| 67 |
|
| 68 |
pkg_postinst() { |
| 69 |
|
| 70 |
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild |
| 71 |
index 088340073a1..85e13a9e4cf 100644 |
| 72 |
--- a/media-libs/libheif/libheif-9999.ebuild |
| 73 |
+++ b/media-libs/libheif/libheif-9999.ebuild |
| 74 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif" |
| 75 |
|
| 76 |
LICENSE="GPL-3" |
| 77 |
SLOT="0/1.6" |
| 78 |
-IUSE="static-libs test +threads" |
| 79 |
+IUSE="go static-libs test +threads" |
| 80 |
RESTRICT="!test? ( test )" |
| 81 |
|
| 82 |
BDEPEND="test? ( dev-lang/go )" |
| 83 |
@@ -28,6 +28,7 @@ DEPEND=" |
| 84 |
media-libs/x265:=[${MULTILIB_USEDEP}] |
| 85 |
sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 86 |
virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 87 |
+ go? ( dev-lang/go ) |
| 88 |
" |
| 89 |
RDEPEND="${DEPEND}" |
| 90 |
|
| 91 |
@@ -43,18 +44,16 @@ src_prepare() { |
| 92 |
} |
| 93 |
|
| 94 |
multilib_src_configure() { |
| 95 |
- local myeconfargs=( |
| 96 |
- $(use_enable threads multithreading) |
| 97 |
+ local econf_args=( |
| 98 |
+ $(multilib_is_native_abi && use_enable go || echo --disable-go) |
| 99 |
$(use_enable static-libs static) |
| 100 |
+ $(use_enable threads multithreading) |
| 101 |
) |
| 102 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 103 |
+ ECONF_SOURCE="${S}" econf "${econf_args[@]}" |
| 104 |
} |
| 105 |
|
| 106 |
multilib_src_install_all() { |
| 107 |
find "${ED}" -name '*.la' -delete || die |
| 108 |
- if ! use static-libs ; then |
| 109 |
- find "${ED}" -name "*.a" -delete || die |
| 110 |
- fi |
| 111 |
} |
| 112 |
|
| 113 |
pkg_postinst() { |
| 114 |
|
| 115 |
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml |
| 116 |
index ee4cf414e0d..481879a1442 100644 |
| 117 |
--- a/media-libs/libheif/metadata.xml |
| 118 |
+++ b/media-libs/libheif/metadata.xml |
| 119 |
@@ -2,6 +2,9 @@ |
| 120 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 121 |
<pkgmetadata> |
| 122 |
<!-- maintainer-needed --> |
| 123 |
+ <use> |
| 124 |
+ <flag name='go'>Add support for <pkg>dev-lang/go</pkg></flag> |
| 125 |
+ </use> |
| 126 |
<upstream> |
| 127 |
<bugs-to>https://github.com/strukturag/libheif/issues</bugs-to> |
| 128 |
<remote-id type="github">strukturag/libheif</remote-id> |
Archives