Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/
Date: Fri, 11 Jan 2019 16:15:05
Message-Id: 1547223294.08db7b7e1b39d43d2e71f65009313dab8788a89b.candrews@gentoo
commit:     08db7b7e1b39d43d2e71f65009313dab8788a89b
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 16:08:44 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> 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 <candrews <AT> 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)"
 	)