| 1 |
commit: 08db7b7e1b39d43d2e71f65009313dab8788a89b |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 11 16:08:44 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 11 16:14:54 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08db7b7e |
| 7 |
|
| 8 |
media-libs/vidstab: multilib support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{vidstab-9999.ebuild => vidstab-1.1.0-r1.ebuild} | 15 +++++++++------ |
| 14 |
media-libs/vidstab/vidstab-9999.ebuild | 11 ++++++----- |
| 15 |
2 files changed, 15 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 18 |
similarity index 84% |
| 19 |
copy from media-libs/vidstab/vidstab-9999.ebuild |
| 20 |
copy to media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 21 |
index 08bf38d3955..31b7ac65819 100644 |
| 22 |
--- a/media-libs/vidstab/vidstab-9999.ebuild |
| 23 |
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 24 |
@@ -1,9 +1,11 @@ |
| 25 |
# Copyright 2018-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=7 |
| 29 |
+EAPI=6 |
| 30 |
|
| 31 |
-inherit cmake-utils toolchain-funcs |
| 32 |
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 33 |
+ |
| 34 |
+inherit cmake-multilib toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="Video stabilization library" |
| 37 |
HOMEPAGE="http://public.hronopik.de/vid.stab/" |
| 38 |
@@ -20,7 +22,9 @@ fi |
| 39 |
LICENSE="GPL-2+" |
| 40 |
SLOT="0" |
| 41 |
IUSE="openmp cpu_flags_x86_sse2" |
| 42 |
- |
| 43 |
+PATCHES=( |
| 44 |
+ "${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch" |
| 45 |
+) |
| 46 |
src_prepare() { |
| 47 |
# USE=cpu_flags_x86_sse2 instead |
| 48 |
sed -E 's#include (FindSSE)##' -i CMakeLists.txt |
| 49 |
@@ -38,11 +42,10 @@ src_configure() { |
| 50 |
-DUSE_OMP="$(usex openmp)" |
| 51 |
-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" |
| 52 |
) |
| 53 |
- cmake-utils_src_configure |
| 54 |
+ cmake-multilib_src_configure |
| 55 |
} |
| 56 |
|
| 57 |
-src_test() { |
| 58 |
- cd tests || die |
| 59 |
+multilib_src_test() { |
| 60 |
local mycmakeargs=( |
| 61 |
-DUSE_OMP="$(usex openmp)" |
| 62 |
) |
| 63 |
|
| 64 |
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild |
| 65 |
index 08bf38d3955..c694caee1d9 100644 |
| 66 |
--- a/media-libs/vidstab/vidstab-9999.ebuild |
| 67 |
+++ b/media-libs/vidstab/vidstab-9999.ebuild |
| 68 |
@@ -1,9 +1,11 @@ |
| 69 |
# Copyright 2018-2019 Gentoo Authors |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
-EAPI=7 |
| 73 |
+EAPI=6 |
| 74 |
|
| 75 |
-inherit cmake-utils toolchain-funcs |
| 76 |
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 77 |
+ |
| 78 |
+inherit cmake-multilib toolchain-funcs |
| 79 |
|
| 80 |
DESCRIPTION="Video stabilization library" |
| 81 |
HOMEPAGE="http://public.hronopik.de/vid.stab/" |
| 82 |
@@ -38,11 +40,10 @@ src_configure() { |
| 83 |
-DUSE_OMP="$(usex openmp)" |
| 84 |
-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" |
| 85 |
) |
| 86 |
- cmake-utils_src_configure |
| 87 |
+ cmake-multilib_src_configure |
| 88 |
} |
| 89 |
|
| 90 |
-src_test() { |
| 91 |
- cd tests || die |
| 92 |
+multilib_src_test() { |
| 93 |
local mycmakeargs=( |
| 94 |
-DUSE_OMP="$(usex openmp)" |
| 95 |
) |
Archives