From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFvsH-0006vN-7q for garchives@archives.gentoo.org; Fri, 29 Apr 2011 22:09:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0CF41C007; Fri, 29 Apr 2011 22:09:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A99A01C007 for ; Fri, 29 Apr 2011 22:09:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 196FE1B4008 for ; Fri, 29 Apr 2011 22:09:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 79AD780504 for ; Fri, 29 Apr 2011 22:09:11 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/ X-VCS-Repository: proj/kde X-VCS-Files: media-libs/opencv/files/2.2.0-use_system_libs.patch media-libs/opencv/opencv-2.2.0.ebuild X-VCS-Directories: media-libs/opencv/files/ media-libs/opencv/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: dc9c3a25e2b4bf47299a13fb17a8570adb510244 Date: Fri, 29 Apr 2011 22:09:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 46c600aa80e055cbd5b90a4bbe30fe85 commit: dc9c3a25e2b4bf47299a13fb17a8570adb510244 Author: Tomas Chvatal gentoo org> AuthorDate: Fri Apr 29 22:08:05 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Fri Apr 29 22:08:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Ddc9c3a25 [media-libs/opencv] Still fails to link but now just on lapack :/ --- .../opencv/files/2.2.0-use_system_libs.patch | 16 ++++++++++++++= -- media-libs/opencv/opencv-2.2.0.ebuild | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) 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 index 5804fc3..9d5fb72 100644 --- a/media-libs/opencv/files/2.2.0-use_system_libs.patch +++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch @@ -34,6 +34,18 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp= OpenCV-2.2.0/modules/core #endif =20 #undef abs +diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.= 2.0/modules/haartraining/CMakeLists.txt +--- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt 2010-12-05 04:3= 5:24.000000000 +0100 ++++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt 2011-04-29 23:43:17= .000000000 +0200 +@@ -18,7 +18,7 @@ + link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${= CMAKE_CURRENT_BINARY_DIR}) + endif() +=20 +-set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_= objdetect opencv_calib3d opencv_haartraining_engine) ++set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_= objdetect opencv_calib3d opencv_haartraining_engine ${FLANN_LIBRARIES} ${= LAPACK_LIBRARIES}) +=20 + link_libraries(${haartraining_libs}) +=20 diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/m= odules/highgui/CMakeLists.txt --- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.= 000000000 +0100 +++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.0000= 00000 +0200 @@ -70,13 +82,13 @@ diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_= png.cpp OpenCV-2.2.0/module /**********************************************************************= ******************\ diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.= cmake --- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0= 100 -+++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:34:22.000000000 +0200 ++++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:43:42.000000000 +0200 @@ -57,7 +57,7 @@ ) =20 # Add the required libraries for linking: - target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} = ${ARGN}) -+ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} = ${ARGN} ${FLANN_LIBRARIES} ${CLAPACK_LIBRARIES}) ++ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} = ${ARGN} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES}) =20 if(MSVC) if(CMAKE_CROSSCOMPILING) diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/op= encv-2.2.0.ebuild index 0a30fdb..2dd6260 100644 --- a/media-libs/opencv/opencv-2.2.0.ebuild +++ b/media-libs/opencv/opencv-2.2.0.ebuild @@ -25,6 +25,7 @@ RDEPEND=3D" sys-libs/zlib sci-libs/clapack sci-libs/flann + virtual/lapack cuda? ( dev-util/nvidia-cuda-toolkit ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg )