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 1QLeQd-0005Fm-7q for garchives@archives.gentoo.org; Sun, 15 May 2011 16:44:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D0011C03C; Sun, 15 May 2011 16:44:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C941B1C03C for ; Sun, 15 May 2011 16:44:19 +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 4EADD1B4021 for ; Sun, 15 May 2011 16:44:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BB56C80504 for ; Sun, 15 May 2011 16:44:18 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: <0b7982014453db83c96419cdcfef028b7c242e57.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-libs/opencv/ChangeLog media-libs/opencv/Manifest media-libs/opencv/opencv-2.2.0-r10.ebuild media-libs/opencv/opencv-2.2.0-r11.ebuild media-libs/opencv/opencv-2.2.0.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: 0b7982014453db83c96419cdcfef028b7c242e57 Date: Sun, 15 May 2011 16:44:18 +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: 498bb610d2ef44a5a9bf4d3b6ac6aed4 commit: 0b7982014453db83c96419cdcfef028b7c242e57 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun May 15 17:04:51 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Sun May 15 17:04:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D0b798201 [media-libs/opencv] Resync with tree (Portage version: 2.1.9.49/git/Linux x86_64, RepoMan options: --force, si= gned Manifest commit with key B6C5F7DE) --- media-libs/opencv/ChangeLog | 4 ++ media-libs/opencv/Manifest | 31 ++++++++++----= ----- ...cv-2.2.0-r11.ebuild =3D> opencv-2.2.0-r10.ebuild} | 2 +- ...opencv-2.2.0-r11.ebuild =3D> opencv-2.2.0.ebuild} | 21 +++---------= - 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 48f596f..715cabb 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 20= 11/05/11 20:10:16 dilfridge Exp $ =20 + 15 May 2011; Andreas K. Huettel +opencv-2.2.0.e= build, + +opencv-2.2.0-r10.ebuild, -opencv-2.2.0-r11.ebuild: + Resync with tree + 14 May 2011; Andreas K. Huettel -files/opencv-2.0.0-libpng14.patch, -opencv-2.1.0.ebuild, -files/opencv-2.1.0-mmap.patch, -files/opencv-2.1.0-multilib.patch, diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index a49724d..bb80aac 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -13,23 +13,24 @@ AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f0= 05b1aa494468edd3f57f944e0b5 AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee637= 70e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 = f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77d= c4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0= c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266= c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293= db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e -EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43b= d2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d0= 1c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7 -MISC ChangeLog 6624 RMD160 fa16a02153451bde0ba1b62172bee8b99d5d229f SHA1= 975220ba665a5be7bc522367b887e5fdddae73ce SHA256 c171ef14bd84813dfc4c1429= 10943a3a4ffc608c907f47c3fd3b283c5f5354bd +EBUILD opencv-2.2.0-r10.ebuild 4395 RMD160 3a6f2fc6752ec38e83da63e7b3b63= f67810801e6 SHA1 203ffcc7dfd013c963f494515e0cda12f334f133 SHA256 b301eb7e= 0e4b3cb2e738c583a326f8a3192ecac1a70139cee07ee4de9ec92da2 +EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57= ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea5= 04f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701 +MISC ChangeLog 6777 RMD160 99152d0a8c39bfdc2172815430e389f7b10ad7ee SHA1= fff5bfa89df9ffd63715bd7c0adc2ed5e64dc723 SHA256 b5b4b430a0ab2b31b07a5ae0= 06dfb171558962f9eeca2f9b1b2a98caaf189b4f MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 S= HA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed= 9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJNztIYAAoJENwGBM22xffe2zcQAKZNfYBsHSC331qR0LSzmd1L -vpmI5bBwbTTe/cRUvM/wZhQCXHP9sWm33g3EsoAmwUBeu6zGXQagjaFPY5pix2Xx -qJSbL4zqseNBWQdrvfhFOtGQgIBzrZwJoibF/LBWns88JgOR0Fgs9FCRK071BfPZ -GrB38qgRUcaBIdV9qsnSL4igv2hYLlJkQnTo9Blth+UET3S44jhocjOEuA3MxvxN -T3Lhy/YcVblbOu9iu4+I/rewzh7Te6m6XDFRfL/eogd7LlSwylsk66nfWJ5iVLVp -H84kBMoU8CIVnTo23u8UH8St2HA5tkbaIglupy3OqX/HRqs48rlscZxb5Ved+4tj -k3hDk8jahkG4FDRP1usXldpMx6AwQvvwVFm+eRleFp55a05QM5W7qpzWy9W7HYNu -xUX0tDUtaEElwPO6haKdMz8EVTwBagPb6g8Z+Ze8V8FXY3HuSRzSThPUzJQf4RQU -3Sh6eRobCYQ4yXh0tlGgdqFeQrAU0nowIm8gqnsdFZmYX3+At4nGxDPqGasHAcw1 -d+vW3LDFxUXLaOTopYij+pWaWxe0k9j61WCrwhzPvsV+LqB/iWeWLaE9q63vMyXv -cFZrTJy1oQ3YMEkYUXyhFPKMC0kZZxCC/9t/1Z7Qq/kDEpqQKphdK1uXnU0b+ScN -qgU9rkbFOigPU/Ra6PQn -=3DfwXD +iQIcBAEBCgAGBQJN0AezAAoJENwGBM22xffeaeQP/2F4KDaJ729a9HyPRqOu+CN+ +vFgQCcgSOuIPb2GzpHRGS0Y9BXxZ7jhchGKqqfsTxp+P2cVmXsTonyYwwrcUTKNR +3uKJvda1EodZb+1ySZSqsQcrejX1ekzHDn3kbRyj6dPvY4rt6rDVy15PhsLmlOqn +8kCclAKzUXISyTLVayNHxHsNjutU68XMPxUwvEJaOTY5+ivYw5y6qkDw3NSlRRhC +e80TIKc3PujpUAJcq9llVWi4xgYz7Ic7FKPEpwxz2TKUrij7kjvAzqcn/FVHuJ12 +aOCMyvqDlILhOP+rmSsBvyzvEGUL5yl5Bn8nl1nXzNyv5XzaJ52ADsNC8R+HKq7y +AuTjw1vTIsla3lLxn4VyXrVX8Uktc6DcCNtwSfX3lh1+5clwEVfJleyBHhH0UHLM +seDSv9Ipj8RLfPUocubl31z5WhFiMK75kMO2EZ0InxTLxyvC/XcleIOlEK8K0vtG +0rPS+qqnDnwLoQSSnH4qSx7EkbURAgTwOgqg6wrGIurU93Bul+cn10gDXvoEDpul +BNPXbZdzPmKB6Gxw3xbh19A8aGaKqH8dOovY95OjHuUG5hWg/i19eR39dh2Em6mK +58KvyfDzbVtm4ROfWmeNa+D0OCFqjA5FqzIkLVozdfPWqmbTmwtNEpvck0EQ1sv7 +h6hzL67BAHcvndXJJdw+ +=3DWonr -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/openc= v/opencv-2.2.0-r10.ebuild similarity index 98% copy from media-libs/opencv/opencv-2.2.0-r11.ebuild copy to media-libs/opencv/opencv-2.2.0-r10.ebuild index 4cc6bc4..a0cab96 100644 --- a/media-libs/opencv/opencv-2.2.0-r11.ebuild +++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.eb= uild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.eb= uild,v 1.3 2011/05/15 16:42:14 dilfridge Exp $ =20 EAPI=3D3 =20 diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/openc= v/opencv-2.2.0.ebuild similarity index 88% rename from media-libs/opencv/opencv-2.2.0-r11.ebuild rename to media-libs/opencv/opencv-2.2.0.ebuild index 4cc6bc4..99f7d1d 100644 --- a/media-libs/opencv/opencv-2.2.0-r11.ebuild +++ b/media-libs/opencv/opencv-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.eb= uild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild= ,v 1.6 2011/05/09 23:11:36 hwoarang Exp $ =20 EAPI=3D3 =20 @@ -16,8 +16,8 @@ SRC_URI=3D"mirror://sourceforge/${PN}library/${MY_P}.ta= r.bz2" =20 LICENSE=3D"BSD" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg j= peg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xin= e" +KEYWORDS=3D"amd64 x86" +IUSE=3D"doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k ope= nexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" =20 # all tests fail, needs further investigation, bug 296681 - dilfridge RESTRICT=3Dtest @@ -30,10 +30,6 @@ RDEPEND=3D" >=3Dsci-libs/clapack-3.2.1-r4 sci-libs/flann virtual/lapack - cuda? ( - >=3Ddev-util/nvidia-cuda-toolkit-3.2 - >=3Ddev-util/nvidia-cuda-npp-3.2 - ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( @@ -47,7 +43,6 @@ RDEPEND=3D" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - ipp? ( sci-libs/ipp ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) @@ -77,7 +72,6 @@ PATCHES=3D( "${FILESDIR}/${P}-ptrcvcapture.patch" "${FILESDIR}/${P}-use_system_libs.patch" "${FILESDIR}/${P}-v4l_2.6.38.patch" - "${FILESDIR}/${P}-findnpp.patch" ) =20 CMAKE_BUILD_TYPE=3D"Release" @@ -112,9 +106,9 @@ src_configure() { $(cmake-utils_use_enable sse2 SSE2) $(cmake-utils_use_enable sse3 SSE3) $(cmake-utils_use_enable ssse3 SSSE3) - $(cmake-utils_use_use ipp) + -DUSE_ipp=3DOFF $(cmake-utils_use_with ieee1394 1394) - $(cmake-utils_use_with cuda) + -DWITH_cuda=3DOFF $(cmake-utils_use_with eigen) $(cmake-utils_use_with ffmpeg) $(cmake-utils_use_with gstreamer) @@ -162,11 +156,6 @@ src_configure() { "-DOPENCV_DOC_INSTALL_PATH=3D${EPREFIX}/usr/share/doc/${PF}" ) =20 - # hardcode cuda paths - mycmakeargs+=3D( - "-DCUDA_NPP_LIBRARY_ROOT_DIR=3D/opt/cuda" - ) - cmake-utils_src_configure } =20