| 1 |
commit: b27e51a2ccf32a7adb5f2f226abdbb94704329fc |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 29 15:07:18 2019 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 29 15:50:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b27e51a2 |
| 7 |
|
| 8 |
sci-libs/ViSP: Fix opencv detection |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
.../ViSP/{ViSP-3.2.0.ebuild => ViSP-3.2.0-r1.ebuild} | 2 +- |
| 14 |
sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch | 18 ++++++++++++++++++ |
| 15 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/ViSP/ViSP-3.2.0.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r1.ebuild |
| 18 |
similarity index 98% |
| 19 |
rename from sci-libs/ViSP/ViSP-3.2.0.ebuild |
| 20 |
rename to sci-libs/ViSP/ViSP-3.2.0-r1.ebuild |
| 21 |
index e6404f3cfb5..093857e6659 100644 |
| 22 |
--- a/sci-libs/ViSP/ViSP-3.2.0.ebuild |
| 23 |
+++ b/sci-libs/ViSP/ViSP-3.2.0-r1.ebuild |
| 24 |
@@ -46,7 +46,7 @@ RDEPEND="${RDEPEND} |
| 25 |
REQUIRED_USE="motif? ( coin )" |
| 26 |
|
| 27 |
S="${WORKDIR}/visp-${PV}" |
| 28 |
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" ) |
| 29 |
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" ) |
| 30 |
|
| 31 |
src_configure() { |
| 32 |
local mycmakeargs=( |
| 33 |
|
| 34 |
diff --git a/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..56347c58f96 |
| 37 |
--- /dev/null |
| 38 |
+++ b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch |
| 39 |
@@ -0,0 +1,18 @@ |
| 40 |
+Index: visp-3.2.0/CMakeLists.txt |
| 41 |
+=================================================================== |
| 42 |
+--- visp-3.2.0.orig/CMakeLists.txt |
| 43 |
++++ visp-3.2.0/CMakeLists.txt |
| 44 |
+@@ -574,12 +574,7 @@ if(USE_CXX11 AND NOT USE_PTHREAD) |
| 45 |
+ endif() |
| 46 |
+ endif() |
| 47 |
+ VP_OPTION(USE_XML2 XML2 "" "Include xml support" "" ON IF NOT WINRT) |
| 48 |
+-if(CMAKE_TOOLCHAIN_FILE) |
| 49 |
+- # Find opencv2.framework for ios and naoqi |
| 50 |
+- VP_OPTION(USE_OPENCV "MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) |
| 51 |
+-else() |
| 52 |
+- VP_OPTION(USE_OPENCV "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) |
| 53 |
+-endif() |
| 54 |
++VP_OPTION(USE_OPENCV "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) |
| 55 |
+ VP_OPTION(USE_ZLIB "ZLIB;MyZLIB" "" "Include zlib support" "" ON IF NOT WINRT AND NOT IOS) |
| 56 |
+ VP_OPTION(USE_X11 X11 "" "Include X11 support" "" ON IF NOT WINRT AND NOT IOS) |
| 57 |
+ # The native FindGTK2.cmake doesn't consider libgobject-2.0 that is |
Archives