sci-libs/ViSP: Fix opencv detection

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/sci-libs/ViSP/ViSP-3.2.0.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r1.ebuild
similarity index 98%
rename from sci-libs/ViSP/ViSP-3.2.0.ebuild
rename to sci-libs/ViSP/ViSP-3.2.0-r1.ebuild
index e6404f3cfb59793511e5c4554edbdacf3accf831..093857e6659756634032850377f45bdd4ebb1cfa 100644 (file)
--- a/sci-libs/ViSP/ViSP-3.2.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.2.0-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${RDEPEND}
 REQUIRED_USE="motif? ( coin )"
 
 S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" )
 
 src_configure() {
        local mycmakeargs=(

diff --git a/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch
new file mode 100644 (file)
index 0000000..56347c5
--- /dev/null
+++ b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch
@@ -0,0 +1,18 @@
+Index: visp-3.2.0/CMakeLists.txt
+===================================================================
+--- visp-3.2.0.orig/CMakeLists.txt
++++ visp-3.2.0/CMakeLists.txt
+@@ -574,12 +574,7 @@ if(USE_CXX11 AND NOT USE_PTHREAD)
+   endif()
+ endif()
+ VP_OPTION(USE_XML2        XML2        ""    "Include xml support"          "" ON IF NOT WINRT)
+-if(CMAKE_TOOLCHAIN_FILE)
+-  # Find opencv2.framework for ios and naoqi
+-  VP_OPTION(USE_OPENCV      "MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+-else()
+-  VP_OPTION(USE_OPENCV      "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+-endif()
++VP_OPTION(USE_OPENCV      "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+ VP_OPTION(USE_ZLIB        "ZLIB;MyZLIB" ""  "Include zlib support"         "" ON IF NOT WINRT AND NOT IOS)
+ VP_OPTION(USE_X11         X11         ""    "Include X11 support"          "" ON IF NOT WINRT AND NOT IOS)
+ # The native FindGTK2.cmake doesn't consider libgobject-2.0 that is