[gentoo-commits] gentoo-x86 commit in media-libs/opencv/files: opencv-2.4.8-javamagic.patch

[Andreas HAttel (dilfridge)]

dilfridge    14/01/24 21:16:38

  Added:                opencv-2.4.8-javamagic.patch
  Log:
  Version bump; remove old
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

Revision  Changes    Path
1.1                  media-libs/opencv/files/opencv-2.4.8-javamagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.4.8-javamagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.4.8-javamagic.patch?rev=1.1&content-type=text/plain

Index: opencv-2.4.8-javamagic.patch
===================================================================
diff -ruN opencv-2.4.8.orig/CMakeLists.txt opencv-2.4.8/CMakeLists.txt
--- opencv-2.4.8.orig/CMakeLists.txt	2013-12-27 18:09:18.000000000 +0100
+++ opencv-2.4.8/CMakeLists.txt	2014-01-24 22:06:12.000000000 +0100
@@ -164,6 +164,7 @@
 OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_INTELPERC      "Include Intel Perceptual Computing support"  OFF  IF WIN32 )
+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
 
 # OpenCV build components
 # ===================================================
@@ -449,6 +450,8 @@
 include(cmake/OpenCVDetectPython.cmake)
 
 # --- Java Support ---
+if(WITH_JAVA)
+
 include(cmake/OpenCVDetectApacheAnt.cmake)
 if(ANDROID)
   include(cmake/OpenCVDetectAndroidSDK.cmake)
@@ -466,6 +469,11 @@
   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
 endif()
 
+else()
+  SET(ANT_EXECUTABLE "")
+  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
+endif()
+
 # --- OpenCL ---
 if(WITH_OPENCL)
   include(cmake/OpenCVDetectOpenCL.cmake)