| 1 |
commit: dc9c3a25e2b4bf47299a13fb17a8570adb510244 |
| 2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 22:08:05 2011 +0000 |
| 4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 22:08:05 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dc9c3a25 |
| 7 |
|
| 8 |
[media-libs/opencv] Still fails to link but now just on lapack :/ |
| 9 |
|
| 10 |
--- |
| 11 |
.../opencv/files/2.2.0-use_system_libs.patch | 16 ++++++++++++++-- |
| 12 |
media-libs/opencv/opencv-2.2.0.ebuild | 1 + |
| 13 |
2 files changed, 15 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 5804fc3..9d5fb72 100644 |
| 17 |
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch |
| 18 |
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch |
| 19 |
@@ -34,6 +34,18 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core |
| 20 |
#endif |
| 21 |
|
| 22 |
#undef abs |
| 23 |
+diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.2.0/modules/haartraining/CMakeLists.txt |
| 24 |
+--- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 |
| 25 |
++++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt 2011-04-29 23:43:17.000000000 +0200 |
| 26 |
+@@ -18,7 +18,7 @@ |
| 27 |
+ link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR}) |
| 28 |
+ endif() |
| 29 |
+ |
| 30 |
+-set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine) |
| 31 |
++set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES}) |
| 32 |
+ |
| 33 |
+ link_libraries(${haartraining_libs}) |
| 34 |
+ |
| 35 |
diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt |
| 36 |
--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 |
| 37 |
+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200 |
| 38 |
@@ -70,13 +82,13 @@ diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/module |
| 39 |
/****************************************************************************************\ |
| 40 |
diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.cmake |
| 41 |
--- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100 |
| 42 |
-+++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:34:22.000000000 +0200 |
| 43 |
++++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:43:42.000000000 +0200 |
| 44 |
@@ -57,7 +57,7 @@ |
| 45 |
) |
| 46 |
|
| 47 |
# Add the required libraries for linking: |
| 48 |
- target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN}) |
| 49 |
-+ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN} ${FLANN_LIBRARIES} ${CLAPACK_LIBRARIES}) |
| 50 |
++ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES}) |
| 51 |
|
| 52 |
if(MSVC) |
| 53 |
if(CMAKE_CROSSCOMPILING) |
| 54 |
|
| 55 |
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild |
| 56 |
index 0a30fdb..2dd6260 100644 |
| 57 |
--- a/media-libs/opencv/opencv-2.2.0.ebuild |
| 58 |
+++ b/media-libs/opencv/opencv-2.2.0.ebuild |
| 59 |
@@ -25,6 +25,7 @@ RDEPEND=" |
| 60 |
sys-libs/zlib |
| 61 |
sci-libs/clapack |
| 62 |
sci-libs/flann |
| 63 |
+ virtual/lapack |
| 64 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
| 65 |
eigen? ( dev-cpp/eigen:2 ) |
| 66 |
ffmpeg? ( virtual/ffmpeg ) |
Archives