diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-05-02 16:49:41 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-05-02 16:49:41 +0000 |
| commit | 52744292fbb0ab785ee2aac9f69cab03e323cf51 (patch) | |
| tree | 9e734e5eb960801855880578abbb43f1202cb8f8 /media-libs/opencv/files | |
| parent | Fix building with automake-1.13. Thanks to Ulenrich in bug #468214. (diff) | |
| download | gentoo-2-52744292fbb0ab785ee2aac9f69cab03e323cf51.tar.gz gentoo-2-52744292fbb0ab785ee2aac9f69cab03e323cf51.tar.bz2 gentoo-2-52744292fbb0ab785ee2aac9f69cab03e323cf51.zip | |
Version bump; remove old
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'media-libs/opencv/files')
| -rw-r--r-- | media-libs/opencv/files/opencv-2.4.5-javamagic.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-2.4.5-javamagic.patch b/media-libs/opencv/files/opencv-2.4.5-javamagic.patch new file mode 100644 index 000000000000..00597b9b6e35 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.4.5-javamagic.patch @@ -0,0 +1,32 @@ +diff -ruN opencv-2.4.5-1-gentoo/CMakeLists.txt opencv-2.4.5/CMakeLists.txt +--- opencv-2.4.5-1-gentoo/CMakeLists.txt 2013-04-05 11:00:20.000000000 +0200 ++++ opencv-2.4.5/CMakeLists.txt 2013-05-02 18:38:59.412094714 +0200 +@@ -147,6 +147,7 @@ + OCV_OPTION(WITH_OPENCL "Include OpenCL Runtime support" ON IF (NOT ANDROID AND NOT IOS) ) + 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_JAVA "Include Java support" ON) + + + # OpenCV build components +@@ -395,6 +396,8 @@ + include(cmake/OpenCVDetectPython.cmake) + + # --- Java Support --- ++if(WITH_JAVA) ++ + include(cmake/OpenCVDetectApacheAnt.cmake) + if(ANDROID) + include(cmake/OpenCVDetectAndroidSDK.cmake) +@@ -412,6 +415,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) |