| 1 |
dilfridge 13/03/29 17:29:14 |
| 2 |
|
| 3 |
Added: opencv-2.4.4-javamagic.patch |
| 4 |
Log: |
| 5 |
Add first version without java support. Needs work. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 7887F787) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/opencv/files/opencv-2.4.4-javamagic.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.4.4-javamagic.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.4.4-javamagic.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: opencv-2.4.4-javamagic.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN opencv-2.4.4.orig/CMakeLists.txt opencv-2.4.4/CMakeLists.txt |
| 18 |
--- opencv-2.4.4.orig/CMakeLists.txt 2013-03-01 16:44:17.000000000 +0100 |
| 19 |
+++ opencv-2.4.4/CMakeLists.txt 2013-03-29 18:01:36.463227214 +0100 |
| 20 |
@@ -144,7 +144,7 @@ |
| 21 |
OCV_OPTION(WITH_OPENCL "Include OpenCL Runtime support" OFF IF (NOT ANDROID AND NOT IOS) ) |
| 22 |
OCV_OPTION(WITH_OPENCLAMDFFT "Include AMD OpenCL FFT library support" OFF IF (NOT ANDROID AND NOT IOS) ) |
| 23 |
OCV_OPTION(WITH_OPENCLAMDBLAS "Include AMD OpenCL BLAS library support" OFF IF (NOT ANDROID AND NOT IOS) ) |
| 24 |
- |
| 25 |
+OCV_OPTION(WITH_JAVA "Include Java support" ON) |
| 26 |
|
| 27 |
# OpenCV build components |
| 28 |
# =================================================== |
| 29 |
@@ -392,6 +392,8 @@ |
| 30 |
include(cmake/OpenCVDetectPython.cmake) |
| 31 |
|
| 32 |
# --- Java Support --- |
| 33 |
+if(WITH_JAVA) |
| 34 |
+ |
| 35 |
include(cmake/OpenCVDetectApacheAnt.cmake) |
| 36 |
if(ANDROID) |
| 37 |
include(cmake/OpenCVDetectAndroidSDK.cmake) |
| 38 |
@@ -409,6 +411,11 @@ |
| 39 |
SET(CAN_BUILD_ANDROID_PROJECTS FALSE) |
| 40 |
endif() |
| 41 |
|
| 42 |
+else() |
| 43 |
+ SET(ANT_EXECUTABLE "") |
| 44 |
+ SET(CAN_BUILD_ANDROID_PROJECTS FALSE) |
| 45 |
+endif() |
| 46 |
+ |
| 47 |
# --- OpenCL --- |
| 48 |
if(WITH_OPENCL) |
| 49 |
include(cmake/OpenCVDetectOpenCL.cmake) |
Archives