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 1R8jGV-0005o1-Gg for garchives@archives.gentoo.org; Wed, 28 Sep 2011 01:48:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97E4921C040; Wed, 28 Sep 2011 01:48:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 43E8421C040 for ; Wed, 28 Sep 2011 01:48:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE0C71B400D for ; Wed, 28 Sep 2011 01:48:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0D1E880048 for ; Wed, 28 Sep 2011 01:48:34 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-libs/opencv/ChangeLog media-libs/opencv/Manifest media-libs/opencv/files/opencv-2.3.0-libpng15.patch media-libs/opencv/opencv-2.1.0.ebuild media-libs/opencv/opencv-2.2.0-r10.ebuild media-libs/opencv/opencv-2.3.0.ebuild X-VCS-Directories: media-libs/opencv/files/ media-libs/opencv/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: f39afaac149207393c8cfb4ffa1b74d2e7681c58 Date: Wed, 28 Sep 2011 01:48:34 +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: eae6e8cd119b2014d20853d27081afd8 commit: f39afaac149207393c8cfb4ffa1b74d2e7681c58 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Wed Sep 28 01:45:41 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Wed Sep 28 01:45:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Df39afaac Resync with main tree (Portage version: 2.1.10.19/git/Linux x86_64, signed Manifest commit with= key 7887F787) --- media-libs/opencv/ChangeLog | 5 +++ media-libs/opencv/Manifest | 35 ++++++++++----= ----- .../opencv/files/opencv-2.3.0-libpng15.patch | 8 ++++ media-libs/opencv/opencv-2.1.0.ebuild | 4 +- media-libs/opencv/opencv-2.2.0-r10.ebuild | 7 ++-- media-libs/opencv/opencv-2.3.0.ebuild | 30 +++++++++-----= -- 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 87fa48d..fd106c9 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -2,6 +2,11 @@ # 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 + 28 Sep 2011; Andreas K. Huettel opencv-2.1.0.eb= uild, + opencv-2.2.0-r10.ebuild, opencv-2.3.0.ebuild, + +files/opencv-2.3.0-libpng15.patch: + Resync with main tree + 18 Sep 2011; Andreas K. Huettel opencv-2.3.0.eb= uild, todo.txt: Flann is more and more integrated, not worth patching it out imho diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index a1efd9f..5f9cd7c 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -18,33 +18,34 @@ AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02= a9c2e896ebc453ee63770e5f216 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77d= c4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0= c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981d= db4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39c= d SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe18806050= 00ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768= 089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861 +AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa2= 62c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c= 755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c= 4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f= 1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378 AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8= 803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca= 13760406c8afcf71358758df0051fd51a74578058f263610c05c448 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc= 59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52= ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266= c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293= db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f3= 0008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff= 767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b -EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc102= 4f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae= 25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f -EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e8= 8dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565= fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7 +EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921= ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fc= efd8f128e60291db8a23eecc5179286704080c8663c7663423b5 +EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493= e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4ea= f0b7ad221080e5663a973af68ad64385e7adb70017306328def340da EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be085= 5bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a798= 6a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc -EBUILD opencv-2.3.0.ebuild 4097 RMD160 20bbbf8a7d11422ac502ee02cd71982eb= 154c87c SHA1 a75a8e8971354218e129ede6375f443b8f8c02e6 SHA256 c9574b85c274= f51a7eb570f4cd2a75ed8a75318df7c6799d2bdb157ad5f7bd8d -MISC ChangeLog 8336 RMD160 3e0340c271a5559950e0a831b7625e5e08080769 SHA1= d85a91d178f6264692eb95322f598f3fba7b2078 SHA256 52cb33b7b453cadee2947596= 4ec25ffc0abf3cee5a804252c1a86edeb7f2612c +EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce00= 68d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d= 5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08 +MISC ChangeLog 8525 RMD160 2b89e3b492f3dbb79bea81e650526b1b67d1c081 SHA1= 31a0be8c34470bf5eca428e726ba10cfc10fb840 SHA256 53d3729f105e5eb086fab237= 046cfa2769cf4f70dd241b3b783565339455fdff MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1= 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c= 8312118629e5fa61161f2c3e2f79419f137aa8f2 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 S= HA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed= 9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3f= efad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c347618= 6dd73a3041e39e80a509541a57dc689d26b5a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJOdjuYAAoJEEb+UGWnxTyHV7MP/iIpTFOWiE3iSm+tel9ZPuS/ -l7SFpYxKTuvLNwetRhZFei/xliNApPcYHUKzndlaZC7ZUEBMrByosfoeZZQnjb5i -LZ2EtOEEmVk52+ERX1RZ6Vw1c0r+1KmqZH5Zdxyqf9v4b00q71lOWwNJemd3caEL -qaN2QxKcLeZ8yRFR3W3LMwp4306EYQTbJQTLF1MCg/m5IFVhaCzeU9qo5Gs+NTJj -9pxDhSluKnW6pqJCTAQABMxfoZY1Fzyk1JLMKaEf8xuAhv8BPxChdSJdg88pRUEM -2xAbjU667TfTGsx0RSitbZGS+1AL2RYuqGsf7AUZTTINoC/Z5LLinFI2P/9XtufF -GF9eSd+XUNHfGR+qlEqlIaFfyeBjmUYGO48jHuzZDhhAzIgwEgGhjIcovie7Y/3s -tTLsjjEZmF6odQHWr+PRcUEoMRmEW9bm0/FScTkqB6hHR0OYRglHdShUlAwaw/WJ -PpGv7uqqtYbOL0cRXBEptnvEV7vQo3MuY9OA/qCcUqoMPvrobYD+8Hj8yDCPUuNQ -KFyeFhGOm7VhT+JDb129PXUknFip8y9dFmhxoawMefjbKetgV8NPDhnAcTkdiDN/ -NRtkSLtYWCbwxM/EIiqJcVIpYqNs6Atjvmo1pQsoHmlSoYvXyerZ2OuaYYDsXTFu -or1d/ElzGeXqdV8yEYV6 -=3DgsLg +iQIcBAEBCgAGBQJOgnxFAAoJEEb+UGWnxTyHQSMQAKR5oYBLhlsSHPDU8toUV036 +p5tDB8ljNLHbxZ6Tf6GB7gNzRww1ZFBBt0kz9tRBN8nz2ioWQLPxz5wOPK/sUsiB +BJEvLO4urdDeRmGVCOuYZxRkE5AoQFExY26praTkOeC1n5dpDryky9Po8g3Xpx8U +87C6LyBFp5xfYWgaGLIUbyxfg7tj03gAJghfJ2lz4LOcYlcPnIvN4/swLkP3Y+ie +OgG5PD/DExqcO1KYIRpn4cMNr6moVNX702GbbHIOwfnK/eeQ5XZgI1VsXFwsszII +Yfmte87pcyM3thFRIhXpLQMdXywqryGhkMXELuWidfaQ2VEcfupRKFWNlvlSxsr0 +0wG9pfe20U12Ls/pcJ6FjiKlV0qcWhRPVGJKzd1jpWEQ0vwhw+V+aIl29PYWT2XK +gYWCdxqd9Ny/kmKXh61z/ae/nt1KirUHAHGtVD8d3dtnYP9GADOXco+c0QBJxtAd +sbC0snmFHRZE0JobNOR8a/vbTBUxrilODiesHdrCpDiWfj9PlUhVO5pm0q/XS5la +/e8ykuL56GYRr7PSPHOPTjvFDcZ6JzCetj7qc/QFWE61YI67HaYgjVhR6QiKfZhy +CiNiVPHJ20CSbIZpax14sRE3F1gP5flAPXK57jfL6PMwjY0uAf6+ThMtGN7+3ni/ +WrXjV5Z/xmTMCMKjRj/T +=3DKUyM -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/files/opencv-2.3.0-libpng15.patch b/media-= libs/opencv/files/opencv-2.3.0-libpng15.patch new file mode 100644 index 0000000..c811766 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch @@ -0,0 +1,8 @@ +--- opencv/modules/highgui/src/grfmt_png.cpp (revision 4945) ++++ opencv/modules/highgui/src/grfmt_png.cpp (revision 6143) +@@ -57,4 +57,5 @@=20 + #include + #endif ++#include + #include "grfmt_png.hpp" +=20 diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/op= encv-2.1.0.ebuild index bccb369..c8dec83 100644 --- a/media-libs/opencv/opencv-2.1.0.ebuild +++ b/media-libs/opencv/opencv-2.1.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.1.0.ebuild= ,v 1.11 2011/06/26 14:56:25 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild= ,v 1.12 2011/08/10 16:49:17 xarthisius Exp $ =20 EAPI=3D3 =20 @@ -16,7 +16,7 @@ SRC_URI=3D"mirror://sourceforge/${PN}library/${MY_P}.ta= r.bz2" =20 LICENSE=3D"v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD" SLOT=3D"0" -KEYWORDS=3D"~amd64 ppc ~ppc64 ~x86" +KEYWORDS=3D"~amd64 ppc ~x86" IUSE=3D"debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpe= g jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine" =20 RDEPEND=3D" diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/openc= v/opencv-2.2.0-r10.ebuild index 47ee381..e067847 100644 --- a/media-libs/opencv/opencv-2.2.0-r10.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.6 2011/07/13 20:03:06 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.eb= uild,v 1.9 2011/09/06 20:56:37 dilfridge Exp $ =20 EAPI=3D3 =20 @@ -16,7 +16,7 @@ SRC_URI=3D"mirror://sourceforge/${PN}library/${MY_P}.ta= r.bz2" =20 LICENSE=3D"BSD" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"~amd64 ~ppc ~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" =20 # all tests fail, needs further investigation, bug 296681 - dilfridge @@ -46,7 +46,7 @@ RDEPEND=3D" ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) + ieee1394? ( >=3Dmedia-libs/libdc1394-2.1.3-r1 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) @@ -61,6 +61,7 @@ RDEPEND=3D" " DEPEND=3D"${RDEPEND} doc? ( app-doc/doxygen[-nodot] ) + >=3Ddev-util/cmake-2.8.5-r2 dev-util/pkgconfig " =20 diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/op= encv-2.3.0.ebuild index 7fa7b64..0d41961 100644 --- a/media-libs/opencv/opencv-2.3.0.ebuild +++ b/media-libs/opencv/opencv-2.3.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.6 2011/07/13 20:03:06 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild= ,v 1.4 2011/09/26 22:38:16 dilfridge Exp $ =20 EAPI=3D3 =20 @@ -16,15 +16,13 @@ SRC_URI=3D"mirror://sourceforge/${PN}library/${MY_P}.= tar.bz2" =20 LICENSE=3D"BSD" SLOT=3D"0" -KEYWORDS=3D"" -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" - -# all tests fail, needs further investigation, bug 296681 - dilfridge -RESTRICT=3Dtest +KEYWORDS=3D"~amd64 ~ppc ~x86" +IUSE=3D"cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg j= peg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine" =20 RDEPEND=3D" app-arch/bzip2 sys-libs/zlib + sci-libs/flann cuda? ( >=3Ddev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) @@ -79,6 +77,8 @@ pkg_setup() { =20 src_prepare() { base_src_prepare + # include missing zlib.h for libpng>1.5. Bug #383571 + epatch "${FILESDIR}"/${P}-libpng15.patch =20 # remove bundled stuff rm -rf 3rdparty @@ -93,14 +93,12 @@ src_configure() { $(cmake-utils_use_build examples) $(cmake-utils_use examples INSTALL_C_EXAMPLES) $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) - $(cmake-utils_use_build test TESTS) $(cmake-utils_use_enable sse SSE) $(cmake-utils_use_enable sse2 SSE2) $(cmake-utils_use_enable sse3 SSE3) $(cmake-utils_use_enable ssse3 SSSE3) $(cmake-utils_use_with ipp) $(cmake-utils_use_with ieee1394 1394) - $(cmake-utils_use_with cuda) $(cmake-utils_use_with eigen) $(cmake-utils_use_with ffmpeg) $(cmake-utils_use_with gstreamer) @@ -116,6 +114,17 @@ src_configure() { $(cmake-utils_use_with xine) ) =20 + if use cuda; then + if [ "$(gcc-version)" > "4.4" ]; then + ewarn "CUDA and >=3Dsys-devel/gcc-4.5 do not play well together. Disa= bling CUDA support." + mycmakeargs+=3D( "-DWITH_CUDA=3DOFF" ) + else + mycmakeargs+=3D( "-DWITH_CUDA=3DON" ) + fi + else + mycmakeargs+=3D( "-DWITH_CUDA=3DOFF" ) + fi + if use python && use examples; then mycmakeargs+=3D( "-DINSTALL_PYTHON_EXAMPLES=3DON" ) else @@ -158,8 +167,3 @@ src_configure() { =20 cmake-utils_src_configure } - -src_test() { - export LD_LIBRARY_PATH=3D"${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib" - cmake-utils_src_test -}