[gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/

[Andreas Hüttel]

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@g.o> 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@g.o> +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
+
+:|
+