| 1 |
commit: 9bb23906fc68a35a6afbd463eae64fb6866a313d |
| 2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 19:59:58 2011 +0000 |
| 4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 19:59:58 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9bb23906 |
| 7 |
|
| 8 |
[media-libs/opencv] More work into the clapack linking. |
| 9 |
|
| 10 |
--- |
| 11 |
.../opencv/files/2.2.0-use_system_libs.patch | 23 +++++++++++++++++++- |
| 12 |
media-libs/opencv/opencv-2.2.0.ebuild | 2 + |
| 13 |
2 files changed, 24 insertions(+), 1 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 c85bd6e..e5d2135 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 |
@@ -1,6 +1,27 @@ |
| 20 |
+diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt |
| 21 |
+--- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 |
| 22 |
++++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 21:47:44.000000000 +0200 |
| 23 |
+@@ -193,6 +193,8 @@ |
| 24 |
+ # ---------------------------------------------------------------------------- |
| 25 |
+ # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC.. |
| 26 |
+ # ---------------------------------------------------------------------------- |
| 27 |
++find_package(LAPACK REQUIRED) |
| 28 |
++find_package(ZLIB REQUIRED) |
| 29 |
+ |
| 30 |
+ # Build/install (or not) some apps: |
| 31 |
+ # =================================================== |
| 32 |
+diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt |
| 33 |
+--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 |
| 34 |
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 21:58:50.000000000 +0200 |
| 35 |
+@@ -1,3 +1,3 @@ |
| 36 |
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") |
| 37 |
+-set(deps opencv_lapack zlib) |
| 38 |
++include_directories("${ZLIB_INCLUDE_DIRECTORIES}") |
| 39 |
++set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES}) |
| 40 |
+ define_opencv_module(core ${deps}) |
| 41 |
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp |
| 42 |
--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100 |
| 43 |
-+++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 21:34:50.000000000 +0200 |
| 44 |
++++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 21:59:16.000000000 +0200 |
| 45 |
@@ -48,7 +48,7 @@ |
| 46 |
typedef __CLPK_integer integer; |
| 47 |
typedef __CLPK_real real; |
| 48 |
|
| 49 |
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild |
| 50 |
index 3af965d..84875a0 100644 |
| 51 |
--- a/media-libs/opencv/opencv-2.2.0.ebuild |
| 52 |
+++ b/media-libs/opencv/opencv-2.2.0.ebuild |
| 53 |
@@ -20,8 +20,10 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" |
| 54 |
IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" |
| 55 |
|
| 56 |
RDEPEND=" |
| 57 |
+ app-arch/bzip2 |
| 58 |
sys-libs/zlib |
| 59 |
sci-libs/clapack |
| 60 |
+ virtual/lapack |
| 61 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
| 62 |
eigen? ( dev-cpp/eigen:2 ) |
| 63 |
ffmpeg? ( virtual/ffmpeg ) |
Archives