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 D0C44138334 for ; Fri, 11 Jan 2019 16:15:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 968BFE0A89; Fri, 11 Jan 2019 16:15:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 63212E0A89 for ; Fri, 11 Jan 2019 16:15:04 +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 B3AD1335CFA for ; Fri, 11 Jan 2019 16:15:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFE864E7 for ; Fri, 11 Jan 2019 16:15:00 +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: <1547223294.08db7b7e1b39d43d2e71f65009313dab8788a89b.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vidstab/vidstab-1.1.0-r1.ebuild media-libs/vidstab/vidstab-9999.ebuild X-VCS-Directories: media-libs/vidstab/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 08db7b7e1b39d43d2e71f65009313dab8788a89b X-VCS-Branch: master Date: Fri, 11 Jan 2019 16:15:00 +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: 0ed201db-92dd-4f50-899e-06a32078d5c2 X-Archives-Hash: f03f17746d098a3a2cd0c93ade80fd14 commit: 08db7b7e1b39d43d2e71f65009313dab8788a89b Author: Craig Andrews gentoo org> AuthorDate: Fri Jan 11 16:08:44 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Fri Jan 11 16:14:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08db7b7e media-libs/vidstab: multilib support Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Craig Andrews gentoo.org> .../{vidstab-9999.ebuild => vidstab-1.1.0-r1.ebuild} | 15 +++++++++------ media-libs/vidstab/vidstab-9999.ebuild | 11 ++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild similarity index 84% copy from media-libs/vidstab/vidstab-9999.ebuild copy to media-libs/vidstab/vidstab-1.1.0-r1.ebuild index 08bf38d3955..31b7ac65819 100644 --- a/media-libs/vidstab/vidstab-9999.ebuild +++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild @@ -1,9 +1,11 @@ # Copyright 2018-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -inherit cmake-utils toolchain-funcs +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} + +inherit cmake-multilib toolchain-funcs DESCRIPTION="Video stabilization library" HOMEPAGE="http://public.hronopik.de/vid.stab/" @@ -20,7 +22,9 @@ fi LICENSE="GPL-2+" SLOT="0" IUSE="openmp cpu_flags_x86_sse2" - +PATCHES=( + "${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch" +) src_prepare() { # USE=cpu_flags_x86_sse2 instead sed -E 's#include (FindSSE)##' -i CMakeLists.txt @@ -38,11 +42,10 @@ src_configure() { -DUSE_OMP="$(usex openmp)" -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" ) - cmake-utils_src_configure + cmake-multilib_src_configure } -src_test() { - cd tests || die +multilib_src_test() { local mycmakeargs=( -DUSE_OMP="$(usex openmp)" ) diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild index 08bf38d3955..c694caee1d9 100644 --- a/media-libs/vidstab/vidstab-9999.ebuild +++ b/media-libs/vidstab/vidstab-9999.ebuild @@ -1,9 +1,11 @@ # Copyright 2018-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -inherit cmake-utils toolchain-funcs +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} + +inherit cmake-multilib toolchain-funcs DESCRIPTION="Video stabilization library" HOMEPAGE="http://public.hronopik.de/vid.stab/" @@ -38,11 +40,10 @@ src_configure() { -DUSE_OMP="$(usex openmp)" -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" ) - cmake-utils_src_configure + cmake-multilib_src_configure } -src_test() { - cd tests || die +multilib_src_test() { local mycmakeargs=( -DUSE_OMP="$(usex openmp)" )