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 1QG6xC-0007FN-M7 for garchives@archives.gentoo.org; Sat, 30 Apr 2011 09:59:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A33C1C060; Sat, 30 Apr 2011 09:59:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 31BB21C060 for ; Sat, 30 Apr 2011 09:59:03 +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 9402F2AC007 for ; Sat, 30 Apr 2011 09:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B934F80505 for ; Sat, 30 Apr 2011 09:59:01 +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-convert_sets_to_options.patch 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: f6882a3d2fce1d9fcfb9961bc0100cffd29522f2 Date: Sat, 30 Apr 2011 09:59:01 +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: 4a583244ae8461d4873c26f1ad892c13 commit: f6882a3d2fce1d9fcfb9961bc0100cffd29522f2 Author: Tomas Chvatal gentoo org> AuthorDate: Sat Apr 30 09:58:37 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sat Apr 30 09:58:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Df6882a3d [media-libs/opencv] Use proper libdir for pkgconfig file. Do not needlesl= y optimize python. --- .../files/2.2.0-convert_sets_to_options.patch | 12 ++++++++++-- .../opencv/files/2.2.0-use_system_libs.patch | 5 ++--- media-libs/opencv/opencv-2.2.0.ebuild | 12 ++---------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch = b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch index af057fc..7da06cb 100644 --- a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch +++ b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch @@ -1,6 +1,6 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.tx= t --- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 -+++ OpenCV-2.2.0.new/CMakeLists.txt 2011-04-30 10:49:01.000000000 +0200 ++++ OpenCV-2.2.0.new/CMakeLists.txt 2011-04-30 11:57:37.000000000 +0200 @@ -13,7 +13,7 @@ # Add these standard paths to the search paths for FIND_LIBRARY # to find libraries from these locations first @@ -219,7 +219,7 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.= 0.new/CMakeLists.txt =20 exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTP= UT_VARIABLE RET_VAL) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${C= MAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) -@@ -1164,7 +1161,7 @@ +@@ -1164,14 +1161,14 @@ # ---------------------------------------------------------------------= ---------------------- set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") @@ -228,6 +228,14 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2= .0.new/CMakeLists.txt set(includedir "\${prefix}/include") set(VERSION ${OPENCV_VERSION}) =20 + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAK= E_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) +=20 + if(UNIX) +- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATIO= N lib/pkgconfig) ++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATIO= N lib${LIB_SUFFIX}/pkgconfig) + endif() +=20 +=20 @@ -1191,7 +1188,7 @@ # CPack target # ---------------------------------------------------------------------= ------- 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 6685e92..5d22a9b 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 @@ -24,13 +24,12 @@ diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.tx= t OpenCV-2.2.0/modules/core define_opencv_module(core ${deps}) diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modu= les/core/src/lapack.cpp --- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000= 000000 +0100 -+++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 22:11:31.0000000= 00 +0200 -@@ -48,7 +48,8 @@ ++++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-30 11:50:09.0000000= 00 +0200 +@@ -48,7 +48,7 @@ typedef __CLPK_integer integer; typedef __CLPK_real real; #else - #include "clapack.h" -+ #include + #include #endif =20 diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/op= encv-2.2.0.ebuild index 81e1cd7..0b4465f 100644 --- a/media-libs/opencv/opencv-2.2.0.ebuild +++ b/media-libs/opencv/opencv-2.2.0.ebuild @@ -23,7 +23,7 @@ RDEPEND=3D" app-arch/bzip2 dev-libs/libf2c sys-libs/zlib - sci-libs/clapack + >=3Dsci-libs/clapack-3.2.1-r4 sci-libs/flann virtual/lapack cuda? ( dev-util/nvidia-cuda-toolkit ) @@ -146,16 +146,8 @@ src_configure() { mycmakeargs+=3D( "-DCMAKE_SKIP_RPATH=3DON" "-DBUILD_SHARED_LIBS=3DON" - "-DOPENCV_DOC_INSTALL_PATH=3Dshare/doc/${PF}" + "-DOPENCV_DOC_INSTALL_PATH=3D${EPREFIX}/usr/share/doc/${PF}" ) =20 cmake-utils_src_configure } - -pkg_postinst() { - use python && python_mod_optimize opencv -} - -pkg_postrm() { - use python && python_mod_cleanup opencv -}