* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-05-15 16:44 Andreas K. Huettel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-05-15 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 0b7982014453db83c96419cdcfef028b7c242e57
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun May 15 17:04:51 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 15 17:04:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0b798201
[media-libs/opencv] Resync with tree
(Portage version: 2.1.9.49/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 4 ++
media-libs/opencv/Manifest | 31 ++++++++++---------
...cv-2.2.0-r11.ebuild => opencv-2.2.0-r10.ebuild} | 2 +-
...opencv-2.2.0-r11.ebuild => 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 2011/05/11 20:10:16 dilfridge Exp $
+ 15 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.2.0.ebuild,
+ +opencv-2.2.0-r10.ebuild, -opencv-2.2.0-r11.ebuild:
+ Resync with tree
+
14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-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 79e1f005b1aa494468edd3f57f944e0b5
AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de
AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43bd2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d01c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7
-MISC ChangeLog 6624 RMD160 fa16a02153451bde0ba1b62172bee8b99d5d229f SHA1 975220ba665a5be7bc522367b887e5fdddae73ce SHA256 c171ef14bd84813dfc4c142910943a3a4ffc608c907f47c3fd3b283c5f5354bd
+EBUILD opencv-2.2.0-r10.ebuild 4395 RMD160 3a6f2fc6752ec38e83da63e7b3b63f67810801e6 SHA1 203ffcc7dfd013c963f494515e0cda12f334f133 SHA256 b301eb7e0e4b3cb2e738c583a326f8a3192ecac1a70139cee07ee4de9ec92da2
+EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
+MISC ChangeLog 6777 RMD160 99152d0a8c39bfdc2172815430e389f7b10ad7ee SHA1 fff5bfa89df9ffd63715bd7c0adc2ed5e64dc723 SHA256 b5b4b430a0ab2b31b07a5ae006dfb171558962f9eeca2f9b1b2a98caaf189b4f
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
-=fwXD
+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+
+=Wonr
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/opencv/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.ebuild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.3 2011/05/15 16:42:14 dilfridge Exp $
EAPI=3
diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/opencv/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.ebuild,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 $
EAPI=3
@@ -16,8 +16,8 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
+KEYWORDS="amd64 x86"
+IUSE="doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
# all tests fail, needs further investigation, bug 296681 - dilfridge
RESTRICT=test
@@ -30,10 +30,6 @@ RDEPEND="
>=sci-libs/clapack-3.2.1-r4
sci-libs/flann
virtual/lapack
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-3.2
- >=dev-util/nvidia-cuda-npp-3.2
- )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
gstreamer? (
@@ -47,7 +43,6 @@ RDEPEND="
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=(
"${FILESDIR}/${P}-ptrcvcapture.patch"
"${FILESDIR}/${P}-use_system_libs.patch"
"${FILESDIR}/${P}-v4l_2.6.38.patch"
- "${FILESDIR}/${P}-findnpp.patch"
)
CMAKE_BUILD_TYPE="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=OFF
$(cmake-utils_use_with ieee1394 1394)
- $(cmake-utils_use_with cuda)
+ -DWITH_cuda=OFF
$(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=${EPREFIX}/usr/share/doc/${PF}"
)
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-09-02 21:32 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-02 21:32 UTC (permalink / raw
To: gentoo-commits
commit: bd17772f8066528e7f41208f0c9c853a64bfb44b
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Sep 2 21:31:13 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 21:31:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=bd17772f
Builds but is still far from finished or presentable; sandbox violation during install
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 5 +++++
media-libs/opencv/Manifest | 31 ++++++++++++++++---------------
media-libs/opencv/opencv-2.3.0.ebuild | 13 ++-----------
media-libs/opencv/todo.txt | 17 +++++++++++++++++
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index ce5b99a..437a985 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 2011/05/11 20:10:16 dilfridge Exp $
+ 02 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+ +todo.txt:
+ Builds but is still far from finished or presentable; sandbox violation
+ during install
+
*opencv-2.3.0 (28 Aug 2011)
28 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.0.ebuild,
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index edac47a..147e116 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -24,23 +24,24 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4578 RMD160 c8442032703c8803f3c787952705c4910fc84e56 SHA1 86d3a55cc6e91d2358edcc473a541d3439476b0b SHA256 f07fa3a5ecee8bc8dde451db81165aea22d0148760b5696245613d1dbf736152
-MISC ChangeLog 7319 RMD160 f737b2b41a3111d270532e9c81154d8ec25f36e5 SHA1 80b60fbd1a7540d6908c84547afdeb94d5a81900 SHA256 ae8622bce0324c5f0dbfa333e5b704fe50dd47fd359c4f125256b1a27878a144
+EBUILD opencv-2.3.0.ebuild 4308 RMD160 b6d91e028da5743fa67cbf125c3b2765642cf250 SHA1 b32801db0fb333d35c4610db7ff628d0019f72d3 SHA256 3e1142e02f10c3f82f0ca830700a6efbfc3669373372495529976bb4e278a935
+MISC ChangeLog 7502 RMD160 e470c1164168ad34a663e460d86b161be47d02ef SHA1 0f438769b7590a35eac6e55a0f0c6982b70bd2f2 SHA256 6364a8ff2179a39c3e5e43eb2110ea7e5dbbabb889fd1a707a17879c7c7507a5
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
+MISC todo.txt 299 RMD160 3e943a0ef2fab438071f410b81903449fd181a22 SHA1 e5182123ec9f539bfda402c8b70a12f44f252891 SHA256 63dcd1a65951a2836beb1be2ff081caafbbaccefaa8e4af7e51a8c1e13a25f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOWlFCAAoJEEb+UGWnxTyHWbsQAIbUrV4ioUJDBoJbB7z0yYu9
-ViLEDCKaZrE/jbHcNnYL57AzBGR27qBJTSS1EjohT7ksv884GV3J9ZW0/UY8A2Bs
-ff1HbJHVhfr9ne2uFkS97iPwXFQm166CCVwj5gxcvN+nlWSUPWxGjItQF2TteHJ8
-icH5rYMSxhFA6afVRHNDI/iOdOo+L/jISviX/KYjuzk9A0k4VCSuB1NdNBBYFSp5
-FbkSN0nfBDu3DQRNTuU9RH17eAeZeKcKWbItaZW/Lk8oiTVPgQctC9PvDpqF7oi3
-QoJuQoD9YHc2j9N5sPSEC/FH7C++NG0y+jj7FAWelnbjo5fxbYm1amFTqHubNbPA
-UHHnGKyknWFaYH1os/CJL+2vxvGua9iYZTIiDMP+RULcW5T5G8rZJnyU67XKjU7s
-rdxBpksrEv5aGU9eStoy187LfoPzuiK7/qcFoDACo/EZ4IAVnTMhDHC8Xfs1KyBN
-gyFMFGY2Hg5vuaAT2V2WUq+QsgKO+MS118RDFop1BWMWKC+i7laly2yrMTTL2eE5
-ypD/uo9SrEOR+PkmMDyjcNzBrMyWCs6DRB2zqxMDS6kuvb4EW7SkDM/fto5TIqmP
-MWaD3hSxHZUQ1dYYz5RQI95leVblI46ad8QFdxvgTFMxJM1sEbe+cQ8PvV5jdyvY
-aHw1EHT52xg/xZouIm5J
-=Sjqs
+iQIcBAEBCgAGBQJOYUshAAoJENwGBM22xffeRqIP/j0NjUpYhMsvhsPBGeSxV1ZX
+dQFFeUJzPOIlvNxRY/2ry4xbVl+wW2fc8Kk1QgJ2RYN+GIbon/SadBoNtFnv3fHA
+s9K7OUidAqC5RdI90KfTWtlCdKGPyyIcDVp28WijpaXMAv0PSRrzwa9WbgWn7Z74
+qk4d/e8ciBeFyIR4g4FvBzyH5WgRq39vO9PM+p5TESc7i70zWog5gmO/ou6drXZV
+xVxfIJoPEA57Oe/Lr0BkVrhTTtppBckSK4vkMOK1pla1uFI5rxg1ccLY8Skrjcyh
+njhHmaR8Mpnxkzv0wc3N3b7PMm7ntl1czqY0n8ALBW4MlI9BSLA3LCT56LKjk/Gl
+JasH7hfCl2dB8Njt8+2QNw3lz/bkdbkfwRvfoIEFHHwxi575ITmBggPYJXyBFXO8
+dH5NxqpXN56zX7Hvz5qfjywV+qDOZFKsrmp+g5hPOSpDMu2LvIhdBq4e+iztqnv6
+SzlHdhM6XVTCq0cG0hX2gJbcLmd7VPJgZveukIMHhIG7wriV3LbUAR/nUDktW2FA
+IdsNq/RkEFzddeq89ZTswe8+Tvuj26/cp1JBl7dTIckbHouoeLJNiG86xljRG4iE
+pn2CsoPgSI8BC0hNgtl//SGStgUdLiRqzTfABhhn8Y/yOu1cg9wEi4dN1rmUgtfM
+nwceb4+x+ztByuJJ5IGC
+=lXAR
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 8e2885a..84c91e9 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
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"
# all tests fail, needs further investigation, bug 296681 - dilfridge
@@ -26,14 +26,9 @@ RDEPEND="
app-arch/bzip2
dev-libs/libf2c
sys-libs/zlib
- >=sci-libs/clapack-3.2.1-r4
sci-libs/flann
- virtual/lapack
virtual/fortran
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-3.2
- >=dev-util/nvidia-cuda-npp-3.2
- )
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
gstreamer? (
@@ -72,10 +67,6 @@ PATCHES=(
# "${FILESDIR}/${PN}-2.2.0-ffmpeg01.patch" ffmpeg-related code has been completely restructured
# "${FILESDIR}/${PN}-2.2.0-ffmpeg02.patch" but it looks like it still does not support new interface
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
- "${FILESDIR}/${PN}-2.2.0-use_system_libs.patch"
- "${FILESDIR}/${PN}-2.2.0-v4l_2.6.38.patch"
- "${FILESDIR}/${PN}-2.2.0-findnpp.patch"
- "${FILESDIR}/${PN}-2.2.0-findblas.patch"
)
CMAKE_BUILD_TYPE="Release"
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
new file mode 100644
index 0000000..76961db
--- /dev/null
+++ b/media-libs/opencv/todo.txt
@@ -0,0 +1,17 @@
+TODO
+----
+
+* complete the set-to-option conversion and send it upstream
+
+* try to unbundle flann again cleanly
+
+* check if we still need the cmake fortran test
+
+* check if we still need to patch for newer ffmpeg versions
+
+* test building against new cuda
+
+* reckeck all cmake options in ebuild
+
+:|
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-09-18 18:01 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-18 18:01 UTC (permalink / raw
To: gentoo-commits
commit: bb465579f4e15754aa94f3578eff5b86f4ba924e
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:01:49 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:01:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=bb465579
Rechecked all cmake options
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 4 ++++
media-libs/opencv/Manifest | 32 ++++++++++++++++----------------
media-libs/opencv/opencv-2.3.0.ebuild | 13 ++++++++-----
media-libs/opencv/todo.txt | 2 --
4 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 939f56f..0df5e8c 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -3,6 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+ todo.txt:
+ Rechecked all cmake options
+
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
files/opencv-2.3.0-convert_sets_to_options.patch,
+files/opencv-2.3.0-symlink.patch, +files.txt, todo.txt:
Completed Sets2Options, fixed sandbox violation
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b7e3e62..354e690 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -25,25 +25,25 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4349 RMD160 14b7196a8df6266c6aab2932fd37bd822de6ad0c SHA1 6a2df98559414d03fda7e7f607ab4c4ba0e134a2 SHA256 40d05867eafaa147daa1b2420bcf2dcc896a7db1a199a26386f118ef92b2aa2c
-MISC ChangeLog 7742 RMD160 413f2dd54d63886f0a96407001e926b6b95e2217 SHA1 4ec4467602021cfdbf17a4436e2c12fb1905aebc SHA256 c2a70aeff9e961f268463dc76ab93d648a978e42532a87b844a642fcdd826a2b
+EBUILD opencv-2.3.0.ebuild 4401 RMD160 3cd084c7199e1818c4e179c673229d7b08306deb SHA1 d8d5049cdb1acee7de0f2eb0e7903b719dbfa38a SHA256 f6995e21eab69ed13422ec42a3a218507c25724f847d072961c0e3399c41955d
+MISC ChangeLog 7863 RMD160 4ef75e5cd3c82f80e3da8fe365c8cef00d6cd227 SHA1 1fb56ef37e7818954699d5d06a7fc37a1f34c797 SHA256 794668b2d6030651752e0059639c2362d59db62ed3c39a58db5335787131f44f
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 283 RMD160 e5ff61515423d43fc3506ba0082f930bb3e8898e SHA1 6d698c902b25c398fec354f08c01f1d58b94728c SHA256 31700f20661a5fb1f301c5bb577cfb64b1996a5354a0e20d2cb75ced273a022c
+MISC todo.txt 244 RMD160 a09aa047995e0969387c8fdeed1b5a0741fa4e3a SHA1 8b65f6f0a07cc9b120cd0d535fc6edb416476ba7 SHA256 2481fe56b50287b4bef613c5cf858927a3f15f28d25de1e534cd80428e9d6854
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOditrAAoJEEb+UGWnxTyHXpoQAK6u/kA3OyRVPFg7Z7+kGlum
-OQxauJuC9KUBgIVFVNdquRbyP4t47HxasMLshNTXvQ9x4SM+uyYWEq6Tqk8N+WM0
-qwGOtVxRN0mlRAjU0IVLd/uVr1zAUFiMUDjOXHDTrga9RCD5RTEwheTpjNA69YCP
-0phgMSzO83Gorgtw9pQx4Kb2VX+hX3DVsXVFNUlPTrrGrEQbIavUw/QSK3ULzkAm
-7MjqcDu//atH5+z5ydVsvD60yUiwOHY78xsyXWhapEZbwEbFzDck1OdXCQz4qBNF
-sGpNyWLppFqkePgnFRKLct2ubCRaUQ+TSEZNC2KNKy+hQcYvze7xTj6qbc4TDzj+
-z9QS9f1CLryQ5x7hE2n94B+hRoniibCrZrt2dnVARi+JqBeyVYwEmTqr3jNIgn07
-HSwtTNQnUrgcDAFIxf1DFK6UxmUYMDCDO0Tbdtcr7Ly+sqfFv4hd0pLyBFkUTUX4
-zvjcHG/0LdswYTcR6xxoCRDBgcRdimWe5ngEPgaWQBxhiG60E3e52s1J6Vx1ubse
-42FdHK1f0lMaC4Q7Gw624aF+1bTGQwuHKNC83gBGR1zKZV3DwGKVyrVwgpPSpfLo
-l+OmcN24auGcXl2N1qzkUmIbzhYsMMalTNNEw2tr8us3gAgBhebxpE0xlMbtGwHF
-e3EWHskwevVh2Y8ao1LX
-=2Ve0
+iQIcBAEBCgAGBQJOdjINAAoJEEb+UGWnxTyHDo4QALHx82gS9IMXgBDYQ/f7KP3q
+vjZLvQG70wI0qHdXaVQ5KUYb0l0utC4ANwqRJKK2ZCPZFZCcRhWLW5u4h0ej6qxg
+3X2e6jKbrBh2aftMrLO4aarSxZ3BZe+QvbtT8w3MAHjrOZ9t/EmF0vL4erdXpzbf
+EQ/NtzGvfG+SS6/etzvQLV1xN1ui0SqxqG4srGwQX1bk2RTtQ/2gPO4MUFdJ9SsL
+NzsbF0E1+3ohObF5oBOwOgA+Cv0Rc4E0IDAtZhAJJ/aoYbayeIrkO/igipTH6oX8
+RGZIDhO15tqHsyfk9ksSYV1MNFKtijs2TPFgic6Ss4oUnRUSoa3runS7A3zjtKlP
+eQjXlVzpSYXp6ukS82JVECRhqeekURVv5JhcgZRHshugxkM7nWdzdcMVtVJtkTCV
+91T8O4R60e7vltLKfZFfANEvZaSiYXp+aCydrHIaEc+Fu3sb0VJmD/fMSm7qBaRq
+QXeg2cNfQoD7h5df2tXQwhJ3V07m2GfSkZCnuh7W6StYC1SShmpNZ5uhyJe8iJNA
+l13e6cMwFQwQzDB45OBiZgl/Brb6QiHBW4NYe5H3Wwh4u/onFob2EnWhFTGVAx6j
+3MS0g950/ZfX4Vbayyx9kM3uo5x9hCp4TnSQJ6gnF2/mAmK3XSFO76MlR38EI2d4
+m8Pd3F+BywY45PHs+Fqn
+=wOk3
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index bf9486a..813d6a1 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
xine? ( media-libs/xine-lib )
"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[-nodot] )
+ doc? ( virtual/latex-base )
dev-util/pkgconfig
"
@@ -94,7 +94,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_build doc DOXYGEN_DOCS)
+ $(cmake-utils_use_build doc DOCS)
$(cmake-utils_use_build examples)
$(cmake-utils_use examples INSTALL_C_EXAMPLES)
$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
@@ -103,13 +103,14 @@ 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)
+ $(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)
$(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg)
$(cmake-utils_use_with jpeg2k JASPER)
$(cmake-utils_use_with openexr)
$(cmake-utils_use_with png)
@@ -127,7 +128,8 @@ src_configure() {
fi
# things we want to be hard off or not yet figured out
- # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+ # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
+ # openni: ???
mycmakeargs+=(
"-DUSE_OMIT_FRAME_POINTER=OFF"
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
@@ -144,9 +146,10 @@ src_configure() {
"-DWITH_PVAPI=OFF"
"-DWITH_UNICAP=OFF"
"-DWITH_TBB=OFF"
+ "-DWITH_OPENNI=OFF"
)
- # things we want to be hardly enabled not worth useflag
+ # things we want to be hard enabled not worth useflag
mycmakeargs+=(
"-DCMAKE_SKIP_RPATH=ON"
"-DBUILD_SHARED_LIBS=ON"
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
index 40de66e..6ea83c9 100644
--- a/media-libs/opencv/todo.txt
+++ b/media-libs/opencv/todo.txt
@@ -11,7 +11,5 @@ TODO
* test building against new cuda
-* reckeck all cmake options in ebuild
-
:|
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-09-18 18:06 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-18 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 582e3e573df4a287f0946e52f40bb7308eaf8e5d
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:04:34 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:04:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=582e3e57
Fortran should not be needed anymore as (c)lapack is not used anymore
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 4 ++++
media-libs/opencv/Manifest | 32 ++++++++++++++++----------------
media-libs/opencv/opencv-2.3.0.ebuild | 3 ---
media-libs/opencv/todo.txt | 2 --
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 0df5e8c..e33cb2d 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -4,6 +4,10 @@
18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
todo.txt:
+ Fortran should not be needed anymore as (c)lapack is not used anymore
+
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+ todo.txt:
Rechecked all cmake options
18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 354e690..fda3b38 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -25,25 +25,25 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4401 RMD160 3cd084c7199e1818c4e179c673229d7b08306deb SHA1 d8d5049cdb1acee7de0f2eb0e7903b719dbfa38a SHA256 f6995e21eab69ed13422ec42a3a218507c25724f847d072961c0e3399c41955d
-MISC ChangeLog 7863 RMD160 4ef75e5cd3c82f80e3da8fe365c8cef00d6cd227 SHA1 1fb56ef37e7818954699d5d06a7fc37a1f34c797 SHA256 794668b2d6030651752e0059639c2362d59db62ed3c39a58db5335787131f44f
+EBUILD opencv-2.3.0.ebuild 4274 RMD160 3d6d2dc6f4d27b34f941ef8496bd76189ca32699 SHA1 a2323c62d69407803bb26475780af36a112cfc98 SHA256 cf35b82d9ca9a26feb52af8b00b5263f263f9dd43c044387a1e64edd537b01d2
+MISC ChangeLog 8026 RMD160 bbf39771cdc051286ab2f75515c91d79aaf1fab6 SHA1 067dd1377dcaf6fb3b7ab72892caca30a86dd304 SHA256 4860c5a079689d1f82dfcdd4060654f33ed921f10bff7f61a520fb91f34a6164
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 244 RMD160 a09aa047995e0969387c8fdeed1b5a0741fa4e3a SHA1 8b65f6f0a07cc9b120cd0d535fc6edb416476ba7 SHA256 2481fe56b50287b4bef613c5cf858927a3f15f28d25de1e534cd80428e9d6854
+MISC todo.txt 195 RMD160 327817b29189fa21bbf1634b7d68be0ff8e6bdd5 SHA1 da8737e371da7e06f0a787eab7d15198179d9e70 SHA256 7b600a4ade7403436af1271a0661fcb3298b78ef840f87ec6eb9554a1bcbffd0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOdjINAAoJEEb+UGWnxTyHDo4QALHx82gS9IMXgBDYQ/f7KP3q
-vjZLvQG70wI0qHdXaVQ5KUYb0l0utC4ANwqRJKK2ZCPZFZCcRhWLW5u4h0ej6qxg
-3X2e6jKbrBh2aftMrLO4aarSxZ3BZe+QvbtT8w3MAHjrOZ9t/EmF0vL4erdXpzbf
-EQ/NtzGvfG+SS6/etzvQLV1xN1ui0SqxqG4srGwQX1bk2RTtQ/2gPO4MUFdJ9SsL
-NzsbF0E1+3ohObF5oBOwOgA+Cv0Rc4E0IDAtZhAJJ/aoYbayeIrkO/igipTH6oX8
-RGZIDhO15tqHsyfk9ksSYV1MNFKtijs2TPFgic6Ss4oUnRUSoa3runS7A3zjtKlP
-eQjXlVzpSYXp6ukS82JVECRhqeekURVv5JhcgZRHshugxkM7nWdzdcMVtVJtkTCV
-91T8O4R60e7vltLKfZFfANEvZaSiYXp+aCydrHIaEc+Fu3sb0VJmD/fMSm7qBaRq
-QXeg2cNfQoD7h5df2tXQwhJ3V07m2GfSkZCnuh7W6StYC1SShmpNZ5uhyJe8iJNA
-l13e6cMwFQwQzDB45OBiZgl/Brb6QiHBW4NYe5H3Wwh4u/onFob2EnWhFTGVAx6j
-3MS0g950/ZfX4Vbayyx9kM3uo5x9hCp4TnSQJ6gnF2/mAmK3XSFO76MlR38EI2d4
-m8Pd3F+BywY45PHs+Fqn
-=wOk3
+iQIcBAEBCgAGBQJOdjKyAAoJEEb+UGWnxTyHQlUQAKXAd0dq0nuO240cQNVyGhQn
+E2GwLL1z5g8YKWAxDo5hKu8lywKzi/c2cUoV9B3WGJEIAu57StZe8rXmBCQQrnYi
+0ccpH9YAP5UN5BYOoeXktv66WosLGeEQSryXbXKO5McJnNkaOs6NulHsf8mRkY9p
+r5KuTfjK0ulEtLcRoZGDTAehMc8tvq1OdvsrH4541q1XrkZNa3UP7OOoFKVxvUxN
+/RK1PWv8nXraZlixG3y4teUL/VUT6+8Udm2MCdiXluq4yS14ClaEIQE942RfPonv
+CP35IZcIgdI++OGJiCZGBRm2pk6EpzDK8nzH8CQ6+VS9q0xo8rIuD5LjYZKsLh9K
+mLhL7FhNtdPeDlDFIWDAnRFFlLd5B8ygBmXNqxwYQIN8vA8YdhENw7H9aoFROmoG
+ecAVzyng1+MZ1a2VuCqSMtceIASeKlz7x0zhSuI/q4cTBtMQ44WSi1S7OpgFshoT
+isNZMqDA63T821fIgcKU2hRu61vrs4EEOkhJwns230sLsZUGr+d8SZgToEK1jDjC
+vuT5Zo80rdIg5T2EuUFfzhHQsyQsy/oj0cevYm5RpMqyzNJv+xFt8/wva0OglKQW
+tkSKSmWGbsUpzgTW2Gza+gIo8XFYdO9G2VmpBt9cwNZD6JkVndG4X3gdrU4cWJnf
+/i4BygLYA914PaEldHHr
+=buA4
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 813d6a1..d76c203 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -24,10 +24,8 @@ RESTRICT=test
RDEPEND="
app-arch/bzip2
- dev-libs/libf2c
sys-libs/zlib
sci-libs/flann
- virtual/fortran
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
@@ -63,7 +61,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
-# "${FILESDIR}/${PN}-2.2.0-fortran.patch" disabled for testing but should still be needed
# "${FILESDIR}/${PN}-2.2.0-ffmpeg01.patch" ffmpeg-related code has been completely restructured
# "${FILESDIR}/${PN}-2.2.0-ffmpeg02.patch" but it looks like it still does not support new interface
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
index 6ea83c9..20e17f5 100644
--- a/media-libs/opencv/todo.txt
+++ b/media-libs/opencv/todo.txt
@@ -5,8 +5,6 @@ TODO
* try to unbundle flann again cleanly
-* check if we still need the cmake fortran test
-
* check if we still need to patch for newer ffmpeg versions
* test building against new cuda
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-09-18 20:35 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-18 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 949b90cea3a31883e5d56ec6e50f52a4fef9b668
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Sep 18 20:25:09 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 20:25:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=949b90ce
Cleanup
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 3 +
media-libs/opencv/Manifest | 30 +++----
media-libs/opencv/files.txt | 206 -------------------------------------------
media-libs/opencv/todo.txt | 11 ---
4 files changed, 17 insertions(+), 233 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 78aba60..10d7bf1 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> -files.txt, -todo.txt:
+ Cleanup
+
18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+files/opencv-2.3.0-ffmpeg.patch, todo.txt:
Ported the ffmpeg patch
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index aad3f0c..a6f22b4 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -27,24 +27,22 @@ EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
EBUILD opencv-2.3.0.ebuild 4113 RMD160 0cef49e16f56bc18c1b367105d5233b250d15f85 SHA1 2544dbf1664a6d509e0fc40251f59c02adb65bb5 SHA256 7eb3713d83e79fea7cd1c1a699005b77974e1f6232e595818683d124037a9d45
-MISC ChangeLog 8177 RMD160 c8ac1a1b433706781e3379a49893464d137c62e1 SHA1 418b1d2a0dcbe13cba7cfca52b32c51fb7f8e593 SHA256 ce54b19e69bc494c84c5d11f0e4bac0e38ab053d1f193906136a946c7d1448db
-MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
+MISC ChangeLog 8268 RMD160 349c578a91c0e8b450367db08869bf46251a29b1 SHA1 9b8d6fb8792f2b861607c89bba91ebbd2059210a SHA256 08d6e9447b08971a1234436368a52bd87891dfbae02034a8c8f3016f6aed3b4c
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 134 RMD160 0a9994311d9446ee0437f5558a530c8480c8fd08 SHA1 1ede24c3f222f617f1895864752bd201608ed699 SHA256 89b382e4b13b9db752bb3afd6783be59f95af4a5bee44158036ae1773801515a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOdjo/AAoJEEb+UGWnxTyHFY8QAL7k4jHHGeYoiBrg0cBWSits
-qh1G21F12CpbxdgMgVoA8M9ntQ455aFjbMMWI4Ire2fSWOHyCbDe/ft+f47ta/a4
-q3OTflSRrZpl+aNaAI5/va9VcTXQmvunNgR1/PxOr1VKQnwCd7YUJrhmo6p2cDHs
-9W6M56uqLhtxG88D8STlL+vtgwycTWPOFoDLVet6tQVlcTq2t+k92WKfwoJV8ZjQ
-d1Px7XlDdRd/LML15xJD5RSwa4RdeaIwWMTPyTcOMkvKbSQuqwYjkY+oNQrrQB9x
-QXjwCElP3qsXFizqv0Yjs+RGtEpsstuGDUq542YfxGpFEeePnlJWzCP6xl7L9D8W
-sNSy19IABCmrkosApM69nML3UcdoK8nPazjS6gEAm7aZrOozi6amt4RO8VR6///v
-75dUKBzfTQ6KqQFGxkQRIUWDtZ7KCSnqob/N78pcYXwDB1jxOCbA1lN+SJl49IIb
-V8d4szjTLEZVeXKCCi5kviox6Keu8/QCHdIo7LySkJcA5Hi7RsfS/yq//7KBycdb
-jda1TdGOugJlyOXzNiEbLgPj66ltw67ntttQ22+H16GF4cgCygyVHjELE4sjzOgG
-qNu5Ylr+WRGH3fVJoqphFdpKwUcdoR2OOM0YHEuK30zZ2q3AomsZKMxk9jKesIra
-j7Eg4AEKM6Fut7v130Li
-=jcT6
+iQIcBAEBCgAGBQJOdlOlAAoJENwGBM22xffeV4kP/RZx2kCLEgAlcytJz1FcCBLe
+dwxqq3wAzfhwIYsMeJfpNPg0KhR+tvnag26OTkM5UMTspFlawCXIbn1DP3DYVZ4d
+F/k8LsmbOeAIGtWkMrU1sK1Pr5yGEUxco+8nnwza0N9wFW9DtXaR8X5zjLm0OZ2c
++rWtxscroDD+pDpsYWlGVplUxEqZI7F4BhkRS8bIJ6RwLudo713prAa3gScAUa2U
+K1qDe/63VyLs3XWWyTYyUz875/HLUFP5gwWdlT6CgPM2tKH+EM0FVMYWAJaPKFha
+bE3p0XyC2slmEbrX3tljVVJ4pp0Gxu/u61guLfQKcyIVyIJaGPComTsLdVgG/0jt
+TW9FZs7eMVhUHZndqKPzk+gnvIhvIELzB7jnMpS5IRcqBudJG3skggkoIaaRjoQc
+2gOui4sdkSqH2o4dMoEjgHJftnjB/kdpyCpcAtfupQSRwwvo2/sdURz7qOrKlGR1
+tg6GhNqf9wPaOY90YFmbhIGeI73AK/mFEUn/gllOaUePQV/F3mEIdkrZo7pmCSkE
+aWIVd5zJTGNgVxa5ft1FSHi7/+fX1T9c5KTYbMa/0qNLB2H3m4/x/MoxtQOBG+PO
+9X3ioJFDs2vhpzqxfvY492bt1H0HhDYAIX2zJgVJW/a9NzkHLQZh94r9AAHyftfV
+waMRh/DiropKKFM4Qhza
+=C9tw
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files.txt b/media-libs/opencv/files.txt
deleted file mode 100644
index 56dd089..0000000
--- a/media-libs/opencv/files.txt
+++ /dev/null
@@ -1,206 +0,0 @@
-/
-/usr
-/usr/bin
-/usr/bin/opencv_createsamples
-/usr/bin/opencv_haartraining
-/usr/bin/opencv_performance
-/usr/bin/opencv_stitching
-/usr/bin/opencv_traincascade
-/usr/include
-/usr/include/opencv
-/usr/include/opencv/cv.h
-/usr/include/opencv/cv.hpp
-/usr/include/opencv/cvaux.h
-/usr/include/opencv/cvaux.hpp
-/usr/include/opencv/cvwimage.h
-/usr/include/opencv/cxcore.h
-/usr/include/opencv/cxcore.hpp
-/usr/include/opencv/cxeigen.hpp
-/usr/include/opencv/cxmisc.h
-/usr/include/opencv/highgui.h
-/usr/include/opencv/ml.h
-/usr/include/opencv2
-/usr/include/opencv2/calib3d
-/usr/include/opencv2/calib3d/calib3d.hpp
-/usr/include/opencv2/contrib
-/usr/include/opencv2/contrib/contrib.hpp
-/usr/include/opencv2/core
-/usr/include/opencv2/core/core.hpp
-/usr/include/opencv2/core/core_c.h
-/usr/include/opencv2/core/eigen.hpp
-/usr/include/opencv2/core/internal.hpp
-/usr/include/opencv2/core/mat.hpp
-/usr/include/opencv2/core/operations.hpp
-/usr/include/opencv2/core/types_c.h
-/usr/include/opencv2/core/version.hpp
-/usr/include/opencv2/core/wimage.hpp
-/usr/include/opencv2/features2d
-/usr/include/opencv2/features2d/features2d.hpp
-/usr/include/opencv2/flann
-/usr/include/opencv2/flann/all_indices.h
-/usr/include/opencv2/flann/allocator.h
-/usr/include/opencv2/flann/autotuned_index.h
-/usr/include/opencv2/flann/composite_index.h
-/usr/include/opencv2/flann/dist.h
-/usr/include/opencv2/flann/flann.hpp
-/usr/include/opencv2/flann/flann_base.hpp
-/usr/include/opencv2/flann/general.h
-/usr/include/opencv2/flann/ground_truth.h
-/usr/include/opencv2/flann/hdf5.h
-/usr/include/opencv2/flann/heap.h
-/usr/include/opencv2/flann/index_testing.h
-/usr/include/opencv2/flann/kdtree_index.h
-/usr/include/opencv2/flann/kmeans_index.h
-/usr/include/opencv2/flann/linear_index.h
-/usr/include/opencv2/flann/logger.h
-/usr/include/opencv2/flann/matrix.h
-/usr/include/opencv2/flann/nn_index.h
-/usr/include/opencv2/flann/object_factory.h
-/usr/include/opencv2/flann/random.h
-/usr/include/opencv2/flann/result_set.h
-/usr/include/opencv2/flann/sampling.h
-/usr/include/opencv2/flann/saving.h
-/usr/include/opencv2/flann/simplex_downhill.h
-/usr/include/opencv2/flann/timer.h
-/usr/include/opencv2/gpu
-/usr/include/opencv2/gpu/NCV.hpp
-/usr/include/opencv2/gpu/NPP_staging.hpp
-/usr/include/opencv2/gpu/devmem2d.hpp
-/usr/include/opencv2/gpu/gpu.hpp
-/usr/include/opencv2/gpu/matrix_operations.hpp
-/usr/include/opencv2/gpu/stream_accessor.hpp
-/usr/include/opencv2/highgui
-/usr/include/opencv2/highgui/highgui.hpp
-/usr/include/opencv2/highgui/highgui_c.h
-/usr/include/opencv2/imgproc
-/usr/include/opencv2/imgproc/imgproc.hpp
-/usr/include/opencv2/imgproc/imgproc_c.h
-/usr/include/opencv2/imgproc/types_c.h
-/usr/include/opencv2/legacy
-/usr/include/opencv2/legacy/blobtrack.hpp
-/usr/include/opencv2/legacy/compat.hpp
-/usr/include/opencv2/legacy/legacy.hpp
-/usr/include/opencv2/legacy/streams.hpp
-/usr/include/opencv2/ml
-/usr/include/opencv2/ml/ml.hpp
-/usr/include/opencv2/objdetect
-/usr/include/opencv2/objdetect/objdetect.hpp
-/usr/include/opencv2/opencv.hpp
-/usr/include/opencv2/video
-/usr/include/opencv2/video/background_segm.hpp
-/usr/include/opencv2/video/tracking.hpp
-/usr/lib
-/usr/lib/debug
-/usr/lib/debug/usr
-/usr/lib/debug/usr/bin
-/usr/lib/debug/usr/bin/opencv_createsamples.debug
-/usr/lib/debug/usr/bin/opencv_haartraining.debug
-/usr/lib/debug/usr/bin/opencv_performance.debug
-/usr/lib/debug/usr/bin/opencv_stitching.debug
-/usr/lib/debug/usr/bin/opencv_traincascade.debug
-/usr/lib/debug/usr/lib64
-/usr/lib/debug/usr/lib64/libopencv_calib3d.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_contrib.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_core.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_features2d.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_flann.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_gpu.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_highgui.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_imgproc.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_legacy.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_ml.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_objdetect.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/libopencv_video.so.2.3.0.debug
-/usr/lib/debug/usr/lib64/python2.7
-/usr/lib/debug/usr/lib64/python2.7/site-packages
-/usr/lib/debug/usr/lib64/python2.7/site-packages/cv.so.debug
-/usr/lib/debug/usr/lib64/python2.7/site-packages/cv2.so.debug
-/usr/lib64
-/usr/lib64/libopencv_calib3d.so
-/usr/lib64/libopencv_calib3d.so.2.3
-/usr/lib64/libopencv_calib3d.so.2.3.0
-/usr/lib64/libopencv_contrib.so
-/usr/lib64/libopencv_contrib.so.2.3
-/usr/lib64/libopencv_contrib.so.2.3.0
-/usr/lib64/libopencv_core.so
-/usr/lib64/libopencv_core.so.2.3
-/usr/lib64/libopencv_core.so.2.3.0
-/usr/lib64/libopencv_features2d.so
-/usr/lib64/libopencv_features2d.so.2.3
-/usr/lib64/libopencv_features2d.so.2.3.0
-/usr/lib64/libopencv_flann.so
-/usr/lib64/libopencv_flann.so.2.3
-/usr/lib64/libopencv_flann.so.2.3.0
-/usr/lib64/libopencv_gpu.so
-/usr/lib64/libopencv_gpu.so.2.3
-/usr/lib64/libopencv_gpu.so.2.3.0
-/usr/lib64/libopencv_highgui.so
-/usr/lib64/libopencv_highgui.so.2.3
-/usr/lib64/libopencv_highgui.so.2.3.0
-/usr/lib64/libopencv_imgproc.so
-/usr/lib64/libopencv_imgproc.so.2.3
-/usr/lib64/libopencv_imgproc.so.2.3.0
-/usr/lib64/libopencv_legacy.so
-/usr/lib64/libopencv_legacy.so.2.3
-/usr/lib64/libopencv_legacy.so.2.3.0
-/usr/lib64/libopencv_ml.so
-/usr/lib64/libopencv_ml.so.2.3
-/usr/lib64/libopencv_ml.so.2.3.0
-/usr/lib64/libopencv_objdetect.so
-/usr/lib64/libopencv_objdetect.so.2.3
-/usr/lib64/libopencv_objdetect.so.2.3.0
-/usr/lib64/libopencv_video.so
-/usr/lib64/libopencv_video.so.2.3
-/usr/lib64/libopencv_video.so.2.3.0
-/usr/lib64/pkgconfig
-/usr/lib64/pkgconfig/opencv.pc
-/usr/lib64/python2.7
-/usr/lib64/python2.7/site-packages
-/usr/lib64/python2.7/site-packages/cv.so
-/usr/lib64/python2.7/site-packages/cv2.so
-/usr/share
-/usr/share/OpenCV
-/usr/share/doc
-/usr/share/doc/opencv-2.3.0
-/usr/share/doc/opencv-2.3.0/CMakeLists.txt
-/usr/share/doc/opencv-2.3.0/acircles_pattern.png
-/usr/share/doc/opencv-2.3.0/check_docs_whitelist.txt
-/usr/share/doc/opencv-2.3.0/haartraining.htm
-/usr/share/doc/opencv-2.3.0/license.txt
-/usr/share/doc/opencv-2.3.0/opencv-logo.png
-/usr/share/doc/opencv-2.3.0/opencv-logo2.png
-/usr/share/doc/opencv-2.3.0/opencv.jpg
-/usr/share/doc/opencv-2.3.0/opencv2refman.pdf
-/usr/share/doc/opencv-2.3.0/opencv_cheatsheet.pdf
-/usr/share/doc/opencv-2.3.0/opencv_tutorials.pdf
-/usr/share/doc/opencv-2.3.0/opencv_user.pdf
-/usr/share/doc/opencv-2.3.0/packaging.txt
-/usr/share/doc/opencv-2.3.0/pattern.png
-/usr/share/doc/opencv-2.3.0/vidsurv
-/usr/share/doc/opencv-2.3.0/vidsurv/Blob_Tracking_Modules.doc
-/usr/share/doc/opencv-2.3.0/vidsurv/Blob_Tracking_Tests.doc
-/usr/share/doc/opencv-2.3.0/vidsurv/TestSeq.doc
-/usr/share/opencv
-/usr/share/opencv/OpenCVConfig.cmake
-/usr/share/opencv/haarcascades
-/usr/share/opencv/haarcascades/haarcascade_eye.xml
-/usr/share/opencv/haarcascades/haarcascade_eye_tree_eyeglasses.xml
-/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml
-/usr/share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
-/usr/share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
-/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml
-/usr/share/opencv/haarcascades/haarcascade_fullbody.xml
-/usr/share/opencv/haarcascades/haarcascade_lefteye_2splits.xml
-/usr/share/opencv/haarcascades/haarcascade_lowerbody.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_eyepair_big.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_eyepair_small.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_lefteye.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_mouth.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_nose.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_righteye.xml
-/usr/share/opencv/haarcascades/haarcascade_mcs_upperbody.xml
-/usr/share/opencv/haarcascades/haarcascade_profileface.xml
-/usr/share/opencv/haarcascades/haarcascade_righteye_2splits.xml
-/usr/share/opencv/haarcascades/haarcascade_upperbody.xml
-/usr/share/opencv/lbpcascades
-/usr/share/opencv/lbpcascades/lbpcascade_frontalface.xml
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
deleted file mode 100644
index cf7a635..0000000
--- a/media-libs/opencv/todo.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-TODO
-----
-
-* send the set-to-option conversion upstream
-
-* try to unbundle flann again cleanly
-
-* test building against new cuda
-
-:|
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-09-28 1:48 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-28 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 914ef4d7983a4a73f270afaeb6cd7a9c5b21c03a
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:42:32 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:42:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=914ef4d7
Flann is more and more integrated, not worth patching it out imho
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 4 ++++
media-libs/opencv/Manifest | 32 ++++++++++++++++----------------
media-libs/opencv/opencv-2.3.0.ebuild | 1 -
media-libs/opencv/todo.txt | 2 --
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 78aba60..87fa48d 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -3,6 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+ todo.txt:
+ Flann is more and more integrated, not worth patching it out imho
+
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+files/opencv-2.3.0-ffmpeg.patch, todo.txt:
Ported the ffmpeg patch
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index aad3f0c..a1efd9f 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -26,25 +26,25 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4113 RMD160 0cef49e16f56bc18c1b367105d5233b250d15f85 SHA1 2544dbf1664a6d509e0fc40251f59c02adb65bb5 SHA256 7eb3713d83e79fea7cd1c1a699005b77974e1f6232e595818683d124037a9d45
-MISC ChangeLog 8177 RMD160 c8ac1a1b433706781e3379a49893464d137c62e1 SHA1 418b1d2a0dcbe13cba7cfca52b32c51fb7f8e593 SHA256 ce54b19e69bc494c84c5d11f0e4bac0e38ab053d1f193906136a946c7d1448db
+EBUILD opencv-2.3.0.ebuild 4097 RMD160 20bbbf8a7d11422ac502ee02cd71982eb154c87c SHA1 a75a8e8971354218e129ede6375f443b8f8c02e6 SHA256 c9574b85c274f51a7eb570f4cd2a75ed8a75318df7c6799d2bdb157ad5f7bd8d
+MISC ChangeLog 8336 RMD160 3e0340c271a5559950e0a831b7625e5e08080769 SHA1 d85a91d178f6264692eb95322f598f3fba7b2078 SHA256 52cb33b7b453cadee29475964ec25ffc0abf3cee5a804252c1a86edeb7f2612c
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 134 RMD160 0a9994311d9446ee0437f5558a530c8480c8fd08 SHA1 1ede24c3f222f617f1895864752bd201608ed699 SHA256 89b382e4b13b9db752bb3afd6783be59f95af4a5bee44158036ae1773801515a
+MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3fefad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c3476186dd73a3041e39e80a509541a57dc689d26b5a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOdjo/AAoJEEb+UGWnxTyHFY8QAL7k4jHHGeYoiBrg0cBWSits
-qh1G21F12CpbxdgMgVoA8M9ntQ455aFjbMMWI4Ire2fSWOHyCbDe/ft+f47ta/a4
-q3OTflSRrZpl+aNaAI5/va9VcTXQmvunNgR1/PxOr1VKQnwCd7YUJrhmo6p2cDHs
-9W6M56uqLhtxG88D8STlL+vtgwycTWPOFoDLVet6tQVlcTq2t+k92WKfwoJV8ZjQ
-d1Px7XlDdRd/LML15xJD5RSwa4RdeaIwWMTPyTcOMkvKbSQuqwYjkY+oNQrrQB9x
-QXjwCElP3qsXFizqv0Yjs+RGtEpsstuGDUq542YfxGpFEeePnlJWzCP6xl7L9D8W
-sNSy19IABCmrkosApM69nML3UcdoK8nPazjS6gEAm7aZrOozi6amt4RO8VR6///v
-75dUKBzfTQ6KqQFGxkQRIUWDtZ7KCSnqob/N78pcYXwDB1jxOCbA1lN+SJl49IIb
-V8d4szjTLEZVeXKCCi5kviox6Keu8/QCHdIo7LySkJcA5Hi7RsfS/yq//7KBycdb
-jda1TdGOugJlyOXzNiEbLgPj66ltw67ntttQ22+H16GF4cgCygyVHjELE4sjzOgG
-qNu5Ylr+WRGH3fVJoqphFdpKwUcdoR2OOM0YHEuK30zZ2q3AomsZKMxk9jKesIra
-j7Eg4AEKM6Fut7v130Li
-=jcT6
+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
+=gsLg
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index fc126af..7fa7b64 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -25,7 +25,6 @@ RESTRICT=test
RDEPEND="
app-arch/bzip2
sys-libs/zlib
- sci-libs/flann
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
index cf7a635..0897da2 100644
--- a/media-libs/opencv/todo.txt
+++ b/media-libs/opencv/todo.txt
@@ -3,8 +3,6 @@ TODO
* send the set-to-option conversion upstream
-* try to unbundle flann again cleanly
-
* test building against new cuda
:|
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/
@ 2011-11-13 12:30 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-11-13 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 25f137484e1faf7844d661f944c8a6ad4a10fc01
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 12:31:37 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 12:31:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=25f13748
Resync with main tree
(Portage version: 2.1.10.34/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 6 ++++
media-libs/opencv/Manifest | 25 ++++++++++++++++++-
...{opencv-2.3.0.ebuild => opencv-2.3.0-r1.ebuild} | 7 ++---
media-libs/opencv/opencv-2.3.0.ebuild | 14 ++++------
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index e8e151d..27ec689 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
+*opencv-2.3.0-r1 (13 Nov 2011)
+
+ 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+ +opencv-2.3.0-r1.ebuild:
+ Resync with main tree
+
28 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.1.0.ebuild,
opencv-2.2.0-r10.ebuild, opencv-2.3.0.ebuild,
+files/opencv-2.3.0-libpng15.patch:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index f6e6dc3..95c6cdc 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6
@@ -24,6 +27,24 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08
-MISC ChangeLog 8616 RMD160 d198ddb4f0db913dfcbf839e3269097b92fcc16c SHA1 89ae23f297ffa74711cb7e331c688a7d61d89b17 SHA256 b929556a3078baa64e97f8a81ffe718f913de081e64ab68bc31b34619fc2e569
+EBUILD opencv-2.3.0-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7
+EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7
+MISC ChangeLog 8778 RMD160 d001158af39668bd17e8f38ac11cd13fdc607b52 SHA1 a5f737ceeb43d4c8b013c14e25f07c327765c6c0 SHA256 2ae13ab4332a16a7bc1f93831cf9e8f49b5a843ce5030f968fa8936959ad380f
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOv7ioAAoJEEb+UGWnxTyHG70P/j08r3PBSYx/HyZ0oGPXxzob
+zmp2SGboXKogbJwX8sFuRZOMxtDxtkZCfL/na9fIZHbDxxeYBz8yUhbuKvktVM0l
+kiltvJuNvKMKyr9uHLfODPjzh//CWp3b4YN7Fuk3BbGdkhi0KhY+YY5H/orj5mSb
+l+SreO5SqrKJMenARrMou+oTNhAAM2Gc03gMzyagxy4waVlAXNGvSCtvF/ddZNst
+iHFYXjCSl/MOZ+Qgyl4xmACSioI8yfiiEWrldUI7MtRjpc7/pwXPegYw7zzcnKD3
+4y3mwkK+MY6NtmUIl/50Ep4i9dsaJGqUtsgFX4vPXg3C4A8uyCqahDN8tB47mZV3
+/ehZw60A+bawZhjM+meT29i9udgLwPA3tj5x9bugaqm5kKIG1exlCG8TAC2Hh88v
+14FYjmm291hm9SbHIZJUdGpV4ZAYhXIUoEHyFPGZOvjRS73sqZvEiI5N3j/EBfSy
+eUlRzDwAWNYtVvdLYaO1o/oobzESWSah/T4JESuntgVT+NPwAO02f2IN1DxvyksS
+Irg/4Y0KCNn+lW8cIXRGK6bCDIlklys0Zx4WyrEKg2A5BpN/Gy1jSJv16VBvrfWL
+SuXQKXgia+/Dcpn49GESjGtKvJGFx99r9cafthF2v/Nr7OXVB+J1osFcNFhaJ+2D
+0iN/Htxc6kasE1bkBxPg
+=kJdK
+-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0-r1.ebuild
similarity index 96%
copy from media-libs/opencv/opencv-2.3.0.ebuild
copy to media-libs/opencv/opencv-2.3.0-r1.ebuild
index 0d41961..8fbeaca 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0-r1.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.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $
EAPI=3
@@ -22,7 +22,6 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open
RDEPEND="
app-arch/bzip2
sys-libs/zlib
- sci-libs/flann
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
@@ -43,6 +42,7 @@ RDEPEND="
python? ( dev-python/numpy )
qt4? (
x11-libs/qt-gui:4
+ x11-libs/qt-test:4
opengl? ( x11-libs/qt-opengl:4 )
)
tiff? ( media-libs/tiff )
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
"${FILESDIR}/${PN}-2.3.0-symlink.patch"
+ "${FILESDIR}/${PN}-2.3.0-libpng15.patch"
)
CMAKE_BUILD_TYPE="Release"
@@ -77,8 +78,6 @@ pkg_setup() {
src_prepare() {
base_src_prepare
- # include missing zlib.h for libpng>1.5. Bug #383571
- epatch "${FILESDIR}"/${P}-libpng15.patch
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 0d41961..fcc1d4e 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.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.10 2011/10/15 23:14:39 maekke Exp $
EAPI=3
@@ -16,13 +16,12 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
+KEYWORDS="amd64 ppc x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
RDEPEND="
app-arch/bzip2
sys-libs/zlib
- sci-libs/flann
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
@@ -37,12 +36,12 @@ RDEPEND="
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 )
qt4? (
x11-libs/qt-gui:4
+ x11-libs/qt-test:4
opengl? ( x11-libs/qt-opengl:4 )
)
tiff? ( media-libs/tiff )
@@ -61,6 +60,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
"${FILESDIR}/${PN}-2.3.0-symlink.patch"
+ "${FILESDIR}/${PN}-2.3.0-libpng15.patch"
)
CMAKE_BUILD_TYPE="Release"
@@ -77,8 +77,6 @@ pkg_setup() {
src_prepare() {
base_src_prepare
- # include missing zlib.h for libpng>1.5. Bug #383571
- epatch "${FILESDIR}"/${P}-libpng15.patch
# remove bundled stuff
rm -rf 3rdparty
@@ -97,7 +95,7 @@ src_configure() {
$(cmake-utils_use_enable sse2 SSE2)
$(cmake-utils_use_enable sse3 SSE3)
$(cmake-utils_use_enable ssse3 SSSE3)
- $(cmake-utils_use_with ipp)
+ -DWITH_IPP=OFF
$(cmake-utils_use_with ieee1394 1394)
$(cmake-utils_use_with eigen)
$(cmake-utils_use_with ffmpeg)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-11-13 12:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-02 21:32 [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2011-11-13 12:30 Andreas Hüttel
2011-09-28 1:48 Andreas Hüttel
2011-09-18 20:35 Andreas Hüttel
2011-09-18 18:06 Andreas Hüttel
2011-09-18 18:01 Andreas Hüttel
2011-05-15 16:44 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox