public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/files/, media-libs/vidstab/
@ 2019-01-11  1:28 Craig Andrews
  0 siblings, 0 replies; 3+ messages in thread
From: Craig Andrews @ 2019-01-11  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     077738eb8a9905827e615ddb1ac2e788337b1291
Author:     Kalin KOZHUHAROV <me.kalin <AT> gmail <DOT> com>
AuthorDate: Thu Jan 10 10:49:38 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 01:28:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077738eb

media-libs/vidstab: Video stabilization library

Closes: https://bugs.gentoo.org/517892
Signed-off-by: Kalin KOZHUHAROV <kalin <AT> thinrope.net>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-libs/vidstab/Manifest                        |  1 +
 ...-tests-should-exit-with-code-0-on-success.patch | 25 ++++++++++
 media-libs/vidstab/metadata.xml                    | 19 ++++++++
 media-libs/vidstab/vidstab-1.1.0.ebuild            | 56 ++++++++++++++++++++++
 media-libs/vidstab/vidstab-9999.ebuild             | 54 +++++++++++++++++++++
 5 files changed, 155 insertions(+)

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
new file mode 100644
index 00000000000..d586baac917
--- /dev/null
+++ b/media-libs/vidstab/Manifest
@@ -0,0 +1 @@
+DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf

diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
new file mode 100644
index 00000000000..1f73c50a49e
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
@@ -0,0 +1,25 @@
+https://github.com/georgmartius/vid.stab/pull/69
+
+From dff58ee5a26569a7eeb881d204b428ee5da40746 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 10 Jan 2019 13:47:10 -0500
+Subject: [PATCH] tests should exit with code 0 on success
+
+Exit code 0 indicates success, anything else indicates failure. Therefore, unittest_summary() should return 0 if no tests failed.
+---
+ tests/testframework.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testframework.c b/tests/testframework.c
+index a38851c..a889560 100644
+--- a/tests/testframework.c
++++ b/tests/testframework.c
+@@ -36,7 +36,7 @@ int unittest_summary(){
+   fprintf(stderr, "UNIT TESTs succeeded:\t %s%i/%i\033[0m\n",
+           units_failed>0 ? "\033[1;31m" : "\033[1;32m",
+           units_success, units_success + units_failed);
+-  return units_failed==0;
++  return units_failed!=0;
+ 
+ }
+ 

diff --git a/media-libs/vidstab/metadata.xml b/media-libs/vidstab/metadata.xml
new file mode 100644
index 00000000000..da5303a4c0e
--- /dev/null
+++ b/media-libs/vidstab/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Kalin KOZHUHAROV</name>
+    <email>kalin@thinrope.net</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">georgmartius/vid.stab</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/media-libs/vidstab/vidstab-1.1.0.ebuild b/media-libs/vidstab/vidstab-1.1.0.ebuild
new file mode 100644
index 00000000000..71caeda1378
--- /dev/null
+++ b/media-libs/vidstab/vidstab-1.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+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
+	# 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}
+	done
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-check-openmp
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests || die
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake-utils_src_configure
+	cmake-utils_src_make
+	"${BUILD_DIR}"/tests || die
+}

diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
new file mode 100644
index 00000000000..08bf38d3955
--- /dev/null
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+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
+	# 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}
+	done
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-check-openmp
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests || die
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake-utils_src_configure
+	cmake-utils_src_make
+	"${BUILD_DIR}"/tests || die
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/files/, media-libs/vidstab/
@ 2019-01-14 16:15 Craig Andrews
  0 siblings, 0 replies; 3+ messages in thread
From: Craig Andrews @ 2019-01-14 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3a19c8172c6e0b736ea746132956aa5dddc18d1b
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 16:14:57 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 16:15:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a19c817

media-libs/vidstab: For tests, use sse2 only if it is available

Reported upstream at https://github.com/georgmartius/vid.stab/pull/70

Closes: https://bugs.gentoo.org/675318
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 ...ab-1.1.0-tests-use-sse2-only-if-available.patch | 33 ++++++++++++++++++++++
 media-libs/vidstab/vidstab-1.1.0-r1.ebuild         |  9 ++++--
 media-libs/vidstab/vidstab-9999.ebuild             |  9 +++---
 3 files changed, 44 insertions(+), 7 deletions(-)

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 00000000000..fc7deca503e
--- /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 31b7ac65819..a6e5eadfa24 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -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 c694caee1d9..447fa855686 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"


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/files/, media-libs/vidstab/
@ 2023-04-10 18:36 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-04-10 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     112f980daf9b6040e557fe17c623c2e2f43f7125
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 17:41:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 18:36:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112f980d

media-libs/vidstab: drop 1.1.0-r2

Closes: https://bugs.gentoo.org/902763
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/vidstab/Manifest                        |  1 -
 ....1.0-fix-test_motiondetect-without-openmp.patch | 26 ---------
 ...-tests-should-exit-with-code-0-on-success.patch | 25 --------
 ...ab-1.1.0-tests-use-sse2-only-if-available.patch | 33 -----------
 media-libs/vidstab/vidstab-1.1.0-r2.ebuild         | 67 ----------------------
 5 files changed, 152 deletions(-)

diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index d37af8ce52f7..ba36a164a3e6 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,2 +1 @@
-DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
 DIST vidstab-1.1.1.tar.gz 80717 BLAKE2B e2ce03d24358404c617816466ad3fd715999ef4d391617e9cec7923353ba2ce4ac3b3eedce67f3fadf3bd6fdfb2e4516a5b95c3fca9f613e367b1490ec78ae0a SHA512 b27ac95ab5302e9500af5a52cb09f557b9dacbdc4dc57a9781e2f9ae65a6ffea396f9819bca1f6a103f9d1896bf3061f1cb647166b14b8de8e89a1b15f010e5c

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
deleted file mode 100644
index 88d260f429ca..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
deleted file mode 100644
index 1f73c50a49ed..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/georgmartius/vid.stab/pull/69
-
-From dff58ee5a26569a7eeb881d204b428ee5da40746 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 10 Jan 2019 13:47:10 -0500
-Subject: [PATCH] tests should exit with code 0 on success
-
-Exit code 0 indicates success, anything else indicates failure. Therefore, unittest_summary() should return 0 if no tests failed.
----
- tests/testframework.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testframework.c b/tests/testframework.c
-index a38851c..a889560 100644
---- a/tests/testframework.c
-+++ b/tests/testframework.c
-@@ -36,7 +36,7 @@ int unittest_summary(){
-   fprintf(stderr, "UNIT TESTs succeeded:\t %s%i/%i\033[0m\n",
-           units_failed>0 ? "\033[1;31m" : "\033[1;32m",
-           units_success, units_success + units_failed);
--  return units_failed==0;
-+  return units_failed!=0;
- 
- }
- 

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
deleted file mode 100644
index fc7deca503e6..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
deleted file mode 100644
index a4d043b2fa01..000000000000
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib toolchain-funcs
-
-DESCRIPTION="Video stabilization library"
-HOMEPAGE="http://public.hronopik.de/vid.stab/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	S="${WORKDIR}/vid.stab-${PV}"
-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"
-	"${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"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	# USE=cpu_flags_x86_sse2 instead
-	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} || die
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
-	done
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
-	)
-	cmake-multilib_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"
-	cmake_src_configure
-	cmake_build
-	"${BUILD_DIR}"/tests || die
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-10 18:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-14 16:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/files/, media-libs/vidstab/ Craig Andrews
  -- strict thread matches above, loose matches on Subject: below --
2023-04-10 18:36 Andreas Sturmlechner
2019-01-11  1:28 Craig Andrews

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox