gentoo resync : 16.02.1018

3 files changed, 30 insertions, 2 deletions

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index d772c69c0281..1ca686533642 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,7 +1,8 @@
+AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLAKE2B 69c70f8b9dcefb9f1f4696d7911b34d2a4b9abea43a283cbc66faa923d5e566cf04ec996f7073a2440356a2f5889684cdcae2bb42787695b762045948b58ce18 SHA512 6ff92765e21a9f883d5ebbcd647c17f443fe4e47bda32899c7950a63e74427ffe939021adc1bd74f9fb9c72d7c11300cbe46d8ce4ee662036f93c68ee7c5b934
 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 1661 BLAKE2B b83149cd32ba47faecfaf266ab56a4f4a248b90ab817227b49e7bea7f3174f5eed32fa1ced6a69c1652a4faa85025523dc9f68d1c6c7439d2a0deb649b2ac965 SHA512 c3fe3cf99546c38a65e3b4a17a56d341aba8bc87bdd6e2d81296936550250c7e09f16d49fb076485d304df57e4887b5623c79f031a706d50eebd641e13e7f4ae
+EBUILD vidstab-1.1.0-r1.ebuild 1752 BLAKE2B 79290984b0ab133d9f7d8d0d99e451e54dfed62a949a5e15d95e1f657ac9ef8089cf8f966ab730b11df3547e3171c19365aeaf14a5b95ec1a34d473c200f42d8 SHA512 6ffb9dc71a558d36bcfd7390811cf78775ad674452a4d466c256e057336283c11cb0a11277e188cd1fed7f58cfeb55891ba3969795e3d7a4823e98ec7ff9e021
 EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
 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-1.1.0-fix-test_motiondetect-without-openmp.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
new file mode 100644
index 000000000000..88d260f429ca
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
@@ -0,0 +1,26 @@
+From a6438c4b3ea5a00f2896b903a4bda0a4efa241f4 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 12 Feb 2019 16:39:06 -0500
+Subject: [PATCH] Use OpenMP only if available in test_motiondetect
+
+Only call `omp_set_dynamic( 1 );` if `USE_OMP`
+
+Fixes `undefined reference to `omp_set_dynamic'` when not using OpenMP
+---
+ tests/test_motiondetect.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test_motiondetect.c b/tests/test_motiondetect.c
+index 0f37def..125f4bd 100644
+--- a/tests/test_motiondetect.c
++++ b/tests/test_motiondetect.c
+@@ -19,7 +19,9 @@ void test_motionDetect(TestData* testdata){
+     int i;
+ 
+     int start = timeOfDayinMS();
++#ifdef USE_OMP
+     omp_set_dynamic( 1 );
++#endif
+     md.conf.numThreads=threads;
+ 
+     for(i=0; i<numruns; i++){
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 3c4dc91eba9a..cf1db90cbdc0 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 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
@@ -25,6 +25,7 @@ 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"
+	"${FILESDIR}/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch"
 )
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead