| 1 |
commit: 6288552a5668748f6b391641fada7f25c96046d4 |
| 2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 21:42:26 2011 +0000 |
| 4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 21:42:26 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6288552a |
| 7 |
|
| 8 |
[media-libs/opencv] Enhance the lib passing a bit more. |
| 9 |
|
| 10 |
--- |
| 11 |
.../opencv/files/2.2.0-use_system_libs.patch | 24 +++++++++++++++---- |
| 12 |
1 files changed, 19 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch |
| 15 |
index 3a9c10c..5804fc3 100644 |
| 16 |
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch |
| 17 |
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch |
| 18 |
@@ -1,23 +1,25 @@ |
| 19 |
diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt |
| 20 |
--- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 |
| 21 |
-+++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 21:47:44.000000000 +0200 |
| 22 |
-@@ -193,6 +193,8 @@ |
| 23 |
++++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 23:26:42.000000000 +0200 |
| 24 |
+@@ -193,6 +193,10 @@ |
| 25 |
# ---------------------------------------------------------------------------- |
| 26 |
# CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC.. |
| 27 |
# ---------------------------------------------------------------------------- |
| 28 |
+find_package(LAPACK REQUIRED) |
| 29 |
+find_package(ZLIB REQUIRED) |
| 30 |
++find_package(PkgConfig REQUIRED) |
| 31 |
++pkg_check_modules(FLANN REQUIRED flann) |
| 32 |
|
| 33 |
# Build/install (or not) some apps: |
| 34 |
# =================================================== |
| 35 |
diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt |
| 36 |
--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 |
| 37 |
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 22:02:39.000000000 +0200 |
| 38 |
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 23:17:16.000000000 +0200 |
| 39 |
@@ -1,3 +1,3 @@ |
| 40 |
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") |
| 41 |
-set(deps opencv_lapack zlib) |
| 42 |
+include_directories("${ZLIB_INCLUDE_DIRS}") |
| 43 |
-+set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES}) |
| 44 |
++set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES} ${FLANN_LIBRARIES}) |
| 45 |
define_opencv_module(core ${deps}) |
| 46 |
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp |
| 47 |
--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100 |
| 48 |
@@ -34,7 +36,7 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core |
| 49 |
#undef abs |
| 50 |
diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt |
| 51 |
--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 |
| 52 |
-+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 22:24:32.000000000 +0200 |
| 53 |
++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200 |
| 54 |
@@ -219,8 +219,8 @@ |
| 55 |
set(the_target "opencv_highgui") |
| 56 |
|
| 57 |
@@ -66,3 +68,15 @@ diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/module |
| 58 |
#ifdef HAVE_PNG |
| 59 |
|
| 60 |
/****************************************************************************************\ |
| 61 |
+diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.cmake |
| 62 |
+--- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100 |
| 63 |
++++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:34:22.000000000 +0200 |
| 64 |
+@@ -57,7 +57,7 @@ |
| 65 |
+ ) |
| 66 |
+ |
| 67 |
+ # Add the required libraries for linking: |
| 68 |
+- target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN}) |
| 69 |
++ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN} ${FLANN_LIBRARIES} ${CLAPACK_LIBRARIES}) |
| 70 |
+ |
| 71 |
+ if(MSVC) |
| 72 |
+ if(CMAKE_CROSSCOMPILING) |
Archives