From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79698138359 for ; Sun, 16 Aug 2020 18:01:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC9C6E085A; Sun, 16 Aug 2020 18:01:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80E1CE085A for ; Sun, 16 Aug 2020 18:01:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35F6234EF94 for ; Sun, 16 Aug 2020 18:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AEF024C for ; Sun, 16 Aug 2020 18:01:49 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1597600903.7e5ad988066758717d00cbb360d708a6e71ab6e2.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libheif/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libheif/libheif-1.7.0.ebuild media-libs/libheif/libheif-9999.ebuild media-libs/libheif/metadata.xml X-VCS-Directories: media-libs/libheif/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 7e5ad988066758717d00cbb360d708a6e71ab6e2 X-VCS-Branch: master Date: Sun, 16 Aug 2020 18:01:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12ffcfcb-0165-434f-9ac7-9121c9ad4cfd X-Archives-Hash: 3ec1d599ae152d7e7188dda11144998f commit: 7e5ad988066758717d00cbb360d708a6e71ab6e2 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Aug 16 17:58:01 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Aug 16 18:01:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5ad988 media-libs/libheif: Add USE=go, disable for non-native ABIs Package-Manager: Portage-3.0.2, Repoman-2.3.23 Closes: https://bugs.gentoo.org/696850 Signed-off-by: Jeroen Roovers gentoo.org> media-libs/libheif/libheif-1.7.0.ebuild | 16 +++++++--------- media-libs/libheif/libheif-9999.ebuild | 13 ++++++------- media-libs/libheif/metadata.xml | 3 +++ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media-libs/libheif/libheif-1.7.0.ebuild b/media-libs/libheif/libheif-1.7.0.ebuild index e62a26c8f09..c7406ee8a8e 100644 --- a/media-libs/libheif/libheif-1.7.0.ebuild +++ b/media-libs/libheif/libheif-1.7.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif" LICENSE="GPL-3" SLOT="0/1.6" -IUSE="static-libs test +threads" +IUSE="go static-libs test +threads" RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" @@ -28,11 +28,11 @@ DEPEND=" media-libs/x265:=[${MULTILIB_USEDEP}] sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/jpeg:0=[${MULTILIB_USEDEP}] + go? ( dev-lang/go ) " RDEPEND="${DEPEND}" - PATCHES=( - "${FILESDIR}/${P}-aom.patch" + "${FILESDIR}"/${P}-aom.patch ) src_prepare() { @@ -47,18 +47,16 @@ src_prepare() { } multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) + local econf_args=( + $(multilib_is_native_abi && use_enable go || echo --disable-go) $(use_enable static-libs static) + $(use_enable threads multithreading) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" econf "${econf_args[@]}" } multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi } pkg_postinst() { diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild index 088340073a1..85e13a9e4cf 100644 --- a/media-libs/libheif/libheif-9999.ebuild +++ b/media-libs/libheif/libheif-9999.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/strukturag/libheif" LICENSE="GPL-3" SLOT="0/1.6" -IUSE="static-libs test +threads" +IUSE="go static-libs test +threads" RESTRICT="!test? ( test )" BDEPEND="test? ( dev-lang/go )" @@ -28,6 +28,7 @@ DEPEND=" media-libs/x265:=[${MULTILIB_USEDEP}] sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/jpeg:0=[${MULTILIB_USEDEP}] + go? ( dev-lang/go ) " RDEPEND="${DEPEND}" @@ -43,18 +44,16 @@ src_prepare() { } multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) + local econf_args=( + $(multilib_is_native_abi && use_enable go || echo --disable-go) $(use_enable static-libs static) + $(use_enable threads multithreading) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" econf "${econf_args[@]}" } multilib_src_install_all() { find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi } pkg_postinst() { diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml index ee4cf414e0d..481879a1442 100644 --- a/media-libs/libheif/metadata.xml +++ b/media-libs/libheif/metadata.xml @@ -2,6 +2,9 @@ + + Add support for dev-lang/go + https://github.com/strukturag/libheif/issues strukturag/libheif