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 2D2A8138334 for ; Wed, 12 Sep 2018 13:32:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D330EE0BDF; Wed, 12 Sep 2018 13:32:14 +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 96CBDE0BDF for ; Wed, 12 Sep 2018 13:32:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DFE7B335CEA for ; Wed, 12 Sep 2018 13:32:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D023D3BE for ; Wed, 12 Sep 2018 13:32:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1536759109.542ec773a991348223730e7859e78f45c6b2c895.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libde265/libde265-1.0.3.ebuild media-libs/libde265/libde265-9999.ebuild X-VCS-Directories: media-libs/libde265/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 542ec773a991348223730e7859e78f45c6b2c895 X-VCS-Branch: master Date: Wed, 12 Sep 2018 13:32:09 +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-Archives-Salt: 79331102-063d-4fa2-8b1f-bd962b5e8cb4 X-Archives-Hash: 401416fd33e9d9b3483cad22097fa6cf commit: 542ec773a991348223730e7859e78f45c6b2c895 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 12 13:30:52 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 12 13:31:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ec773 media-libs/libde265: Add missing MULTILIB_USEDEP, fix USE=qt5 Qt5 is not multilib enabled, so disable if !multilib_is_native_abi Bug: https://bugs.gentoo.org/656772 Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-libs/libde265/libde265-1.0.3.ebuild | 24 ++++++++++++++++-------- media-libs/libde265/libde265-9999.ebuild | 20 ++++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild index c9de64e6a52..90112fb2fd0 100644 --- a/media-libs/libde265/libde265-1.0.3.ebuild +++ b/media-libs/libde265/libde265-1.0.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools multilib-minimal @@ -13,8 +13,6 @@ if [[ ${PV} == "9999" ]] ; then else SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - - PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch ) fi DESCRIPTION="Open h.265 video codec implementation" @@ -23,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="debug qt5 static-libs cpu_flags_x86_sse" +IUSE="cpu_flags_x86_sse debug qt5 static-libs" DEPEND=" - media-libs/libsdl - virtual/ffmpeg + media-libs/libsdl[${MULTILIB_USEDEP}] + virtual/ffmpeg[${MULTILIB_USEDEP}] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -36,6 +34,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch ) + src_prepare() { default @@ -52,10 +52,18 @@ multilib_src_configure() { $(use_enable debug log-info) $(use_enable debug log-debug) $(use_enable debug log-trace) - $(use_enable qt5 dec265) - $(use_enable qt5 sherlock265) --enable-log-error ) + + if ! multilib_is_native_abi; then + myeconfargs+=( --disable-dec265 --disable-sherlock265 ) + else + myeconfargs+=( + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) + ) + fi + econf "${myeconfargs[@]}" } diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild index 271e443495b..91cbdf94843 100644 --- a/media-libs/libde265/libde265-9999.ebuild +++ b/media-libs/libde265/libde265-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit autotools multilib-minimal @@ -21,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="debug qt5 static-libs cpu_flags_x86_sse" +IUSE="cpu_flags_x86_sse debug qt5 static-libs" DEPEND=" - media-libs/libsdl - virtual/ffmpeg + media-libs/libsdl[${MULTILIB_USEDEP}] + virtual/ffmpeg[${MULTILIB_USEDEP}] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -50,10 +50,18 @@ multilib_src_configure() { $(use_enable debug log-info) $(use_enable debug log-debug) $(use_enable debug log-trace) - $(use_enable qt5 dec265) - $(use_enable qt5 sherlock265) --enable-log-error ) + + if ! multilib_is_native_abi; then + myeconfargs+=( --disable-dec265 --disable-sherlock265 ) + else + myeconfargs+=( + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) + ) + fi + econf "${myeconfargs[@]}" }