gentoo resync : 22.01.2019

4 files changed, 48 insertions, 10 deletions

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 2c9d660149ed..d772c69c0281 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,6 +1,7 @@
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
+AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1447 BLAKE2B 82d1ae07504a1942c912bdf94bcaf0ceeeec0ad7c89ea0e4785a4ef80418b3e8ecd677fc10b7447d8d34f0c75484111d2fa03d0c66035824eb6376e9ad5f560f SHA512 a042c2292bd3e7eabfaad9fad569b5bdfcf2f90961bb884a4fa82c2f640f3392d05eb2b123cc2b1ee2b18c0be49b2cc6e95ace1996260fa82123c4747e894f66
+EBUILD vidstab-1.1.0-r1.ebuild 1661 BLAKE2B b83149cd32ba47faecfaf266ab56a4f4a248b90ab817227b49e7bea7f3174f5eed32fa1ced6a69c1652a4faa85025523dc9f68d1c6c7439d2a0deb649b2ac965 SHA512 c3fe3cf99546c38a65e3b4a17a56d341aba8bc87bdd6e2d81296936550250c7e09f16d49fb076485d304df57e4887b5623c79f031a706d50eebd641e13e7f4ae
 EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
-EBUILD vidstab-9999.ebuild 1360 BLAKE2B fe1915e7b6bd2f22df1d4c91a1bf18ab5d772be6fb95affe32c30bd01437621509655e8758770d257a00e57f0d0ae4c966f6b6f0cd24a455e7c320f0dcdfd58f SHA512 a4e104d78359493e83947900406f5e3904cb132f45a81a2cb613fed4d9c8f932eaaffe0235f878f3b8fef6f07fa9dce39272d3439ef9f848dbbd177e27539c0f
+EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
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
new file mode 100644
index 000000000000..fc7deca503e6
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
@@ -0,0 +1,33 @@
+From 80932fbd1e77d397a7b503697c78fd888ede396a Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 14 Jan 2019 11:08:30 -0500
+Subject: [PATCH] In tests, use sse2 only if it is available
+
+Use FindSSE and SSE2_FOUND in the same way as done in the main CMakeLists.txt in commit 0f41dfb89ba3fa7d20f45cbeb02cc1ff37c89c27
+---
+ tests/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 9597141..6812916 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -7,6 +7,8 @@ project (vid.stab)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
+ 
++include (FindSSE)
++
+ option(USE_OMP "use parallelization use OMP" ON)
+ 
+ # Default to debug builds if no explicit build type specified.
+@@ -23,7 +25,9 @@ else()
+ add_definitions( -DDISABLE_ORC)
+ endif()
+ 
++if(SSE2_FOUND)
+ add_definitions( -DUSE_SSE2 -msse2 -ffast-math -fno-show-column ) # -DUSE_SSE2_ASM
++endif()
+ 
+ if(USE_OMP)
+ add_definitions(-fopenmp -DUSE_OMP)
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 31b7ac658193..3c4dc91eba9a 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
@@ -24,14 +24,16 @@ SLOT="0"
 IUSE="openmp cpu_flags_x86_sse2"
 PATCHES=(
 	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
+	"${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch"
 )
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead
-	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
+	sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
 	# strip some CFLAGS
 	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
-		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
 	done
 	cmake-utils_src_prepare
 }
@@ -48,6 +50,7 @@ src_configure() {
 multilib_src_test() {
 	local mycmakeargs=(
 		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
 	)
 	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
 	local BUILD_DIR="${BUILD_DIR}/tests"
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index c694caee1d91..447fa8556869 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -22,14 +22,14 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="openmp cpu_flags_x86_sse2"
-
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead
-	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
+	sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
 	# strip some CFLAGS
 	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
-		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
 	done
 	cmake-utils_src_prepare
 }
@@ -46,6 +46,7 @@ src_configure() {
 multilib_src_test() {
 	local mycmakeargs=(
 		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
 	)
 	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
 	local BUILD_DIR="${BUILD_DIR}/tests"