| 1 |
commit: 3a19c8172c6e0b736ea746132956aa5dddc18d1b |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 14 16:14:57 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 16:15:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a19c817 |
| 7 |
|
| 8 |
media-libs/vidstab: For tests, use sse2 only if it is available |
| 9 |
|
| 10 |
Reported upstream at https://github.com/georgmartius/vid.stab/pull/70 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/675318 |
| 13 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 14 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 15 |
|
| 16 |
...ab-1.1.0-tests-use-sse2-only-if-available.patch | 33 ++++++++++++++++++++++ |
| 17 |
media-libs/vidstab/vidstab-1.1.0-r1.ebuild | 9 ++++-- |
| 18 |
media-libs/vidstab/vidstab-9999.ebuild | 9 +++--- |
| 19 |
3 files changed, 44 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..fc7deca503e |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch |
| 26 |
@@ -0,0 +1,33 @@ |
| 27 |
+From 80932fbd1e77d397a7b503697c78fd888ede396a Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Craig Andrews <candrews@××××××××××××.com> |
| 29 |
+Date: Mon, 14 Jan 2019 11:08:30 -0500 |
| 30 |
+Subject: [PATCH] In tests, use sse2 only if it is available |
| 31 |
+ |
| 32 |
+Use FindSSE and SSE2_FOUND in the same way as done in the main CMakeLists.txt in commit 0f41dfb89ba3fa7d20f45cbeb02cc1ff37c89c27 |
| 33 |
+--- |
| 34 |
+ tests/CMakeLists.txt | 4 ++++ |
| 35 |
+ 1 file changed, 4 insertions(+) |
| 36 |
+ |
| 37 |
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
| 38 |
+index 9597141..6812916 100644 |
| 39 |
+--- a/tests/CMakeLists.txt |
| 40 |
++++ b/tests/CMakeLists.txt |
| 41 |
+@@ -7,6 +7,8 @@ project (vid.stab) |
| 42 |
+ |
| 43 |
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/") |
| 44 |
+ |
| 45 |
++include (FindSSE) |
| 46 |
++ |
| 47 |
+ option(USE_OMP "use parallelization use OMP" ON) |
| 48 |
+ |
| 49 |
+ # Default to debug builds if no explicit build type specified. |
| 50 |
+@@ -23,7 +25,9 @@ else() |
| 51 |
+ add_definitions( -DDISABLE_ORC) |
| 52 |
+ endif() |
| 53 |
+ |
| 54 |
++if(SSE2_FOUND) |
| 55 |
+ add_definitions( -DUSE_SSE2 -msse2 -ffast-math -fno-show-column ) # -DUSE_SSE2_ASM |
| 56 |
++endif() |
| 57 |
+ |
| 58 |
+ if(USE_OMP) |
| 59 |
+ add_definitions(-fopenmp -DUSE_OMP) |
| 60 |
|
| 61 |
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 62 |
index 31b7ac65819..a6e5eadfa24 100644 |
| 63 |
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 64 |
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild |
| 65 |
@@ -24,14 +24,16 @@ SLOT="0" |
| 66 |
IUSE="openmp cpu_flags_x86_sse2" |
| 67 |
PATCHES=( |
| 68 |
"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch" |
| 69 |
+ "${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch" |
| 70 |
) |
| 71 |
src_prepare() { |
| 72 |
# USE=cpu_flags_x86_sse2 instead |
| 73 |
- sed -E 's#include (FindSSE)##' -i CMakeLists.txt |
| 74 |
+ sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die |
| 75 |
+ sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die |
| 76 |
# strip some CFLAGS |
| 77 |
for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do |
| 78 |
- sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} |
| 79 |
- sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} |
| 80 |
+ sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die |
| 81 |
+ sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die |
| 82 |
done |
| 83 |
cmake-utils_src_prepare |
| 84 |
} |
| 85 |
@@ -48,6 +50,7 @@ src_configure() { |
| 86 |
multilib_src_test() { |
| 87 |
local mycmakeargs=( |
| 88 |
-DUSE_OMP="$(usex openmp)" |
| 89 |
+ -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" |
| 90 |
) |
| 91 |
local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests" |
| 92 |
local BUILD_DIR="${BUILD_DIR}/tests" |
| 93 |
|
| 94 |
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild |
| 95 |
index c694caee1d9..447fa855686 100644 |
| 96 |
--- a/media-libs/vidstab/vidstab-9999.ebuild |
| 97 |
+++ b/media-libs/vidstab/vidstab-9999.ebuild |
| 98 |
@@ -22,14 +22,14 @@ fi |
| 99 |
LICENSE="GPL-2+" |
| 100 |
SLOT="0" |
| 101 |
IUSE="openmp cpu_flags_x86_sse2" |
| 102 |
- |
| 103 |
src_prepare() { |
| 104 |
# USE=cpu_flags_x86_sse2 instead |
| 105 |
- sed -E 's#include (FindSSE)##' -i CMakeLists.txt |
| 106 |
+ sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die |
| 107 |
+ sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die |
| 108 |
# strip some CFLAGS |
| 109 |
for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do |
| 110 |
- sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} |
| 111 |
- sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} |
| 112 |
+ sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die |
| 113 |
+ sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die |
| 114 |
done |
| 115 |
cmake-utils_src_prepare |
| 116 |
} |
| 117 |
@@ -46,6 +46,7 @@ src_configure() { |
| 118 |
multilib_src_test() { |
| 119 |
local mycmakeargs=( |
| 120 |
-DUSE_OMP="$(usex openmp)" |
| 121 |
+ -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" |
| 122 |
) |
| 123 |
local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests" |
| 124 |
local BUILD_DIR="${BUILD_DIR}/tests" |
Archives