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 157BE138334 for ; Tue, 4 Dec 2018 14:08:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03F6BE0B1E; Tue, 4 Dec 2018 14:08:34 +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 B4418E0B1E for ; Tue, 4 Dec 2018 14:08:33 +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 DD579335CD9 for ; Tue, 4 Dec 2018 14:08:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D571463 for ; Tue, 4 Dec 2018 14:08:27 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1543932473.d62c635158deae0918d32b476800b28f17d8d0f2.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild media-libs/kvazaar/kvazaar-9999.ebuild X-VCS-Directories: media-libs/kvazaar/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: d62c635158deae0918d32b476800b28f17d8d0f2 X-VCS-Branch: master Date: Tue, 4 Dec 2018 14:08:27 +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: ffe7f649-9374-42c3-b09c-50f5554e9929 X-Archives-Hash: 72e3484107cb40dd9593b0a3904e13e9 commit: d62c635158deae0918d32b476800b28f17d8d0f2 Author: Craig Andrews gentoo org> AuthorDate: Mon Nov 26 19:16:18 2018 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Dec 4 14:07:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62c6351 media-libs/kvazaar: EAPI=7, test deps, fix tests Bug: https://bugs.gentoo.org/671146 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Craig Andrews gentoo.org> .../kvazaar/{kvazaar-9999.ebuild => kvazaar-1.2.0-r1.ebuild} | 11 ++++++++++- media-libs/kvazaar/kvazaar-9999.ebuild | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild similarity index 81% copy from media-libs/kvazaar/kvazaar-9999.ebuild copy to media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild index 48ce175d048..b8685352e22 100644 --- a/media-libs/kvazaar/kvazaar-9999.ebuild +++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GREATEST_PV="1.2.1" @@ -24,9 +24,13 @@ SLOT="0/4" IUSE="static-libs test" REQUIRED_USE="test? ( static-libs )" +RESTRICT="!test? ( test )" ASM_DEP=">=dev-lang/yasm-1.2.0" RDEPEND="" DEPEND="${RDEPEND} + test? ( + media-video/ffmpeg + ) abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) " @@ -42,6 +46,11 @@ src_prepare() { fi # Some m4 macros append Werror, we do not want that. append-flags "-Wno-error" + + # valgrind isn't available on all archs + # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) + # see https://github.com/ultravideo/kvazaar/issues/216 + find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die } multilib_src_configure() { diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild index 48ce175d048..b8685352e22 100644 --- a/media-libs/kvazaar/kvazaar-9999.ebuild +++ b/media-libs/kvazaar/kvazaar-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GREATEST_PV="1.2.1" @@ -24,9 +24,13 @@ SLOT="0/4" IUSE="static-libs test" REQUIRED_USE="test? ( static-libs )" +RESTRICT="!test? ( test )" ASM_DEP=">=dev-lang/yasm-1.2.0" RDEPEND="" DEPEND="${RDEPEND} + test? ( + media-video/ffmpeg + ) abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) " @@ -42,6 +46,11 @@ src_prepare() { fi # Some m4 macros append Werror, we do not want that. append-flags "-Wno-error" + + # valgrind isn't available on all archs + # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) + # see https://github.com/ultravideo/kvazaar/issues/216 + find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die } multilib_src_configure() {