* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-05-14 18:43 Andreas K. Huettel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Huettel @ 2011-05-14 18:43 UTC (permalink / raw
To: gentoo-commits
commit: ab16c7c4e3b01c8d16eb16095a3c874032ad35be
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 14 19:03:52 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 14 19:03:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ab16c7c4
[media-libs/opencv] Cleanup
(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 6 +
media-libs/opencv/Manifest | 35 ++---
.../opencv/files/opencv-2.0.0-libpng14.patch | 13 --
media-libs/opencv/files/opencv-2.1.0-mmap.patch | 14 --
.../opencv/files/opencv-2.1.0-multilib.patch | 110 -------------
media-libs/opencv/opencv-2.1.0.ebuild | 113 -------------
media-libs/opencv/opencv-2.2.0-r10.ebuild | 167 --------------------
media-libs/opencv/opencv-2.2.0.ebuild | 165 -------------------
8 files changed, 20 insertions(+), 603 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7ba8703..48f596f 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 $
+ 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,
+ -opencv-2.2.0.ebuild, -opencv-2.2.0-r10.ebuild:
+ Cleanup
+
*opencv-2.2.0-r11 (14 May 2011)
14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c88961e..a49724d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +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
AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
@@ -15,28 +12,24 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
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.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
-EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43bd2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d01c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7
-EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6376 RMD160 bf40abf62410a0639dccdba915d74ee099071e1a SHA1 678a18b6ab8b905aaec5b1aeca3fae3d0d02b206 SHA256 de9017fa6370a56cbf34bfb0fc3f70ad04ac2d924acea7ed8e663be067229c53
+MISC ChangeLog 6624 RMD160 fa16a02153451bde0ba1b62172bee8b99d5d229f SHA1 975220ba665a5be7bc522367b887e5fdddae73ce SHA256 c171ef14bd84813dfc4c142910943a3a4ffc608c907f47c3fd3b283c5f5354bd
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNztHhAAoJENwGBM22xffeRmgQAJGA/TxHnRwwMgtx44JMfMxM
-zgfw37cRddVw69hgg0CWcatXqezAKVK6Bb+OV6ss8IO9UcbmcDdOiIUfSvjEqfSn
-GEY7wsQK3nVj2SRGbtl5CHvcmFk/SgFyewEe6Jh5FC/60zyjWwh10FWT/tyiHelz
-t+5tc9HYMCZwOlbVnZadwSKqiW6qMLGYNQMmj2srm6bEEIXAi0sZo86gNjBQ+SYP
-ddRIDyhhFu0enaFl/Ohe99PFrTm8LYY7UolOfNpc7tOCRzIMMyH4C5jI3uqcjpxp
-EAvyzV5HLRQFg/ril5Z1WcQIVCzqy+RsAt9xWE06SPnPcEvojvV7392q+RrddlA2
-HHmpSOz1nlct/PTaAnvzMpB99XFjyT42Mi19Ttwr6Yo/g1RoxGqp1TnPJTerBfFR
-Z1WyVwTXxwLogjSBpfT06DT3UkToLZu5i2xxbJI0jFzXHC0GSycNOl45HqTW+KTT
-JSS6w3+DcNMU99li2vaNFHqonRY2XvonUfvQOYfirwiNLO3E8/Q8nVIXRJrMOQuD
-TRGHNdupmNFD7RWsAxyvWA6AQH+BPgw5L/dZgANv7bYuIW5tRBVquq+hKJZOxa5T
-dkBMW2r5EMlrDNisHNWUDwN5xBYDQHiWgcyLuEaZ4QaisCXvMxVCVre0kRBToaBE
-QD7rOYAO61WN9Q5Fz3td
-=8mdF
+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
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
deleted file mode 100644
index 56f7a4e..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
-
---- src/highgui/grfmt_png.cpp
-+++ src/highgui/grfmt_png.cpp
-@@ -223,7 +223,7 @@
- png_set_palette_to_rgb( png_ptr );
-
- if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
-- png_set_gray_1_2_4_to_8( png_ptr );
-+ png_set_expand_gray_1_2_4_to_8( png_ptr );
-
- if( CV_MAT_CN(m_type) > 1 && color )
- png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
deleted file mode 100644
index b7bbc9b..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.ros.org/trac/opencv/ticket/141
-http://bugs.gentoo.org/313649
-
---- src/highgui/cvcap_libv4l.cpp
-+++ src/highgui/cvcap_libv4l.cpp
-@@ -782,7 +782,7 @@
-
- capture->buffers[n_buffers].length = buf.length;
- capture->buffers[n_buffers].start =
-- mmap (NULL /* start anywhere */,
-+ v4l2_mmap (NULL /* start anywhere */,
- buf.length,
- PROT_READ | PROT_WRITE /* required */,
- MAP_SHARED /* recommended */,
diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
deleted file mode 100644
index 752ca6f..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-multilib.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
-+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
-@@ -89,8 +89,8 @@
- INSTALL (
- TARGETS flann # flann_s
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
- )
-
- # INSTALL (
-diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
---- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
-+++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
-@@ -467,8 +467,8 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- if(WIN32)
- get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
-diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
-+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
-@@ -40,6 +40,6 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
- )
-diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
-+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
-@@ -71,8 +71,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
-+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
-@@ -76,8 +76,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${aux_hdrs_ext}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
-+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
-@@ -71,8 +71,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- # install each module headers separately
- install(FILES ${lib_hdrs}
-diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
-+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
-@@ -282,8 +282,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
-+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
-@@ -61,8 +61,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
deleted file mode 100644
index e27ae0b..0000000
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.7 2011/04/14 12:39:11 scarabeus Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils flag-o-matic python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
-
-RDEPEND="sys-libs/zlib
- ipp? ( sci-libs/ipp )
- ieee1394? ( sys-libs/libraw1394
- media-libs/libdc1394:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? ( media-libs/gstreamer )
- gtk? ( x11-libs/gtk+:2 )
- jpeg2k? ( media-libs/jasper )
- jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4 )
- tiff? ( media-libs/tiff )
- xine? ( media-libs/xine-lib )
- octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
- octave? ( dev-lang/swig )
- python? ( deprecated? ( dev-lang/swig ) )
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test" #296681
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "s:share/opencv/doc:share/doc/${PF}:" \
- CMakeLists.txt || die
-
- epatch "${FILESDIR}"/${P}-multilib.patch \
- "${FILESDIR}"/${P}-mmap.patch \
- "${FILESDIR}"/${PN}-2.0.0-libpng14.patch
-}
-
-src_configure() {
- append-cppflags -D__STDC_CONSTANT_MACROS #324259
-
- mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- $(cmake-utils_use_build examples)
- "-DBUILD_LATEX_DOCS=OFF"
- $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
- $(cmake-utils_use_build octave OCTAVE_SUPPORT)
- $(cmake-utils_use_build test TESTS)
- $(cmake-utils_use sse USE_SSE)
- $(cmake-utils_use sse2 USE_SSE2)
- $(cmake-utils_use sse3 USE_SSE3)
- $(cmake-utils_use ssse3 USE_SSSE3)
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use_with ipp)
- "-DUSE_O3=OFF"
- $(cmake-utils_use_with ieee1394 1394)
- $(cmake-utils_use_with ffmpeg)
- $(cmake-utils_use_with gstreamer)
- $(cmake-utils_use_with gtk)
- $(cmake-utils_use_with jpeg2k jasper)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with tiff)
- "-DWITH_UNICAP=OFF"
- $(cmake-utils_use_with v4l)
- $(cmake-utils_use_with xine)
- )
-
- if use octave; then
- mycmakeargs+=(
- $(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
- $(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- use python && python_mod_optimize opencv
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup opencv
-}
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
deleted file mode 100644
index 474bb64..0000000
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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 $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
-HOMEPAGE="http://opencv.willowgarage.com"
-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"
-
-# all tests fail, needs further investigation, bug 296681 - dilfridge
-RESTRICT=test
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/libf2c
- sys-devel/gcc[fortran]
- sys-libs/zlib
- >=sci-libs/clapack-3.2.1-r4
- sci-libs/flann
- virtual/lapack
- cuda? ( dev-util/nvidia-cuda-toolkit )
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- 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
- opengl? ( x11-libs/qt-opengl:4 )
- )
- tiff? ( media-libs/tiff )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[-nodot] )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${P}-convert_sets_to_options.patch"
- "${FILESDIR}/${P}-fortran.patch"
- "${FILESDIR}/${P}-ffmpeg01.patch"
- "${FILESDIR}/${P}-ffmpeg02.patch"
- "${FILESDIR}/${P}-gcc46.patch"
- "${FILESDIR}/${P}-libpng1.5.patch"
- "${FILESDIR}/${P}-numpy.patch"
- "${FILESDIR}/${P}-ptrcvcapture.patch"
- "${FILESDIR}/${P}-use_system_libs.patch"
- "${FILESDIR}/${P}-v4l_2.6.38.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOXYGEN_DOCS)
- $(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_use 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 jpeg2k JASPER)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- )
-
- # things we want to be hardly enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
- cmake-utils_src_test
-}
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
deleted file mode 100644
index 99f7d1d..0000000
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-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
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/libf2c
- sys-devel/gcc[fortran]
- sys-libs/zlib
- >=sci-libs/clapack-3.2.1-r4
- sci-libs/flann
- virtual/lapack
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- openexr? ( media-libs/openexr )
- png? ( media-libs/libpng )
- python? ( dev-python/numpy )
- qt4? (
- x11-libs/qt-gui:4
- opengl? ( x11-libs/qt-opengl:4 )
- )
- tiff? ( media-libs/tiff )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[-nodot] )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${P}-convert_sets_to_options.patch"
- "${FILESDIR}/${P}-fortran.patch"
- "${FILESDIR}/${P}-ffmpeg01.patch"
- "${FILESDIR}/${P}-ffmpeg02.patch"
- "${FILESDIR}/${P}-gcc46.patch"
- "${FILESDIR}/${P}-libpng1.5.patch"
- "${FILESDIR}/${P}-numpy.patch"
- "${FILESDIR}/${P}-ptrcvcapture.patch"
- "${FILESDIR}/${P}-use_system_libs.patch"
- "${FILESDIR}/${P}-v4l_2.6.38.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOXYGEN_DOCS)
- $(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)
- -DUSE_ipp=OFF
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_cuda=OFF
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- $(cmake-utils_use_with gstreamer)
- $(cmake-utils_use_with gtk)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- )
-
- # things we want to be hardly enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
- cmake-utils_src_test
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-05-14 18:43 Andreas K. Huettel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Huettel @ 2011-05-14 18:43 UTC (permalink / raw
To: gentoo-commits
commit: aaf1dcf5e51e1cb082d6857663f4b6bf097d38a9
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 14 19:02:58 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 14 19:02:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=aaf1dcf5
[media-libs/opencv] Fix CUDA support
(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 6 +
media-libs/opencv/Manifest | 30 ++--
media-libs/opencv/files/opencv-2.2.0-findnpp.patch | 86 ++++++++++
media-libs/opencv/opencv-2.2.0-r11.ebuild | 176 ++++++++++++++++++++
4 files changed, 284 insertions(+), 14 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index f6d97fe..7ba8703 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.2.0-r11 (14 May 2011)
+
+ 14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +opencv-2.2.0-r11.ebuild, +files/opencv-2.2.0-findnpp.patch:
+ Fix CUDA support
+
11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.0.0.ebuild,
-files/opencv-2.0.0-multilib.patch:
Drop old
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 852dbaa..c88961e 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,6 +7,7 @@ AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b9628860
AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439
AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
AUX opencv-2.2.0-libpng1.5.patch 1461 RMD160 31db2e4df582c30a6787b3c8d6081c7e6f204e5b SHA1 7025f170a11f286dd2b81e392c3662bc1ab11d9e SHA256 c44a5127cad582a94ea8ad375b5f979f5fb34cde41009319d1265ca4c4d495ca
@@ -18,23 +19,24 @@ DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db2
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
+EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43bd2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d01c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7
EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6203 RMD160 803557f473dceb15e64cd24e73529e2719ea462c SHA1 64416d4d413b3a57f6ca3a74e01a9ee89ed25e5b SHA256 7efa4601be6f6858a5ddaabbcb61ea676cdeca339b9b7f18c589a3acb20f1cd6
+MISC ChangeLog 6376 RMD160 bf40abf62410a0639dccdba915d74ee099071e1a SHA1 678a18b6ab8b905aaec5b1aeca3fae3d0d02b206 SHA256 de9017fa6370a56cbf34bfb0fc3f70ad04ac2d924acea7ed8e663be067229c53
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNyvIcAAoJENwGBM22xffeuJUP/3nWqwo1gyPnIMMdWDOu30sH
-/feAJRp7CWIQ0f/9n0VRYCqKuRQTiNduy7mX9i+LorwhuqDjL0sgQxdmqCJHncgy
-LvHASCb+Hx2OHw2SAErOsEdQEAnJmJ/tLlDjN6YvLJVjjxKE/Wgxzdv/Ia15KlS9
-LmqhsuDq0V9gNsqbwKtAc1XmpBwmZVGv16LQUMVJhB4MK1Hz4h0X0HMKq07rPHjx
-f4CAClEXG6e39lH/Q7sM5JrgCbXdlO7rXiD7O0dcFzi2JDl1VkblaFeyrwkRU9Mh
-//btYX5hc2rwoNB69+sJWkQWhXVigEoWVuJrRRC9uVyiZyEsog0+5z2Gu0P2Tj8C
-9KfA2LcaqrznwMhq2dhlWUNyGDnj2Ly4P7rpiOtbnOkOd1UqmAhiHysptOQ/B3+H
-2yd3IujlYmYqdUL7c1kImvgrK51KhwD+s1hUBuuybvGErwXfGvouQHxdt+7NoARy
-C4mUZWh3FUdDQLvQTh0qFMHo0BmqACeCsZRKejmzDqmqIKS6P5z76d6Cz3f7gD1d
-6/I/fLxCuqal8ues99G5L5ybHm5Y/JfYpEjo1eaqm3zE/9FdlKHzxTNUlQdI3cWM
-NlPjVScpBhEfWLKFbL8j6Cf3M1Q3+NnHyq41vE67SmFr4zSe6n7J3I0lnLWF19Fq
-BNWJ7a+q95vHClDjYCrR
-=GAQs
+iQIcBAEBCgAGBQJNztHhAAoJENwGBM22xffeRmgQAJGA/TxHnRwwMgtx44JMfMxM
+zgfw37cRddVw69hgg0CWcatXqezAKVK6Bb+OV6ss8IO9UcbmcDdOiIUfSvjEqfSn
+GEY7wsQK3nVj2SRGbtl5CHvcmFk/SgFyewEe6Jh5FC/60zyjWwh10FWT/tyiHelz
+t+5tc9HYMCZwOlbVnZadwSKqiW6qMLGYNQMmj2srm6bEEIXAi0sZo86gNjBQ+SYP
+ddRIDyhhFu0enaFl/Ohe99PFrTm8LYY7UolOfNpc7tOCRzIMMyH4C5jI3uqcjpxp
+EAvyzV5HLRQFg/ril5Z1WcQIVCzqy+RsAt9xWE06SPnPcEvojvV7392q+RrddlA2
+HHmpSOz1nlct/PTaAnvzMpB99XFjyT42Mi19Ttwr6Yo/g1RoxGqp1TnPJTerBfFR
+Z1WyVwTXxwLogjSBpfT06DT3UkToLZu5i2xxbJI0jFzXHC0GSycNOl45HqTW+KTT
+JSS6w3+DcNMU99li2vaNFHqonRY2XvonUfvQOYfirwiNLO3E8/Q8nVIXRJrMOQuD
+TRGHNdupmNFD7RWsAxyvWA6AQH+BPgw5L/dZgANv7bYuIW5tRBVquq+hKJZOxa5T
+dkBMW2r5EMlrDNisHNWUDwN5xBYDQHiWgcyLuEaZ4QaisCXvMxVCVre0kRBToaBE
+QD7rOYAO61WN9Q5Fz3td
+=8mdF
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.2.0-findnpp.patch b/media-libs/opencv/files/opencv-2.2.0-findnpp.patch
new file mode 100644
index 0000000..86ef8e2
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-findnpp.patch
@@ -0,0 +1,86 @@
+diff -ruN OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake OpenCV-2.2.0/modules/gpu/FindNPP.cmake
+--- OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/gpu/FindNPP.cmake 2011-05-14 20:52:29.026582967 +0200
+@@ -7,42 +7,12 @@
+ # CUDA_NPP_LIBRARIES -- NPP libraries.
+ # NPP_VERSION -- NPP version in format "major.minor.build".
+ #
+-# If not found automatically, please set CUDA_NPP_LIBRARY_ROOT_DIR
+-# in CMake or set enviroment varivabe $CUDA_NPP_ROOT
+-#
+-# Author: Anatoly Baksheev, Itseez Ltd.
+-#
+-# The MIT License
+-#
+-# License for the specific language governing rights and limitations under
+-# Permission is hereby granted, free of charge, to any person obtaining a
+-# copy of this software and associated documentation files (the "Software"),
+-# to deal in the Software without restriction, including without limitation
+-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+-# and/or sell copies of the Software, and to permit persons to whom the
+-# Software is furnished to do so, subject to the following conditions:
+-#
+-# The above copyright notice and this permission notice shall be included
+-# in all copies or substantial portions of the Software.
+-#
+-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+-# DEALINGS IN THE SOFTWARE.
+-#
+ ###############################################################################
+
+ cmake_policy(PUSH)
+ cmake_minimum_required(VERSION 2.8.0)
+ cmake_policy(POP)
+
+-if(NOT "${CUDA_NPP_LIBRARY_ROOT_DIR}" STREQUAL "${CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL}")
+- unset(CUDA_NPP_INCLUDES CACHE)
+- unset(CUDA_NPP_LIBRARIES CACHE)
+-endif()
+
+ if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ if (UNIX OR APPLE)
+@@ -58,28 +28,18 @@
+ endif()
+ endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+
+-if(NOT CUDA_NPP_LIBRARY_ROOT_DIR OR CUDA_NPP_LIBRARY_ROOT_DIR STREQUAL "")
+- unset(CUDA_NPP_LIBRARY_ROOT_DIR CACHE)
+- find_path(CUDA_NPP_LIBRARY_ROOT_DIR "common/npp/include/npp.h" PATHS ENV CUDA_NPP_ROOT DOC "NPP root directory.")
+- MESSAGE(STATUS "NPP root directory: " ${CUDA_NPP_LIBRARY_ROOT_DIR})
+-endif()
++unset(CUDA_NPP_LIBRARY_ROOT_DIR)
+
+-# Search includes in our own paths.
+-find_path(CUDA_NPP_INCLUDES npp.h PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}/common/npp/include")
+-# Search default search paths, after we search our own set of paths.
+-find_path(CUDA_NPP_INCLUDES device_functions.h)
++# Search includes
++find_path(CUDA_NPP_INCLUDES npp.h PATHS "/opt/cuda/include")
+ mark_as_advanced(CUDA_NPP_INCLUDES)
+
+ # Find NPP library
+ find_library(CUDA_NPP_LIBRARIES
+ NAMES "npp" "npp${NPP_SUFFIX}" "libnpp${NPP_SUFFIX}"
+- PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}"
+- PATH_SUFFIXES "common/lib" "common/npp/lib"
++ PATHS "/opt/cuda/lib"
+ DOC "NPP library"
+ )
+-
+-# Search default search paths, after we search our own set of paths.
+-find_library(CUDA_NPP_LIBRARIES NAMES npp${NPP_SUFFIX} libnpp${NPP_SUFFIX} DOC "NPP library")
+ mark_as_advanced(CUDA_NPP_LIBRARIES)
+
+ if(EXISTS ${CUDA_NPP_INCLUDES}/nppversion.h)
+@@ -120,6 +80,3 @@
+ endif()
+
+ set(CUDA_NPP_FOUND TRUE)
+-set(CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL "${CUDA_NPP_LIBRARY_ROOT_DIR}" CACHE INTERNAL "This is the value of the last time CUDA_NPP_LIBRARY_ROOT_DIR was set successfully." FORCE)
+-
+-
diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/opencv/opencv-2.2.0-r11.ebuild
new file mode 100644
index 0000000..4cc6bc4
--- /dev/null
+++ b/media-libs/opencv/opencv-2.2.0-r11.ebuild
@@ -0,0 +1,176 @@
+# 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 $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+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"
+
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libf2c
+ sys-devel/gcc[fortran]
+ sys-libs/zlib
+ >=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? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ 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
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[-nodot] )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-convert_sets_to_options.patch"
+ "${FILESDIR}/${P}-fortran.patch"
+ "${FILESDIR}/${P}-ffmpeg01.patch"
+ "${FILESDIR}/${P}-ffmpeg02.patch"
+ "${FILESDIR}/${P}-gcc46.patch"
+ "${FILESDIR}/${P}-libpng1.5.patch"
+ "${FILESDIR}/${P}-numpy.patch"
+ "${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"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc DOXYGEN_DOCS)
+ $(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_use 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 jpeg2k JASPER)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ )
+
+ # things we want to be hardly enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+ cmake-utils_src_test
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-05-14 18:43 Andreas K. Huettel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Huettel @ 2011-05-14 18:43 UTC (permalink / raw
To: gentoo-commits
commit: ac5d0a0e955b9031e1483ea9fb4481cbd8042cf5
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 14 18:59:24 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 14 18:59:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ac5d0a0e
[media-libs/opencv] Copied from main tree
---
media-libs/opencv/ChangeLog | 162 +++++++++
media-libs/opencv/Manifest | 40 +++
.../opencv/files/opencv-2.0.0-libpng14.patch | 13 +
media-libs/opencv/files/opencv-2.1.0-mmap.patch | 14 +
.../opencv/files/opencv-2.1.0-multilib.patch | 110 ++++++
.../opencv-2.2.0-convert_sets_to_options.patch | 365 ++++++++++++++++++++
.../opencv/files/opencv-2.2.0-ffmpeg01.patch | 105 ++++++
.../opencv/files/opencv-2.2.0-ffmpeg02.patch | 58 +++
media-libs/opencv/files/opencv-2.2.0-fortran.patch | 13 +
media-libs/opencv/files/opencv-2.2.0-gcc46.patch | 10 +
.../opencv/files/opencv-2.2.0-libpng1.5.patch | 40 +++
media-libs/opencv/files/opencv-2.2.0-numpy.patch | 12 +
.../opencv/files/opencv-2.2.0-ptrcvcapture.patch | 17 +
.../files/opencv-2.2.0-use_system_libs.patch | 94 +++++
.../opencv/files/opencv-2.2.0-v4l_2.6.38.patch | 33 ++
media-libs/opencv/metadata.xml | 23 ++
media-libs/opencv/opencv-2.1.0.ebuild | 113 ++++++
media-libs/opencv/opencv-2.2.0-r10.ebuild | 167 +++++++++
media-libs/opencv/opencv-2.2.0.ebuild | 165 +++++++++
19 files changed, 1554 insertions(+), 0 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
new file mode 100644
index 0000000..f6d97fe
--- /dev/null
+++ b/media-libs/opencv/ChangeLog
@@ -0,0 +1,162 @@
+# ChangeLog for media-libs/opencv
+# 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 $
+
+ 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.0.0.ebuild,
+ -files/opencv-2.0.0-multilib.patch:
+ Drop old
+
+ 09 May 2011; Markos Chandras <hwoarang@gentoo.org> opencv-2.2.0.ebuild:
+ Stable on amd64 wrt bug #354033
+
+ 09 May 2011; Thomas Kahle <tomka@gentoo.org> opencv-2.2.0.ebuild:
+ x86 stable per bug 354033
+
+ 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ opencv-2.2.0.ebuild:
+ Disable cuda to ease stabilization
+
+ 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
+ +files/opencv-2.2.0-fortran.patch:
+ Need fortran enabled in gcc and cmake configure script, bug 365493
+
+*opencv-2.2.0-r10 (30 Apr 2011)
+
+ 30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ opencv-2.2.0.ebuild, +opencv-2.2.0-r10.ebuild:
+ Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp
+ support
+
+*opencv-2.2.0 (30 Apr 2011)
+
+ 30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +opencv-2.2.0.ebuild, +files/opencv-2.2.0-convert_sets_to_options.patch,
+ +files/opencv-2.2.0-ffmpeg01.patch, +files/opencv-2.2.0-ffmpeg02.patch,
+ +files/opencv-2.2.0-gcc46.patch, +files/opencv-2.2.0-libpng1.5.patch,
+ +files/opencv-2.2.0-numpy.patch, +files/opencv-2.2.0-ptrcvcapture.patch,
+ +files/opencv-2.2.0-use_system_libs.patch,
+ +files/opencv-2.2.0-v4l_2.6.38.patch, metadata.xml:
+ Version bump, with a lot of help from Scarabeus
+
+ 29 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
+ Move package to KDE herd because of digikam and kipi-plugins.
+
+ 14 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> opencv-2.0.0.ebuild,
+ opencv-2.1.0.ebuild:
+ Migrate to virutal/ffmpeg. Per bug #362081.
+
+ 25 Nov 2010; Jeroen Roovers <jer@gentoo.org> opencv-2.1.0.ebuild:
+ Marked ~hppa (bug #340269).
+
+ 09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
+ opencv-2.1.0.ebuild:
+ Use virtual/jpeg wrt #327487.
+
+ 27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.1.0.ebuild,
+ +files/opencv-2.1.0-mmap.patch:
+ Fix bug in v4l code wrt #313649, Comment #14 by Uwe Sauter.
+
+*opencv-2.1.0 (27 Jul 2010)
+
+ 27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.1.0.ebuild,
+ +files/opencv-2.1.0-multilib.patch, metadata.xml:
+ Version bump.
+
+ 16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+ opencv-2.0.0-r1.ebuild:
+ Fix building with FFmpeg >= 0.6 wrt #324259 by Alexis Ballier.
+
+ 12 May 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild:
+ Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized.
+
+ 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch:
+ Fix building with libpng14.
+
+ 06 Feb 2010; Ulrich Mueller <ulm@gentoo.org> opencv-2.0.0.ebuild,
+ opencv-2.0.0-r1.ebuild:
+ Fix LICENSE, bug 301123.
+
+ 06 Jan 2010; Joseph Jezak <josejx@gentoo.org> opencv-2.0.0-r1.ebuild:
+ Marked ~ppc64.
+
+ 07 Dec 2009; Markus Meier <maekke@gentoo.org> opencv-2.0.0.ebuild:
+ x86 stable, bug #295475
+
+*opencv-2.0.0-r1 (04 Dec 2009)
+
+ 04 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
+ +opencv-2.0.0-r1.ebuild:
+ amd64 stable wrt #295475. Revision bump to skip sci-libs/ipp depend for
+ -r0.
+
+*opencv-2.0.0 (16 Oct 2009)
+
+ 16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.0.0.ebuild,
+ +files/opencv-2.0.0-multilib.patch, metadata.xml:
+ Version bump wrt #289258. Thanks to Aaron Mavrinac for ebuild.
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch:
+ Fix building with GCC 4.4 wrt #274261.
+
+ 02 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+ opencv-1.0.0-r1.ebuild:
+ Bump needed swig version to fix bug #260172
+
+ 15 Feb 2009; Patrick Lauer <patrick@gentoo.org>
+ +files/opencv-1.0.0-fix-swig.patch, opencv-1.0.0-r1.ebuild:
+ Fixing small error in the building of py bindings. Patch from John
+ Keeping, closes #258652
+
+ 27 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml,
+ opencv-1.0.0-r1.ebuild:
+ Fix homepage, bug #252367 by Thomas Pani. Tweak metadata.xml a bit
+
+ 02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ metadata.xml:
+ Removing jmglov as a maintainer since he was retired.
+
+ 12 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
+ +files/opencv-1.0.0-swiginvalidlinkingoptions.patch,
+ opencv-1.0.0-r1.ebuild:
+ Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported
+ by Blorby in bug #239563, patch stolen from Exherbo
+
+ 25 Oct 2008; Pieter Van den Abeele <pvdabeel@gentoo.org> opencv-1.0.0-r1.ebuild:
+ Keyworded ~ppc. Closes bug #236085
+
+ 14 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
+ Picking up maintainership as current maintainer is inactive.
+
+ 29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch, opencv-1.0.0-r1.ebuild:
+ Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg
+ raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405.
+
+*opencv-1.0.0-r1 (23 Jun 2008)
+
+ 23 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
+ +files/opencv-1.0.0-addoptionalsamples.patch,
+ +files/opencv-1.0.0-automagicdependencies.patch,
+ +files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch,
+ +files/opencv-1.0.0-enableuseflags.patch,
+ +files/opencv-1.0.0-fixpythonmultilib.patch,
+ +files/opencv-1.0.0-havepngexrdefs.patch, -opencv-1.0.0.ebuild,
+ +opencv-1.0.0-r1.ebuild:
+ Import changes from science overlay, fixes tons of automagic bugs as well as
+ multilib bugs. Keyworded ~amd64
+
+ 20 Jun 2008; Samuli Suominen <drac@gentoo.org> opencv-1.0.0.ebuild:
+ QAbaddep; pkgconfig is only a build-time depend.
+
+ 18 Jun 2008; Josh Glover <jmglov@gentoo.org> opencv-1.0.0.ebuild:
+ added missing src_install() so that package installs files
+
+*opencv-1.0.0 (18 Jun 2008)
+
+ 18 Jun 2008; Josh Glover <jmglov@gentoo.org> +metadata.xml,
+ +opencv-1.0.0.ebuild:
+ Added to Portage tree
+
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
new file mode 100644
index 0000000..852dbaa
--- /dev/null
+++ b/media-libs/opencv/Manifest
@@ -0,0 +1,40 @@
+-----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
+AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
+AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
+AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
+AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
+AUX opencv-2.2.0-libpng1.5.patch 1461 RMD160 31db2e4df582c30a6787b3c8d6081c7e6f204e5b SHA1 7025f170a11f286dd2b81e392c3662bc1ab11d9e SHA256 c44a5127cad582a94ea8ad375b5f979f5fb34cde41009319d1265ca4c4d495ca
+AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1 SHA1 cf1cd90150686961a6c2f4d1f2d08d3e4c3cfbdb SHA256 09e62d9d60cc1e7490bc1ed416085fefd933a9a89bc3c6cffe24569166430a25
+AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
+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.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
+DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
+EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
+EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
+EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
+MISC ChangeLog 6203 RMD160 803557f473dceb15e64cd24e73529e2719ea462c SHA1 64416d4d413b3a57f6ca3a74e01a9ee89ed25e5b SHA256 7efa4601be6f6858a5ddaabbcb61ea676cdeca339b9b7f18c589a3acb20f1cd6
+MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNyvIcAAoJENwGBM22xffeuJUP/3nWqwo1gyPnIMMdWDOu30sH
+/feAJRp7CWIQ0f/9n0VRYCqKuRQTiNduy7mX9i+LorwhuqDjL0sgQxdmqCJHncgy
+LvHASCb+Hx2OHw2SAErOsEdQEAnJmJ/tLlDjN6YvLJVjjxKE/Wgxzdv/Ia15KlS9
+LmqhsuDq0V9gNsqbwKtAc1XmpBwmZVGv16LQUMVJhB4MK1Hz4h0X0HMKq07rPHjx
+f4CAClEXG6e39lH/Q7sM5JrgCbXdlO7rXiD7O0dcFzi2JDl1VkblaFeyrwkRU9Mh
+//btYX5hc2rwoNB69+sJWkQWhXVigEoWVuJrRRC9uVyiZyEsog0+5z2Gu0P2Tj8C
+9KfA2LcaqrznwMhq2dhlWUNyGDnj2Ly4P7rpiOtbnOkOd1UqmAhiHysptOQ/B3+H
+2yd3IujlYmYqdUL7c1kImvgrK51KhwD+s1hUBuuybvGErwXfGvouQHxdt+7NoARy
+C4mUZWh3FUdDQLvQTh0qFMHo0BmqACeCsZRKejmzDqmqIKS6P5z76d6Cz3f7gD1d
+6/I/fLxCuqal8ues99G5L5ybHm5Y/JfYpEjo1eaqm3zE/9FdlKHzxTNUlQdI3cWM
+NlPjVScpBhEfWLKFbL8j6Cf3M1Q3+NnHyq41vE67SmFr4zSe6n7J3I0lnLWF19Fq
+BNWJ7a+q95vHClDjYCrR
+=GAQs
+-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
new file mode 100644
index 0000000..56f7a4e
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
@@ -0,0 +1,13 @@
+http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+
+--- src/highgui/grfmt_png.cpp
++++ src/highgui/grfmt_png.cpp
+@@ -223,7 +223,7 @@
+ png_set_palette_to_rgb( png_ptr );
+
+ if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
+- png_set_gray_1_2_4_to_8( png_ptr );
++ png_set_expand_gray_1_2_4_to_8( png_ptr );
+
+ if( CV_MAT_CN(m_type) > 1 && color )
+ png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
new file mode 100644
index 0000000..b7bbc9b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
@@ -0,0 +1,14 @@
+http://code.ros.org/trac/opencv/ticket/141
+http://bugs.gentoo.org/313649
+
+--- src/highgui/cvcap_libv4l.cpp
++++ src/highgui/cvcap_libv4l.cpp
+@@ -782,7 +782,7 @@
+
+ capture->buffers[n_buffers].length = buf.length;
+ capture->buffers[n_buffers].start =
+- mmap (NULL /* start anywhere */,
++ v4l2_mmap (NULL /* start anywhere */,
+ buf.length,
+ PROT_READ | PROT_WRITE /* required */,
+ MAP_SHARED /* recommended */,
diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
new file mode 100644
index 0000000..752ca6f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
@@ -0,0 +1,110 @@
+diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
++++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
+@@ -89,8 +89,8 @@
+ INSTALL (
+ TARGETS flann # flann_s
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+
+ # INSTALL (
+diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
++++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
+@@ -467,8 +467,8 @@
+
+ string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+ if(UNIX)
+- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ if(WIN32)
+ get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
+diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
++++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
+@@ -40,6 +40,6 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+ )
+diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
++++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
+@@ -71,8 +71,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
++++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
+@@ -76,8 +76,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${aux_hdrs_ext}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
+@@ -71,8 +71,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ # install each module headers separately
+ install(FILES ${lib_hdrs}
+diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
+@@ -282,8 +282,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
++++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
+@@ -61,8 +61,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
diff --git a/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch
new file mode 100644
index 0000000..7da06cb
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch
@@ -0,0 +1,365 @@
+diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
+--- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
++++ OpenCV-2.2.0.new/CMakeLists.txt 2011-04-30 11:57:37.000000000 +0200
+@@ -13,7 +13,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY
+ # to find libraries from these locations first
+ if(UNIX)
+- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+ endif()
+ # it _must_ go before PROJECT(OpenCV) in order to work
+ if (NOT CMAKE_INSTALL_PREFIX)
+@@ -94,7 +94,7 @@
+ # Build static or dynamic libs?
+ # ----------------------------------------------------------------------------
+ # Default: dynamic libraries:
+-SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+ IF(BUILD_SHARED_LIBS)
+ SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
+ ELSE(BUILD_SHARED_LIBS)
+@@ -196,13 +196,13 @@
+
+ # Build/install (or not) some apps:
+ # ===================================================
+-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
+-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
+-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
++option(BUILD_EXAMPLES "Build all examples" OFF)
++option(INSTALL_C_EXAMPLES "Install C examples" OFF)
++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
+
+ # Build tests:
+ # ===================================================
+-set(BUILD_TESTS ON CACHE BOOL "Build tests")
++option(BUILD_TESTS "Build tests" ON)
+
+ # Build 3rdparty libraries under unix
+ # ===================================================
+@@ -229,12 +229,12 @@
+ #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
+- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
++ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
++ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*)
+ # We can use only -O2 because the -O3 causes gcc crash
+- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC")
+- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")
++ option(USE_O2 "Enable -O2 for GCC" ON)
++ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
+ endif()
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)
+@@ -255,56 +255,56 @@
+ endif()
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)
+- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")
+- set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")
++ option(USE_O3 "Enable -O3 for GCC" ON)
++ option(ENABLE_POWERPC "Enable PowerPC for GCC" ON)
+ endif ()
+
+ if(X86 OR X86_64)
+ # enable everything, since the available set of instructions is checked at runtime
+- set(USE_O3 ON CACHE BOOL "Enable -O3")
+- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
+- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
+- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
+- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
++ set(USE_O3 "Enable -O3" ON)
++ set(USE_FAST_MATH "Enable -ffast-math" ON)
++ option(ENABLE_SSE "Enable SSE instructions" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
++ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
++ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
++ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
++ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
+ endif()
+ endif()
+
+ # allow fine grained control over which libraries not to link, even if
+ # they are available on the system
+ # ====================================================================
+-set(WITH_PNG ON CACHE BOOL "Include PNG support")
+-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
+-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
++option(WITH_PNG "Include PNG support" ON)
++option(WITH_JPEG "Include JPEG support" ON)
++option(WITH_JASPER "Include JPEG2K support" ON)
++option(WITH_TIFF "Include TIFF support" ON)
++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
+
+ if(UNIX)
+- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
++ option(WITH_FFMPEG "Include FFMPEG support" ON)
+ if(NOT APPLE)
+- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+- set(WITH_GTK ON CACHE BOOL "Include GTK support")
+- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
++ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
++ option(WITH_GTK "Include GTK support" ON)
++ option(WITH_GSTREAMER "Include Gstreamer support" ON)
++ option(WITH_V4L "Include Video 4 Linux support" ON)
++ option(WITH_XINE "Include Xine support (GPL)" OFF)
+ endif()
+- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
++ option(WITH_PVAPI "Include Prosilica GigE support" ON)
++ option(WITH_1394 "Include IEEE1394 support" ON)
+ endif()
+
+ if(APPLE)
+- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
++ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
++ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
+ endif()
+
+-set(WITH_TBB OFF CACHE BOOL "Include TBB support")
+-set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_EIGEN2 "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" OFF)
+
+ if(WIN32)
+- set(WITH_VIDEOINPUT ON CACHE BOOL "Enable VideoInput support")
++ option(WITH_VIDEOINPUT "Enable VideoInput support" ON)
+ endif()
+
+ # ===================================================
+@@ -496,7 +496,7 @@
+ include(OpenCVFindOpenEXR.cmake)
+ endif()
+
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+
+ if(BUILD_NEW_PYTHON_SUPPORT)
+ find_package(PythonInterp)
+@@ -513,8 +513,8 @@
+
+ string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+ if(UNIX)
+- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ if(WIN32)
+ get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
+@@ -543,8 +543,8 @@
+ #YV
+ ############################### QT ################################
+
+-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
+-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
++option(WITH_QT "Build with Qt Backend support" OFF)
++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
+
+ set(HAVE_QT 0)
+ set(HAVE_QT_OPENGL 0)
+@@ -823,15 +823,12 @@
+
+
+ ################## LATEX ##################
+-set(BUILD_LATEX_DOCS OFF CACHE BOOL "Build LaTeX OpenCV Documentation")
++option(BUILD_LATEX_DOCS "Build LaTeX OpenCV Documentation" OFF)
+
+ ################### DOXYGEN ###############
+
+ find_package(Doxygen)
+-
+-if(DOXYGEN_FOUND)
+- set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen")
+-endif()
++option(BUILD_DOXYGEN_DOCS "Generate HTML docs using Doxygen" ON)
+
+ # ----------------------------------------------------------------------------
+ # UPDATE CONFIG FILES & SCRIPTS:
+@@ -863,7 +860,7 @@
+ # Set the maximum level of warnings:
+ # ----------------------------------------------------------------------------
+ # Should be set to true for development
+-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
+
+ set(EXTRA_C_FLAGS "")
+ set(EXTRA_C_FLAGS_RELEASE "")
+@@ -1070,9 +1067,9 @@
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )
+
+ if(WIN32)
+-set(OPENCV_DOC_INSTALL_PATH doc)
++set(OPENCV_DOC_INSTALL_PATH doc CACHE PATH "Directory for documentation to install (without prefix)")
+ else()
+-set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
++set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
+ endif()
+
+ # --------------------------------------------------------------------------------------------
+@@ -1106,7 +1103,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include")
+ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
+
+-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
++set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+
+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1164,14 +1161,14 @@
+ # -------------------------------------------------------------------------------------------
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/lib")
++set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+ set(includedir "\${prefix}/include")
+ set(VERSION ${OPENCV_VERSION})
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
+
+ if(UNIX)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endif()
+
+
+@@ -1191,7 +1188,7 @@
+ # CPack target
+ # ----------------------------------------------------------------------------
+
+-set(BUILD_PACKAGE OFF CACHE BOOL "Build a installer with the SDK")
++option(BUILD_PACKAGE "Build a installer with the SDK" OFF)
+
+ if(BUILD_PACKAGE)
+
+diff -urN OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt 2011-04-30 10:51:26.000000000 +0200
+@@ -43,12 +43,12 @@
+ VERSION ${OPENCV_VERSION}
+ OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
+ DEFINE_SYMBOL "CVAPI_EXPORTS"
+- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+ )
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
+ )
+diff -urN OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt 2011-04-30 10:51:08.000000000 +0200
+@@ -96,9 +96,9 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ )
+
+ # Add the required libraries for linking:
+@@ -124,8 +124,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv2/${name}
+diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt 2011-04-30 10:53:11.000000000 +0200
+@@ -250,9 +250,9 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ LINK_INTERFACE_LIBRARIES ""
+ )
+
+@@ -302,8 +302,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION include/opencv2/highgui
+diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0.new/OpenCVModule.cmake
+--- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0.new/OpenCVModule.cmake 2011-04-30 10:53:45.000000000 +0200
+@@ -51,9 +51,9 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ )
+
+ # Add the required libraries for linking:
+@@ -75,8 +75,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv2/${name}
+diff -urN OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt
+--- OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt 2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt 2011-04-30 10:54:15.000000000 +0200
+@@ -51,7 +51,7 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+ DEFINE_SYMBOL "CVAPI_EXPORTS"
+ )
+@@ -64,6 +64,6 @@
+ if(WIN32)
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ endif()
diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch
new file mode 100644
index 0000000..bfde3a9
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch
@@ -0,0 +1,105 @@
+
+Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
+===================================================================
+--- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2112)
++++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2113)
+@@ -466,7 +466,7 @@
+ AVCodecContext *enc = &ic->streams[i]->codec;
+ #endif
+
+- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+ AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+ if (!codec ||
+ avcodec_open(enc, codec) < 0)
+@@ -550,15 +550,27 @@
+ continue;
+ }
+
+-#if LIBAVFORMAT_BUILD > 4628
+- avcodec_decode_video(video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#else
+- avcodec_decode_video(&video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#endif
++
++ AVPacket avpkt;
++ av_init_packet(&avpkt);
++ avpkt.data = packet.data;
++ avpkt.size = packet.size;
++ //
++ // HACK for CorePNG to decode as normal PNG by default
++ // same method used by ffmpeg
++ avpkt.flags = AV_PKT_FLAG_KEY;
++ avcodec_decode_video2(video_st->codec,
++ picture, &got_picture, &avpkt);
++//Functions Removed from ffmpeg on 4/19/11
++//#if LIBAVFORMAT_BUILD > 4628
++// avcodec_decode_video(video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#else
++// avcodec_decode_video(&video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#endif
+
+ if (got_picture) {
+ // we have a new picture, so memorize it
+@@ -899,7 +911,7 @@
+ #endif
+
+ #if LIBAVFORMAT_BUILD > 4621
+- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ #else
+ c->codec_id = oc->oformat->video_codec;
+ #endif
+@@ -911,7 +923,7 @@
+ //if(codec_tag) c->codec_tag=codec_tag;
+ codec = avcodec_find_encoder(c->codec_id);
+
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = bitrate;
+@@ -998,7 +1010,7 @@
+ AVPacket pkt;
+ av_init_packet(&pkt);
+
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= (uint8_t *)picture;
+ pkt.size= sizeof(AVPicture);
+@@ -1018,7 +1030,7 @@
+ pkt.pts = c->coded_frame->pts;
+ #endif
+ if(c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= outbuf;
+ pkt.size= out_size;
+@@ -1215,7 +1227,7 @@
+ av_register_all ();
+
+ /* auto detect the output format from the name and fourcc code. */
+- fmt = guess_format(NULL, filename, NULL);
++ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt)
+ return false;
+
+@@ -1238,7 +1250,7 @@
+ #endif
+
+ // alloc memory for context
+- oc = av_alloc_format_context();
++ oc = avformat_alloc_context();
+ assert (oc);
+
+ /* set file name */
diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch
new file mode 100644
index 0000000..00ee541
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch
@@ -0,0 +1,58 @@
+
+Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
+===================================================================
+--- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2121)
++++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2122)
+@@ -815,24 +815,25 @@
+ #endif
+ };
+
+-static const char * icvFFMPEGErrStr(int err)
+-{
+- switch(err) {
+- case AVERROR_NUMEXPECTED:
+- return "Incorrect filename syntax";
+- case AVERROR_INVALIDDATA:
+- return "Invalid data in header";
+- case AVERROR_NOFMT:
+- return "Unknown format";
+- case AVERROR_IO:
+- return "I/O error occurred";
+- case AVERROR_NOMEM:
+- return "Memory allocation error";
+- default:
+- break;
+- }
+- return "Unspecified error";
+-}
++//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
++//static const char * icvFFMPEGErrStr(int err)
++//{
++// switch(err) {
++// case AVERROR_NUMEXPECTED:
++// return "Incorrect filename syntax";
++// case AVERROR_INVALIDDATA:
++// return "Invalid data in header";
++// case AVERROR_NOFMT:
++// return "Unknown format";
++// case AVERROR_IO:
++// return "I/O error occurred";
++// case AVERROR_NOMEM:
++// return "Memory allocation error";
++// default:
++// break;
++// }
++// return "Unspecified error";
++//}
+
+ /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
+ extern "C" {
+@@ -1322,7 +1323,7 @@
+ /* open the codec */
+ if ( (err=avcodec_open(c, codec)) < 0) {
+ char errtext[256];
+- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
++ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
+ CV_Error(CV_StsBadArg, errtext);
+ }
+
diff --git a/media-libs/opencv/files/opencv-2.2.0-fortran.patch b/media-libs/opencv/files/opencv-2.2.0-fortran.patch
new file mode 100644
index 0000000..3ebe570
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-fortran.patch
@@ -0,0 +1,13 @@
+diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.orig/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
++++ OpenCV-2.2.0/CMakeLists.txt 2011-05-01 19:49:06.901193498 +0200
+@@ -3,6 +3,9 @@
+ #
+ # From the off-tree build directory, invoke:
+ # $ cmake <PATH_TO_OPENCV_ROOT>
++
++ENABLE_LANGUAGE(Fortran)
++
+ #
+ #
+ # - OCT-2008: Initial version <joseluisblancoc@gmail.com>
diff --git a/media-libs/opencv/files/opencv-2.2.0-gcc46.patch b/media-libs/opencv/files/opencv-2.2.0-gcc46.patch
new file mode 100644
index 0000000..a69499b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-gcc46.patch
@@ -0,0 +1,10 @@
+Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp
+===================================================================
+--- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804)
++++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861)
+@@ -56,4 +56,5 @@
+ #include <algorithm>
+ #include <cmath>
++#include <cstddef>
+ #include <complex>
+ #include <map>
diff --git a/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch b/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch
new file mode 100644
index 0000000..fce010d
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch
@@ -0,0 +1,40 @@
+
+Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
+===================================================================
+--- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337)
++++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
+@@ -108,5 +108,5 @@
+ {
+ png_structp png_ptr = (png_structp)_png_ptr;
+- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
++ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
+ CV_Assert( decoder );
+ const Mat& buf = decoder->m_buf;
+@@ -139,5 +139,5 @@
+ if( info_ptr && end_info )
+ {
+- if( setjmp( png_ptr->jmpbuf ) == 0 )
++ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
+ {
+ if( !m_buf.empty() )
+@@ -201,5 +201,5 @@
+ png_infop end_info = (png_infop)m_end_info;
+
+- if( setjmp(png_ptr->jmpbuf) == 0 )
++ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+ {
+ int y;
+@@ -285,5 +285,5 @@
+ return;
+ png_structp png_ptr = (png_structp)_png_ptr;
+- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
++ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
+ CV_Assert( encoder && encoder->m_buf );
+ size_t cursz = encoder->m_buf->size();
+@@ -327,5 +327,5 @@
+ if( info_ptr )
+ {
+- if( setjmp( png_ptr->jmpbuf ) == 0 )
++ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+ {
+ if( m_buf )
diff --git a/media-libs/opencv/files/opencv-2.2.0-numpy.patch b/media-libs/opencv/files/opencv-2.2.0-numpy.patch
new file mode 100644
index 0000000..0690eab
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-numpy.patch
@@ -0,0 +1,12 @@
+diff -up OpenCV-2.2.0/CMakeLists.txt.numpy OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0/CMakeLists.txt.numpy 2010-12-07 17:54:56.369070005 +0100
++++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 17:58:31.987070004 +0100
+@@ -532,7 +532,7 @@ if(BUILD_NEW_PYTHON_SUPPORT)
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(PYTHON_NUMPY_PROCESS EQUAL 0)
+ set(PYTHON_USE_NUMPY 1)
+- add_definitions(-D PYTHON_USE_NUMPY=1)
++ add_definitions(-DPYTHON_USE_NUMPY=1)
+ include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
+ message(STATUS " Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}")
+ else()
diff --git a/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch b/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch
new file mode 100644
index 0000000..c1316f0
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch
@@ -0,0 +1,17 @@
+Index: modules/highgui/src/cap.cpp
+===================================================================
+--- modules/highgui/src/cap.cpp (revision 4283)
++++ modules/highgui/src/cap.cpp (working copy)
+@@ -52,10 +52,10 @@
+ namespace cv
+ {
+
+-template<> inline void Ptr<CvCapture>::delete_obj()
++template<> void Ptr<CvCapture>::delete_obj()
+ { cvReleaseCapture(&obj); }
+
+-template<> inline void Ptr<CvVideoWriter>::delete_obj()
++template<> void Ptr<CvVideoWriter>::delete_obj()
+ { cvReleaseVideoWriter(&obj); }
+
+ }
diff --git a/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch b/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch
new file mode 100644
index 0000000..5d22a9b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch
@@ -0,0 +1,94 @@
+diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
++++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 23:48:20.000000000 +0200
+@@ -193,6 +193,11 @@
+ # ----------------------------------------------------------------------------
+ # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
+ # ----------------------------------------------------------------------------
++find_package(LAPACK REQUIRED)
++find_package(BLAS REQUIRED)
++find_package(ZLIB REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(FLANN REQUIRED flann)
+
+ # Build/install (or not) some apps:
+ # ===================================================
+diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-30 10:56:32.000000000 +0200
+@@ -1,3 +1,3 @@
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
+-set(deps opencv_lapack zlib)
++include_directories("${ZLIB_INCLUDE_DIRS}")
++set(deps ${ZLIB_LIBRARIES} ${LAPACK_LIBRARIES})
+ define_opencv_module(core ${deps})
+diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
+--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-30 11:50:09.000000000 +0200
+@@ -48,7 +48,7 @@
+ typedef __CLPK_integer integer;
+ typedef __CLPK_real real;
+ #else
+- #include "clapack.h"
++ #include <clapack/clapack.h>
+ #endif
+
+ #undef abs
+diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.2.0/modules/haartraining/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt 2011-04-29 23:48:41.000000000 +0200
+@@ -18,7 +18,7 @@
+ link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
+ endif()
+
+-set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)
++set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${BLAS_LIBRARIES} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES})
+
+ link_libraries(${haartraining_libs})
+
+diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200
+@@ -219,8 +219,8 @@
+ set(the_target "opencv_highgui")
+
+ add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS)
+-
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
++include_directories("${ZLIB_INCLUDE_DIRS}"
++ "${CMAKE_CURRENT_SOURCE_DIR}/include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/src"
+@@ -285,7 +285,7 @@
+ #target_link_libraries(${the_target} libtiff)
+ endif()
+
+-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
++target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
+
+ if(APPLE)
+ target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
+diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp
+--- OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp 2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp 2011-04-29 22:25:25.000000000 +0200
+@@ -42,6 +42,7 @@
+
+ #include "precomp.hpp"
+
++#include <zlib.h>
+ #ifdef HAVE_PNG
+
+ /****************************************************************************************\
+diff -urN OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake
+--- OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake 2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2011-04-30 10:57:21.000000000 +0200
+@@ -44,7 +44,7 @@
+ IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+ SET(OPENEXR_FOUND TRUE)
+ SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
+- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR")
++ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
+ ENDIF ()
+
+ IF(OPENEXR_FOUND)
diff --git a/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch b/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch
new file mode 100644
index 0000000..dd23cd1
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch
@@ -0,0 +1,33 @@
+diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
+--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800
+@@ -214,7 +214,7 @@
+ #include <sys/types.h>
+ #include <sys/mman.h>
+
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+
+ #include <string.h>
+ #include <stdlib.h>
+diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp
+--- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
++++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800
+@@ -224,7 +224,7 @@
+ #include "highgui.h"
+ #include "precomp.hpp"
+
+-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
++#if !defined WIN32 && defined HAVE_CAMV4L2
+
+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
+
+@@ -241,7 +241,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/videodev2.h>
+
+ #include <libv4l1.h>
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
new file mode 100644
index 0000000..22966c0
--- /dev/null
+++ b/media-libs/opencv/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer>
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Huettel</name>
+</maintainer>
+<longdescription>
+OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
+Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
+Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
+</longdescription>
+<use>
+ <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+ <flag name="deprecated">Build deprecated python binding features</flag>
+ <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+ <flag name="ipp">Enable Intel Integrated Primitive support</flag>
+ <flag name="octave">Enable octave support</flag>
+ <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+ <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+</use>
+</pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
new file mode 100644
index 0000000..e27ae0b
--- /dev/null
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -0,0 +1,113 @@
+# 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.7 2011/04/14 12:39:11 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
+
+RDEPEND="sys-libs/zlib
+ ipp? ( sci-libs/ipp )
+ ieee1394? ( sys-libs/libraw1394
+ media-libs/libdc1394:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? ( media-libs/gstreamer )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg2k? ( media-libs/jasper )
+ jpeg? ( virtual/jpeg )
+ png? ( >=media-libs/libpng-1.4 )
+ tiff? ( media-libs/tiff )
+ xine? ( media-libs/xine-lib )
+ octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}
+ octave? ( dev-lang/swig )
+ python? ( deprecated? ( dev-lang/swig ) )
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test" #296681
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i \
+ -e "s:share/opencv/doc:share/doc/${PF}:" \
+ CMakeLists.txt || die
+
+ epatch "${FILESDIR}"/${P}-multilib.patch \
+ "${FILESDIR}"/${P}-mmap.patch \
+ "${FILESDIR}"/${PN}-2.0.0-libpng14.patch
+}
+
+src_configure() {
+ append-cppflags -D__STDC_CONSTANT_MACROS #324259
+
+ mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ $(cmake-utils_use_build examples)
+ "-DBUILD_LATEX_DOCS=OFF"
+ $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+ $(cmake-utils_use_build octave OCTAVE_SUPPORT)
+ $(cmake-utils_use_build test TESTS)
+ $(cmake-utils_use sse USE_SSE)
+ $(cmake-utils_use sse2 USE_SSE2)
+ $(cmake-utils_use sse3 USE_SSE3)
+ $(cmake-utils_use ssse3 USE_SSSE3)
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use_with ipp)
+ "-DUSE_O3=OFF"
+ $(cmake-utils_use_with ieee1394 1394)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg2k jasper)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with tiff)
+ "-DWITH_UNICAP=OFF"
+ $(cmake-utils_use_with v4l)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use octave; then
+ mycmakeargs+=(
+ $(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
+ $(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ use python && python_mod_optimize opencv
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup opencv
+}
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
new file mode 100644
index 0000000..474bb64
--- /dev/null
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -0,0 +1,167 @@
+# 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 $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+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"
+
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libf2c
+ sys-devel/gcc[fortran]
+ sys-libs/zlib
+ >=sci-libs/clapack-3.2.1-r4
+ sci-libs/flann
+ virtual/lapack
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ 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
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[-nodot] )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-convert_sets_to_options.patch"
+ "${FILESDIR}/${P}-fortran.patch"
+ "${FILESDIR}/${P}-ffmpeg01.patch"
+ "${FILESDIR}/${P}-ffmpeg02.patch"
+ "${FILESDIR}/${P}-gcc46.patch"
+ "${FILESDIR}/${P}-libpng1.5.patch"
+ "${FILESDIR}/${P}-numpy.patch"
+ "${FILESDIR}/${P}-ptrcvcapture.patch"
+ "${FILESDIR}/${P}-use_system_libs.patch"
+ "${FILESDIR}/${P}-v4l_2.6.38.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc DOXYGEN_DOCS)
+ $(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_use 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 jpeg2k JASPER)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ )
+
+ # things we want to be hardly enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+ cmake-utils_src_test
+}
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
new file mode 100644
index 0000000..99f7d1d
--- /dev/null
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -0,0 +1,165 @@
+# 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.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+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
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libf2c
+ sys-devel/gcc[fortran]
+ sys-libs/zlib
+ >=sci-libs/clapack-3.2.1-r4
+ sci-libs/flann
+ virtual/lapack
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+ openexr? ( media-libs/openexr )
+ png? ( media-libs/libpng )
+ python? ( dev-python/numpy )
+ qt4? (
+ x11-libs/qt-gui:4
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[-nodot] )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-convert_sets_to_options.patch"
+ "${FILESDIR}/${P}-fortran.patch"
+ "${FILESDIR}/${P}-ffmpeg01.patch"
+ "${FILESDIR}/${P}-ffmpeg02.patch"
+ "${FILESDIR}/${P}-gcc46.patch"
+ "${FILESDIR}/${P}-libpng1.5.patch"
+ "${FILESDIR}/${P}-numpy.patch"
+ "${FILESDIR}/${P}-ptrcvcapture.patch"
+ "${FILESDIR}/${P}-use_system_libs.patch"
+ "${FILESDIR}/${P}-v4l_2.6.38.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc DOXYGEN_DOCS)
+ $(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)
+ -DUSE_ipp=OFF
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_cuda=OFF
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ )
+
+ # things we want to be hardly enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+ cmake-utils_src_test
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-07-13 21:16 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-07-13 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 33fc606ccef362e3712ac3ac41ce1cbd10e2203b
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:16:44 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:16:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=33fc606c
[media-libs/opencv] Resync with main tree
(Portage version: 2.1.10.5/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 7 +
media-libs/opencv/Manifest | 38 ++++---
.../opencv/files/opencv-2.0.0-libpng14.patch | 13 ++
media-libs/opencv/files/opencv-2.1.0-mmap.patch | 14 +++
.../opencv/files/opencv-2.1.0-multilib.patch | 110 ++++++++++++++++++
.../opencv/files/opencv-2.2.0-findblas.patch | 36 ++++++
media-libs/opencv/opencv-2.1.0.ebuild | 117 ++++++++++++++++++++
media-libs/opencv/opencv-2.2.0-r10.ebuild | 10 +-
media-libs/opencv/opencv-2.2.0.ebuild | 9 +-
9 files changed, 330 insertions(+), 24 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 715cabb..00fc18c 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,13 @@
# 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 $
+ 13 Jul 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,
+ opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
+ +files/opencv-2.2.0-findblas.patch:
+ Resync with main tree
+
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
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index bb80aac..a5d2348 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,13 @@
-----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
AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-findblas.patch 1381 RMD160 117b3774ce42e73fc375da79b653c6bf69114be9 SHA1 5e34a74d79b3ec8f53759e3120ff85f054e05e51 SHA256 16f69a37283fb3e8ec3ab5435edd0a800e506c1f25997ecbbd4f7a02fa99aa8c
AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439
AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
@@ -12,25 +16,27 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
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.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-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
+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
+MISC ChangeLog 7075 RMD160 aa860340132e7d913e03157c060250d9b3a3148d SHA1 e45dbb57c961f4a8db65b8e4535a0908ab84056d SHA256 ff428df8faaf80c5839b35bfa144103b21d0f3c511b51377ef841878ac512248
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
+iQIcBAEBCgAGBQJOHgs7AAoJEEb+UGWnxTyHhB4P/jD8dPeMSGX08znHXgrJolYr
+cjlYJ3lc9jzW7baD/qOO/8GEMPAMuPh/AYdShTFEJAi0psi9Bem9m38EZ+TjKjd1
+B44VtB83/sk+hApJzosvCNBrxZuR8g5OTTfbqvV8p2Z9DUIl/+TSBehkAQarVq+J
+8CwEsdO/1iFGn2EpsySFwbYfd/ejI2evDzR92BB2i/DV7/RhRpgojnfbnppM+z0J
+CiN8KCiXyL2wAwWb0MceI5y4Tvetx/uENH7xRifIiSjv8RxjZ+O/3kcoPHW7wKJD
+tRqV5Mk2T6P6tctl4xk/u53ftX7gF3b/P5d4EgEiDsYhjqkaG11jK9vxYKVty1Xw
+hiCSjHmwNreyOIhK3+cZ4aDQVlZv5BdtudmxL218ty+6kBxY8TDqHuMQ+Xp9aL9I
+vXhlc1myp+rJPk5z+3OsNDs3iYcMj/ujrLCkKP38iB+dIlSL69Jjd4a1o2YB82mJ
+S0Z7Z9MjBSfLaiQHKosu7ipNnX5Jk40tgUo+pLAyDmHLv6kvMHeDlA/pNuEV0qAx
++jR89lqon9qiAws8wrFwBG4k4Kp1/Lh80OBXe7Eadtkmk3g+jK+cU64ZnGDtiTGN
++3XgQ0kCDPcVJfuTHzkH6W7DjVYwX79IP/jjcjPgGQT4MxmNkQiMRP3LZDk6J8i3
+0L+n2CnzXqdIZDKGt3CA
+=4StP
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
new file mode 100644
index 0000000..56f7a4e
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
@@ -0,0 +1,13 @@
+http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+
+--- src/highgui/grfmt_png.cpp
++++ src/highgui/grfmt_png.cpp
+@@ -223,7 +223,7 @@
+ png_set_palette_to_rgb( png_ptr );
+
+ if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
+- png_set_gray_1_2_4_to_8( png_ptr );
++ png_set_expand_gray_1_2_4_to_8( png_ptr );
+
+ if( CV_MAT_CN(m_type) > 1 && color )
+ png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
new file mode 100644
index 0000000..b7bbc9b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
@@ -0,0 +1,14 @@
+http://code.ros.org/trac/opencv/ticket/141
+http://bugs.gentoo.org/313649
+
+--- src/highgui/cvcap_libv4l.cpp
++++ src/highgui/cvcap_libv4l.cpp
+@@ -782,7 +782,7 @@
+
+ capture->buffers[n_buffers].length = buf.length;
+ capture->buffers[n_buffers].start =
+- mmap (NULL /* start anywhere */,
++ v4l2_mmap (NULL /* start anywhere */,
+ buf.length,
+ PROT_READ | PROT_WRITE /* required */,
+ MAP_SHARED /* recommended */,
diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
new file mode 100644
index 0000000..752ca6f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
@@ -0,0 +1,110 @@
+diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
++++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
+@@ -89,8 +89,8 @@
+ INSTALL (
+ TARGETS flann # flann_s
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+
+ # INSTALL (
+diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
++++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
+@@ -467,8 +467,8 @@
+
+ string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+ if(UNIX)
+- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ if(WIN32)
+ get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
+diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
++++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
+@@ -40,6 +40,6 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+ )
+diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
++++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
+@@ -71,8 +71,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
++++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
+@@ -76,8 +76,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${aux_hdrs_ext}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
+@@ -71,8 +71,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ # install each module headers separately
+ install(FILES ${lib_hdrs}
+diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
+@@ -282,8 +282,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
++++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
+@@ -61,8 +61,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
diff --git a/media-libs/opencv/files/opencv-2.2.0-findblas.patch b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
new file mode 100644
index 0000000..0c205f5
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
@@ -0,0 +1,36 @@
+diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.orig/CMakeLists.txt 2011-07-13 21:49:54.474595691 +0200
++++ OpenCV-2.2.0/CMakeLists.txt 2011-07-13 21:51:01.917595716 +0200
+@@ -196,10 +196,30 @@
+ # ----------------------------------------------------------------------------
+ # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
+ # ----------------------------------------------------------------------------
++find_package(PkgConfig REQUIRED)
++
++if(BLAS_LIBRARIES)
++ include(CheckFortranFunctionExists)
++ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
++ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
++ unset( CMAKE_REQUIRED_LIBRARIES )
++ if(BLAS_FOUND)
++ message(STATUS "BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
++ else(BLAS_FOUND)
++ message(FATAL_ERROR "BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
++ endif(BLAS_FOUND)
++else(BLAS_LIBRARIES)
++ # User did not provide a BLAS Library
++ pkg_check_modules(BLAS blas)
++endif (BLAS_LIBRARIES)
++
++if(NOT BLAS_FOUND)
++ message(FATAL_ERROR "BLAS libraries not found.")
++endif(NOT BLAS_FOUND)
++
+ find_package(LAPACK REQUIRED)
+-find_package(BLAS REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(PkgConfig REQUIRED)
++
+ pkg_check_modules(FLANN REQUIRED flann)
+
+ # Build/install (or not) some apps:
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
new file mode 100644
index 0000000..bccb369
--- /dev/null
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -0,0 +1,117 @@
+# 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 $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
+
+RDEPEND="
+ sys-libs/zlib
+ virtual/fortran
+ ipp? ( sci-libs/ipp )
+ ieee1394? (
+ sys-libs/libraw1394
+ media-libs/libdc1394:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? ( media-libs/gstreamer )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg2k? ( media-libs/jasper )
+ jpeg? ( virtual/jpeg )
+ png? ( >=media-libs/libpng-1.4 )
+ tiff? ( media-libs/tiff )
+ xine? ( media-libs/xine-lib )
+ octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}
+ octave? ( dev-lang/swig )
+ python? ( deprecated? ( dev-lang/swig ) )
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test" #296681
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i \
+ -e "s:share/opencv/doc:share/doc/${PF}:" \
+ CMakeLists.txt || die
+
+ epatch "${FILESDIR}"/${P}-multilib.patch \
+ "${FILESDIR}"/${P}-mmap.patch \
+ "${FILESDIR}"/${PN}-2.0.0-libpng14.patch
+}
+
+src_configure() {
+ append-cppflags -D__STDC_CONSTANT_MACROS #324259
+
+ mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ $(cmake-utils_use_build examples)
+ "-DBUILD_LATEX_DOCS=OFF"
+ $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+ $(cmake-utils_use_build octave OCTAVE_SUPPORT)
+ $(cmake-utils_use_build test TESTS)
+ $(cmake-utils_use sse USE_SSE)
+ $(cmake-utils_use sse2 USE_SSE2)
+ $(cmake-utils_use sse3 USE_SSE3)
+ $(cmake-utils_use ssse3 USE_SSSE3)
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use_with ipp)
+ "-DUSE_O3=OFF"
+ $(cmake-utils_use_with ieee1394 1394)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg2k jasper)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with tiff)
+ "-DWITH_UNICAP=OFF"
+ $(cmake-utils_use_with v4l)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use octave; then
+ mycmakeargs+=(
+ $(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
+ $(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ use python && python_mod_optimize opencv
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup opencv
+}
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index a0cab96..47ee381 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -1,16 +1,16 @@
# 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.3 2011/05/15 16:42:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
MY_P=OpenCV-${PV}
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="http://opencv.willowgarage.com"
SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
@@ -25,11 +25,11 @@ RESTRICT=test
RDEPEND="
app-arch/bzip2
dev-libs/libf2c
- sys-devel/gcc[fortran]
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
@@ -78,6 +78,7 @@ PATCHES=(
"${FILESDIR}/${P}-use_system_libs.patch"
"${FILESDIR}/${P}-v4l_2.6.38.patch"
"${FILESDIR}/${P}-findnpp.patch"
+ "${FILESDIR}/${P}-findblas.patch"
)
CMAKE_BUILD_TYPE="Release"
@@ -85,6 +86,7 @@ CMAKE_BUILD_TYPE="Release"
S=${WORKDIR}/${MY_P}
pkg_setup() {
+ fortran-2_pkg_setup
if use python; then
python_set_active_version 2
python_pkg_setup
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 99f7d1d..b65ff3b 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -1,16 +1,16 @@
# 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.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.8 2011/06/21 16:12:06 jlec Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
MY_P=OpenCV-${PV}
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="http://opencv.willowgarage.com"
SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
@@ -25,11 +25,11 @@ RESTRICT=test
RDEPEND="
app-arch/bzip2
dev-libs/libf2c
- sys-devel/gcc[fortran]
sys-libs/zlib
>=sci-libs/clapack-3.2.1-r4
sci-libs/flann
virtual/lapack
+ virtual/fortran
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
gstreamer? (
@@ -79,6 +79,7 @@ CMAKE_BUILD_TYPE="Release"
S=${WORKDIR}/${MY_P}
pkg_setup() {
+ fortran-2_pkg_setup
if use python; then
python_set_active_version 2
python_pkg_setup
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-08-28 14:31 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-08-28 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 0be6b1d265bf254dcf0c65494e60a2b5461db98f
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 14:31:30 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 14:31:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0be6b1d2
Started with version bump. Work in progress.
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 7 +
media-libs/opencv/Manifest | 32 ++-
.../opencv-2.3.0-convert_sets_to_options.patch | 292 ++++++++++++++++++++
media-libs/opencv/files/opencv-2.3.0-numpy.patch | 12 +
media-libs/opencv/opencv-2.3.0.ebuild | 175 ++++++++++++
5 files changed, 504 insertions(+), 14 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 00fc18c..ce5b99a 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,13 @@
# 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 (28 Aug 2011)
+
+ 28 Aug 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-numpy.patch:
+ Started with version bump. Work in progress.
+
13 Jul 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 a5d2348..edac47a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,27 +16,31 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
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
+AUX opencv-2.3.0-convert_sets_to_options.patch 12942 RMD160 720070002b319d1c95ba472e4ad6216d76253f7d SHA1 d01f1bebbc488f17715c3994806c971a7d0c345d SHA256 f740279d4579c1dc58a28f018b0d0336c3a606c69dd4b87bbf3d6785940dfd03
+AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
+DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
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
-MISC ChangeLog 7075 RMD160 aa860340132e7d913e03157c060250d9b3a3148d SHA1 e45dbb57c961f4a8db65b8e4535a0908ab84056d SHA256 ff428df8faaf80c5839b35bfa144103b21d0f3c511b51377ef841878ac512248
+EBUILD opencv-2.3.0.ebuild 4578 RMD160 c8442032703c8803f3c787952705c4910fc84e56 SHA1 86d3a55cc6e91d2358edcc473a541d3439476b0b SHA256 f07fa3a5ecee8bc8dde451db81165aea22d0148760b5696245613d1dbf736152
+MISC ChangeLog 7319 RMD160 f737b2b41a3111d270532e9c81154d8ec25f36e5 SHA1 80b60fbd1a7540d6908c84547afdeb94d5a81900 SHA256 ae8622bce0324c5f0dbfa333e5b704fe50dd47fd359c4f125256b1a27878a144
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOHgs7AAoJEEb+UGWnxTyHhB4P/jD8dPeMSGX08znHXgrJolYr
-cjlYJ3lc9jzW7baD/qOO/8GEMPAMuPh/AYdShTFEJAi0psi9Bem9m38EZ+TjKjd1
-B44VtB83/sk+hApJzosvCNBrxZuR8g5OTTfbqvV8p2Z9DUIl/+TSBehkAQarVq+J
-8CwEsdO/1iFGn2EpsySFwbYfd/ejI2evDzR92BB2i/DV7/RhRpgojnfbnppM+z0J
-CiN8KCiXyL2wAwWb0MceI5y4Tvetx/uENH7xRifIiSjv8RxjZ+O/3kcoPHW7wKJD
-tRqV5Mk2T6P6tctl4xk/u53ftX7gF3b/P5d4EgEiDsYhjqkaG11jK9vxYKVty1Xw
-hiCSjHmwNreyOIhK3+cZ4aDQVlZv5BdtudmxL218ty+6kBxY8TDqHuMQ+Xp9aL9I
-vXhlc1myp+rJPk5z+3OsNDs3iYcMj/ujrLCkKP38iB+dIlSL69Jjd4a1o2YB82mJ
-S0Z7Z9MjBSfLaiQHKosu7ipNnX5Jk40tgUo+pLAyDmHLv6kvMHeDlA/pNuEV0qAx
-+jR89lqon9qiAws8wrFwBG4k4Kp1/Lh80OBXe7Eadtkmk3g+jK+cU64ZnGDtiTGN
-+3XgQ0kCDPcVJfuTHzkH6W7DjVYwX79IP/jjcjPgGQT4MxmNkQiMRP3LZDk6J8i3
-0L+n2CnzXqdIZDKGt3CA
-=4StP
+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
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
new file mode 100644
index 0000000..95a1285
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
@@ -0,0 +1,292 @@
+diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/CMakeLists.txt 2011-07-04 06:21:50.000000000 +0200
++++ OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200
+@@ -14,7 +14,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY
+ # to find libraries from these locations first
+ if(UNIX)
+- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+ endif()
+
+
+@@ -77,7 +77,7 @@
+ # Build static or dynamic libs?
+ # Default: dynamic libraries
+ # ----------------------------------------------------------------------------
+-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+
+ # ----------------------------------------------------------------------------
+ # Include debug info into debug libs?
+@@ -285,13 +285,13 @@
+
+ # Build/install (or not) some apps:
+ # ===================================================
+-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
+-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
+-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
++option(BUILD_EXAMPLES "Build all examples" OFF)
++option(INSTALL_C_EXAMPLES "Install C examples" OFF)
++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
+
+ # Build tests:
+ # ===================================================
+-set(BUILD_TESTS ON CACHE BOOL "Build tests")
++option(BUILD_TESTS "Build tests" ON)
+
+ # Build 3rdparty libraries under unix
+ # ===================================================
+@@ -324,8 +324,8 @@
+ #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
+- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
++ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
++ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
+ set(X86_64 1)
+@@ -341,13 +341,13 @@
+
+ if(X86 OR X86_64)
+ # enable everything, since the available set of instructions is checked at runtime
+- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
+- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
+- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
+- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
++ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
++ option(ENABLE_SSE "Enable SSE instructions" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
++ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
++ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
++ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
++ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
+ endif()
+ endif()
+
+@@ -363,34 +363,34 @@
+ # allow fine grained control over which libraries not to link, even if
+ # they are available on the system
+ # ====================================================================
+-set(WITH_PNG ON CACHE BOOL "Include PNG support")
+-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
+-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
++option(WITH_PNG "Include PNG support" ON)
++option(WITH_JPEG "Include JPEG support" ON)
++option(WITH_JASPER "Include JPEG2K support" ON)
++option(WITH_TIFF "Include TIFF support" ON)
++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
+
+ if(UNIX)
+- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
++ option(WITH_FFMPEG "Include FFMPEG support" ON)
+ if(NOT APPLE)
+- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+- set(WITH_GTK ON CACHE BOOL "Include GTK support")
+- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
++ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
++ option(WITH_GTK "Include GTK support" ON)
++ option(WITH_GSTREAMER "Include Gstreamer support" ON)
++ option(WITH_V4L "Include Video 4 Linux support" ON)
++ option(WITH_XINE "Include Xine support (GPL)" OFF)
+ endif()
+- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
++ option(WITH_PVAPI "Include Prosilica GigE support" ON)
++ option(WITH_1394 "Include IEEE1394 support" ON)
+ endif()
+
+ if(APPLE)
+- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
++ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
++ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
+ endif()
+
+-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
+-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
+-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_IPP "Include Intel IPP support" OFF)
++option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
+
+ set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
+
+@@ -592,7 +592,7 @@
+ include(OpenCVFindLATEX.cmake REQUIRED)
+ endif()
+
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+
+ if (WIN32)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+@@ -619,11 +619,11 @@
+
+ string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+ if(UNIX)
+- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+ if(APPLE)
+ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+ else() #debian based assumed, install to the dist-packages.
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ endif()
+ if(WIN32)
+@@ -665,8 +665,8 @@
+ #YV
+ ############################### QT ################################
+
+-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
+-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
++option(WITH_QT "Build with Qt Backend support" OFF)
++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
+
+ set(HAVE_QT 0)
+ set(HAVE_QT_OPENGL 0)
+@@ -876,8 +876,8 @@
+ ################## Extra HighGUI libs on Windows ###################
+
+ if(WIN32)
+- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
+-
++ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
++
+ set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
+
+ if(WITH_VIDEOINPUT)
+@@ -956,7 +956,7 @@
+ # Set the maximum level of warnings:
+ # ----------------------------------------------------------------------------
+ # Should be set to true for development
+-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
+
+ set(EXTRA_C_FLAGS "")
+ set(EXTRA_C_FLAGS_RELEASE "")
+@@ -1197,7 +1197,7 @@
+ if(WIN32)
+ set(OPENCV_DOC_INSTALL_PATH doc)
+ else()
+-set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
++set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
+ endif()
+
+
+@@ -1232,7 +1232,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"")
+ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
+
+-set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"")
++set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib${LIB_SUFFIX}\"")
+
+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1327,14 +1327,14 @@
+ # -------------------------------------------------------------------------------------------
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/lib")
++set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+ set(includedir "\${prefix}/include")
+ set(VERSION ${OPENCV_VERSION})
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
+
+ if(UNIX)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endif()
+
+
+@@ -1354,7 +1354,7 @@
+ # CPack target
+ # ----------------------------------------------------------------------------
+
+-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
++option(BUILD_PACKAGE "Build a installer with the SDK" ON)
+
+ if(BUILD_PACKAGE)
+
+diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0-1-ol1/OpenCVModule.cmake
+--- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake 2011-07-04 06:21:59.000000000 +0200
++++ OpenCV-2.3.0-1-ol1/OpenCVModule.cmake 2011-08-28 14:57:10.000000000 +0200
+@@ -63,7 +63,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
+@@ -97,8 +97,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv2/${name}
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0-1-ol1/modules/gpu/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0-1-ol1/modules/gpu/CMakeLists.txt 2011-08-28 15:02:11.000000000 +0200
+@@ -121,7 +121,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ # Add the required libraries for linking:
+@@ -149,8 +149,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv2/${name}
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0-1-ol1/modules/highgui/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0-1-ol1/modules/highgui/CMakeLists.txt 2011-08-28 15:04:53.000000000 +0200
+@@ -295,7 +295,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ LINK_INTERFACE_LIBRARIES ""
+ )
+
+@@ -362,8 +362,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION include/opencv2/highgui
diff --git a/media-libs/opencv/files/opencv-2.3.0-numpy.patch b/media-libs/opencv/files/opencv-2.3.0-numpy.patch
new file mode 100644
index 0000000..e0706d2
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.0-numpy.patch
@@ -0,0 +1,12 @@
+diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt
+--- OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200
++++ OpenCV-2.3.0-2-numpy/CMakeLists.txt 2011-08-28 15:26:37.000000000 +0200
+@@ -640,7 +640,7 @@
+
+ if(PYTHON_NUMPY_PROCESS EQUAL 0)
+ set(PYTHON_USE_NUMPY 1)
+- add_definitions(-D PYTHON_USE_NUMPY=1)
++ add_definitions(-DPYTHON_USE_NUMPY=1)
+ include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
+ message(STATUS " Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
+ else()
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
new file mode 100644
index 0000000..8e2885a
--- /dev/null
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -0,0 +1,175 @@
+# 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.6 2011/07/13 20:03:06 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils fortran-2 python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+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"
+
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
+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
+ )
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ 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
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[-nodot] )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+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"
+ "${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"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc DOXYGEN_DOCS)
+ $(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_use 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 jpeg2k JASPER)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ )
+
+ # things we want to be hardly enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+ cmake-utils_src_test
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-09-18 17:33 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-09-18 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 48711648b61d65d6fc0db33fec27bfed5f76c57c
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 17:33:31 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 17:33:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=48711648
Completed Sets2Options, fixed sandbox violation
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 5 +
media-libs/opencv/Manifest | 36 ++--
media-libs/opencv/files.txt | 206 ++++++++++++++++++++
.../opencv-2.3.0-convert_sets_to_options.patch | 66 +++++--
media-libs/opencv/files/opencv-2.3.0-symlink.patch | 12 ++
media-libs/opencv/opencv-2.3.0.ebuild | 1 +
media-libs/opencv/todo.txt | 2 +-
7 files changed, 296 insertions(+), 32 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 437a985..939f56f 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 $
+ 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
+
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
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 147e116..b7e3e62 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,32 +16,34 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
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
-AUX opencv-2.3.0-convert_sets_to_options.patch 12942 RMD160 720070002b319d1c95ba472e4ad6216d76253f7d SHA1 d01f1bebbc488f17715c3994806c971a7d0c345d SHA256 f740279d4579c1dc58a28f018b0d0336c3a606c69dd4b87bbf3d6785940dfd03
+AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
+AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
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 4308 RMD160 b6d91e028da5743fa67cbf125c3b2765642cf250 SHA1 b32801db0fb333d35c4610db7ff628d0019f72d3 SHA256 3e1142e02f10c3f82f0ca830700a6efbfc3669373372495529976bb4e278a935
-MISC ChangeLog 7502 RMD160 e470c1164168ad34a663e460d86b161be47d02ef SHA1 0f438769b7590a35eac6e55a0f0c6982b70bd2f2 SHA256 6364a8ff2179a39c3e5e43eb2110ea7e5dbbabb889fd1a707a17879c7c7507a5
+EBUILD opencv-2.3.0.ebuild 4349 RMD160 14b7196a8df6266c6aab2932fd37bd822de6ad0c SHA1 6a2df98559414d03fda7e7f607ab4c4ba0e134a2 SHA256 40d05867eafaa147daa1b2420bcf2dcc896a7db1a199a26386f118ef92b2aa2c
+MISC ChangeLog 7742 RMD160 413f2dd54d63886f0a96407001e926b6b95e2217 SHA1 4ec4467602021cfdbf17a4436e2c12fb1905aebc SHA256 c2a70aeff9e961f268463dc76ab93d648a978e42532a87b844a642fcdd826a2b
+MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 299 RMD160 3e943a0ef2fab438071f410b81903449fd181a22 SHA1 e5182123ec9f539bfda402c8b70a12f44f252891 SHA256 63dcd1a65951a2836beb1be2ff081caafbbaccefaa8e4af7e51a8c1e13a25f33
+MISC todo.txt 283 RMD160 e5ff61515423d43fc3506ba0082f930bb3e8898e SHA1 6d698c902b25c398fec354f08c01f1d58b94728c SHA256 31700f20661a5fb1f301c5bb577cfb64b1996a5354a0e20d2cb75ced273a022c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
+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
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files.txt b/media-libs/opencv/files.txt
new file mode 100644
index 0000000..56dd089
--- /dev/null
+++ b/media-libs/opencv/files.txt
@@ -0,0 +1,206 @@
+/
+/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/files/opencv-2.3.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
index 95a1285..2f768bc 100644
--- a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
@@ -1,6 +1,6 @@
-diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.txt
+diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
--- OpenCV-2.3.0-0-vanilla/CMakeLists.txt 2011-07-04 06:21:50.000000000 +0200
-+++ OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200
++++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
@@ -14,7 +14,7 @@
# Add these standard paths to the search paths for FIND_LIBRARY
# to find libraries from these locations first
@@ -10,7 +10,7 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
endif()
-@@ -77,7 +77,7 @@
+@@ -77,13 +77,13 @@
# Build static or dynamic libs?
# Default: dynamic libraries
# ----------------------------------------------------------------------------
@@ -19,7 +19,14 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
# ----------------------------------------------------------------------------
# Include debug info into debug libs?
-@@ -285,13 +285,13 @@
+ # Default: yes
+ # ----------------------------------------------------------------------------
+-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
++OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
+
+ # ----------------------------------------------------------------------------
+ # Current version number:
+@@ -285,20 +285,20 @@
# Build/install (or not) some apps:
# ===================================================
@@ -37,6 +44,15 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
# Build 3rdparty libraries under unix
# ===================================================
+ if(WIN32)
+- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
+ else()
+- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
+ endif()
+
+ include(OpenCVPCHSupport.cmake REQUIRED)
@@ -324,8 +324,8 @@
#set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
@@ -48,7 +64,7 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
set(X86_64 1)
-@@ -341,13 +341,13 @@
+@@ -341,58 +341,58 @@
if(X86 OR X86_64)
# enable everything, since the available set of instructions is checked at runtime
@@ -69,7 +85,19 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
endif()
endif()
-@@ -363,34 +363,34 @@
+ if(MSVC)
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
++ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
+ if(CMAKE_C_COMPILER MATCHES "icc")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
+- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
++ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
++ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
+ endif()
+ endif()
+
# allow fine grained control over which libraries not to link, even if
# they are available on the system
# ====================================================================
@@ -121,9 +149,19 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
+option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
+option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
- set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
+-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
++option(WITH_OPENNI "Include OpenNI support" OFF)
+
+ # ===================================================
+ # Macros that checks if module have been installed.
+@@ -586,13 +586,13 @@
+ include(OpenCVFindOpenEXR.cmake)
+ endif()
+
+-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
++option(BUILD_DOCS "Build OpenCV Documentation" ON)
-@@ -592,7 +592,7 @@
+ if(BUILD_DOCS)
include(OpenCVFindLATEX.cmake REQUIRED)
endif()
@@ -221,9 +259,9 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0-1-ol1/CMakeLists.tx
if(BUILD_PACKAGE)
-diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0-1-ol1/OpenCVModule.cmake
+diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0/OpenCVModule.cmake
--- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake 2011-07-04 06:21:59.000000000 +0200
-+++ OpenCV-2.3.0-1-ol1/OpenCVModule.cmake 2011-08-28 14:57:10.000000000 +0200
++++ OpenCV-2.3.0/OpenCVModule.cmake 2011-09-18 19:32:20.000000000 +0200
@@ -63,7 +63,7 @@
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
@@ -244,9 +282,9 @@ diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0-1-ol1/OpenCVMod
install(FILES ${lib_hdrs}
DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0-1-ol1/modules/gpu/CMakeLists.txt
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0/modules/gpu/CMakeLists.txt
--- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0-1-ol1/modules/gpu/CMakeLists.txt 2011-08-28 15:02:11.000000000 +0200
++++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
@@ -121,7 +121,7 @@
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
@@ -267,9 +305,9 @@ diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0-1-ol1/m
install(FILES ${lib_hdrs}
DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0-1-ol1/modules/highgui/CMakeLists.txt
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0/modules/highgui/CMakeLists.txt
--- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0-1-ol1/modules/highgui/CMakeLists.txt 2011-08-28 15:04:53.000000000 +0200
++++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
@@ -295,7 +295,7 @@
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
diff --git a/media-libs/opencv/files/opencv-2.3.0-symlink.patch b/media-libs/opencv/files/opencv-2.3.0-symlink.patch
new file mode 100644
index 0000000..d6f5efb
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.0-symlink.patch
@@ -0,0 +1,12 @@
+diff -ruN OpenCV-2.3.0-1-s2o/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
+--- OpenCV-2.3.0-1-s2o/CMakeLists.txt 2011-09-18 18:40:04.000000000 +0200
++++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 18:55:47.000000000 +0200
+@@ -1240,7 +1240,7 @@
+ if(UNIX)
+ # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/cmake/FOO/FOOConfig.cmake, so:
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv/)
+- install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
++ install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"$ENV{D}/${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
+ endif()
+
+ # --------------------------------------------------------------------------------------------
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 84c91e9..bf9486a 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -67,6 +67,7 @@ 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.3.0-symlink.patch"
)
CMAKE_BUILD_TYPE="Release"
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
index 76961db..40de66e 100644
--- a/media-libs/opencv/todo.txt
+++ b/media-libs/opencv/todo.txt
@@ -1,7 +1,7 @@
TODO
----
-* complete the set-to-option conversion and send it upstream
+* send the set-to-option conversion upstream
* try to unbundle flann again cleanly
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-09-18 18:36 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-09-18 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 0d4ec4749e85094aa8bee34d610bd3ade1a21570
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:36:47 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:36:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0d4ec474
Ported the ffmpeg patch
(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 | 33 +++--
media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch | 156 +++++++++++++++++++++
media-libs/opencv/opencv-2.3.0.ebuild | 3 +-
media-libs/opencv/todo.txt | 2 -
5 files changed, 178 insertions(+), 20 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index e33cb2d..78aba60 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,
+ +files/opencv-2.3.0-ffmpeg.patch, todo.txt:
+ Ported the ffmpeg patch
+
+ 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
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index fda3b38..aad3f0c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,6 +17,7 @@ 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
AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
+AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
@@ -25,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 4274 RMD160 3d6d2dc6f4d27b34f941ef8496bd76189ca32699 SHA1 a2323c62d69407803bb26475780af36a112cfc98 SHA256 cf35b82d9ca9a26feb52af8b00b5263f263f9dd43c044387a1e64edd537b01d2
-MISC ChangeLog 8026 RMD160 bbf39771cdc051286ab2f75515c91d79aaf1fab6 SHA1 067dd1377dcaf6fb3b7ab72892caca30a86dd304 SHA256 4860c5a079689d1f82dfcdd4060654f33ed921f10bff7f61a520fb91f34a6164
+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 metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-MISC todo.txt 195 RMD160 327817b29189fa21bbf1634b7d68be0ff8e6bdd5 SHA1 da8737e371da7e06f0a787eab7d15198179d9e70 SHA256 7b600a4ade7403436af1271a0661fcb3298b78ef840f87ec6eb9554a1bcbffd0
+MISC todo.txt 134 RMD160 0a9994311d9446ee0437f5558a530c8480c8fd08 SHA1 1ede24c3f222f617f1895864752bd201608ed699 SHA256 89b382e4b13b9db752bb3afd6783be59f95af4a5bee44158036ae1773801515a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
+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
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch b/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch
new file mode 100644
index 0000000..4f93d4e
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch
@@ -0,0 +1,156 @@
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp
+--- OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-09-18 20:27:05.000000000 +0200
+@@ -489,7 +489,7 @@
+ AVCodecContext *enc = &ic->streams[i]->codec;
+ #endif
+
+- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+ AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+ if (!codec ||
+ avcodec_open(enc, codec) < 0)
+@@ -576,15 +576,27 @@
+ continue;
+ }
+
+-#if LIBAVFORMAT_BUILD > 4628
+- avcodec_decode_video(video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#else
+- avcodec_decode_video(&video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#endif
++
++ AVPacket avpkt;
++ av_init_packet(&avpkt);
++ avpkt.data = packet.data;
++ avpkt.size = packet.size;
++ //
++ // HACK for CorePNG to decode as normal PNG by default
++ // same method used by ffmpeg
++ avpkt.flags = AV_PKT_FLAG_KEY;
++ avcodec_decode_video2(video_st->codec,
++ picture, &got_picture, &avpkt);
++//Functions Removed from ffmpeg on 4/19/11
++//#if LIBAVFORMAT_BUILD > 4628
++// avcodec_decode_video(video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#else
++// avcodec_decode_video(&video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#endif
+
+ if (got_picture) {
+ // we have a new picture, so memorize it
+@@ -822,24 +834,25 @@
+ #endif
+ };
+
+-static const char * icvFFMPEGErrStr(int err)
+-{
+- switch(err) {
+- case AVERROR_NUMEXPECTED:
+- return "Incorrect filename syntax";
+- case AVERROR_INVALIDDATA:
+- return "Invalid data in header";
+- case AVERROR_NOFMT:
+- return "Unknown format";
+- case AVERROR_IO:
+- return "I/O error occurred";
+- case AVERROR_NOMEM:
+- return "Memory allocation error";
+- default:
+- break;
+- }
+- return "Unspecified error";
+-}
++//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
++//static const char * icvFFMPEGErrStr(int err)
++//{
++// switch(err) {
++// case AVERROR_NUMEXPECTED:
++// return "Incorrect filename syntax";
++// case AVERROR_INVALIDDATA:
++// return "Invalid data in header";
++// case AVERROR_NOFMT:
++// return "Unknown format";
++// case AVERROR_IO:
++// return "I/O error occurred";
++// case AVERROR_NOMEM:
++// return "Memory allocation error";
++// default:
++// break;
++// }
++// return "Unspecified error";
++//}
+
+ /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
+ extern "C" {
+@@ -918,7 +931,7 @@
+ #endif
+
+ #if LIBAVFORMAT_BUILD > 4621
+- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ #else
+ c->codec_id = oc->oformat->video_codec;
+ #endif
+@@ -930,7 +943,7 @@
+ //if(codec_tag) c->codec_tag=codec_tag;
+ codec = avcodec_find_encoder(c->codec_id);
+
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = bitrate;
+@@ -1015,7 +1028,7 @@
+ AVPacket pkt;
+ av_init_packet(&pkt);
+
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= (uint8_t *)picture;
+ pkt.size= sizeof(AVPicture);
+@@ -1035,7 +1048,7 @@
+ pkt.pts = c->coded_frame->pts;
+ #endif
+ if(c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= outbuf;
+ pkt.size= out_size;
+@@ -1237,7 +1250,7 @@
+ av_register_all ();
+
+ /* auto detect the output format from the name and fourcc code. */
+- fmt = guess_format(NULL, filename, NULL);
++ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt)
+ return false;
+
+@@ -1260,7 +1273,7 @@
+ #endif
+
+ // alloc memory for context
+- oc = av_alloc_format_context();
++ oc = avformat_alloc_context();
+ assert (oc);
+
+ /* set file name */
+@@ -1336,7 +1349,7 @@
+ /* open the codec */
+ if ( (err=avcodec_open(c, codec)) < 0) {
+ char errtext[256];
+- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
++ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
+ return false;
+ }
+
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index d76c203..fc126af 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -61,8 +61,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
-# "${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-ffmpeg.patch"
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
"${FILESDIR}/${PN}-2.3.0-symlink.patch"
)
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt
index 20e17f5..cf7a635 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 to patch for newer ffmpeg versions
-
* test building against new cuda
:|
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-09-28 1:48 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-09-28 1:48 UTC (permalink / raw
To: gentoo-commits
commit: f39afaac149207393c8cfb4ffa1b74d2e7681c58
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 01:45:41 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 01:45:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=f39afaac
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 2011/05/11 20:10:16 dilfridge Exp $
+ 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:
+ Resync with main tree
+
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
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 02a9c2e896ebc453ee63770e5f216
AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
+AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
-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.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 4097 RMD160 20bbbf8a7d11422ac502ee02cd71982eb154c87c SHA1 a75a8e8971354218e129ede6375f443b8f8c02e6 SHA256 c9574b85c274f51a7eb570f4cd2a75ed8a75318df7c6799d2bdb157ad5f7bd8d
-MISC ChangeLog 8336 RMD160 3e0340c271a5559950e0a831b7625e5e08080769 SHA1 d85a91d178f6264692eb95322f598f3fba7b2078 SHA256 52cb33b7b453cadee29475964ec25ffc0abf3cee5a804252c1a86edeb7f2612c
+EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08
+MISC ChangeLog 8525 RMD160 2b89e3b492f3dbb79bea81e650526b1b67d1c081 SHA1 31a0be8c34470bf5eca428e726ba10cfc10fb840 SHA256 53d3729f105e5eb086fab237046cfa2769cf4f70dd241b3b783565339455fdff
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3fefad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c3476186dd73a3041e39e80a509541a57dc689d26b5a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
+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
+=KUyM
-----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 @@
+ #include <png.h>
+ #endif
++#include <zlib.h>
+ #include "grfmt_png.hpp"
+
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-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 $
EAPI=3
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~x86"
IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
RDEPEND="
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/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.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.9 2011/09/06 20:56:37 dilfridge Exp $
EAPI=3
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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 test tiff v4l xine"
# all tests fail, needs further investigation, bug 296681 - dilfridge
@@ -46,7 +46,7 @@ RDEPEND="
)
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/jasper )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+ ieee1394? ( >=media-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="
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[-nodot] )
+ >=dev-util/cmake-2.8.5-r2
dev-util/pkgconfig
"
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-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.ebuild,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 $
EAPI=3
@@ -16,15 +16,13 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-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
-RESTRICT=test
+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"
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 )
@@ -79,6 +77,8 @@ 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
@@ -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)
)
+ if use cuda; then
+ if [ "$(gcc-version)" > "4.4" ]; then
+ ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ else
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ fi
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ fi
+
if use python && use examples; then
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
else
@@ -158,8 +167,3 @@ src_configure() {
cmake-utils_src_configure
}
-
-src_test() {
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
- cmake-utils_src_test
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-11-13 13:46 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-11-13 13:46 UTC (permalink / raw
To: gentoo-commits
commit: b3de3eb76cef4612d30f7d7f705a884feaa86134
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 12:41:05 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 12:41:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b3de3eb7
Added files from Andreas Sturmlechner with minor modifications
(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 | 31 +-
.../opencv-2.3.1a-convert_sets_to_options.patch | 378 ++++++++++++++++++++
media-libs/opencv/opencv-2.3.1a.ebuild | 165 +++++++++
4 files changed, 566 insertions(+), 14 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 27ec689..735fff6 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.1a (13 Nov 2011)
+
+ 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.1a.ebuild,
+ +files/opencv-2.3.1a-convert_sets_to_options.patch:
+ Added files from Andreas Sturmlechner with minor modifications
+
*opencv-2.3.0-r1 (13 Nov 2011)
13 Nov 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 95c6cdc..0e31bfa 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -21,30 +21,33 @@ AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8d
AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
+AUX opencv-2.3.1a-convert_sets_to_options.patch 18487 RMD160 57125a8423e2314dc84466de1734c6ad9af05331 SHA1 c9470137c22729a6bca5b3429d413b6b65546971 SHA256 09ab4daba61c22e376ede535130f5e208c5031714a17d1178c55ab406266e2a0
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
+DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008cde5 SHA1 9784e6824c5f677fac82ae83a2f366743adb3299 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
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-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
+EBUILD opencv-2.3.1a.ebuild 4085 RMD160 6bdf7b6b3aee7612e753375ffd940e17c9c54990 SHA1 e9c65a5faf71b900462b81158cdf099c434aaf18 SHA256 b0300008b24afef2f94f18993b24a9aec65319b8429118a0b753a7636d895028
+MISC ChangeLog 9008 RMD160 9e62e87ee0bae00eea9343c5e070cbd8cf1098f1 SHA1 998577cad3a1aa0a64e0eebcbe19256f967daac6 SHA256 fc9a9615b23e1a9c4b9074c5d9d42868b450592561abc7758f26355817c41986
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
+iQIcBAEBCgAGBQJOv7rhAAoJEEb+UGWnxTyHRloQALjPExuzsfQAsXEkCxHmSRoA
+q6RbwZhgr9JFdoNPyDjIHZ2vsoOb4qKXCJJ0Qx9Q5SKrzryqUQwiUq4kvNv2tXNA
+VkMtNKfQhVrtXy4p26HdJw4xzQcilc4xdzS1N3ykA0S9lZfsbvyHbbCj+NKuLexV
+8lj88C2+gbWA8XGIMKmy8NYogGkAo97oEXb04DIj0USb0HqRnL7MRk/7g96yARfU
+4DvOWXUvOJQ/MoRONxiaGtM3UEHkcyjIYSY115AMg/HCN/olQwx0d14KElqdeXo1
+tttujiCCB/gL6sKvZHOD4CaCgsmIjvCGKxDFR0eu796dvzZR7CaccGwU6NkEHm7M
+s3vK152C9xzCV+rUwvqSrPVnEIpV5NOgO+IL105mIooMyXm4lDhySA9HyeDDfeGR
+Bg3cEXVbe9lcSjzJ5DXPhU3OqA/kpC+d/Ab0N6RPxy/E6f7t2M0R5RUjN5ijxEOI
+CTDPzXxjmUaELzOCmg3Yxhq5zx9AbVE6/pvrnOPoRqIkV4bzl9Y3mN89BojmB+iT
+/wV9hbf21NKTXRpAuIgNAvCTlhl5tDa2qt61yb4nbNRtBw9Z0OmBrW4r98qzC4Fo
+axG85gEOXKXvOoaA9AOgSBRIR8v7oSmnlY50JHByz4QzcWL255FvL5KG50ezakPa
+gTkEvncjd26ELr69l337
+=iG92
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
new file mode 100644
index 0000000..63ef717
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
@@ -0,0 +1,378 @@
+--- a/CMakeLists.txt 2011-11-07 00:58:06.809057699 +0100
++++ b/CMakeLists.txt 2011-11-07 00:55:38.921906543 +0100
+@@ -18,7 +18,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY
+ # to find libraries from these locations first
+ if(UNIX)
+- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+ endif()
+
+ # it _must_ go before PROJECT(OpenCV) in order to work
+@@ -72,13 +72,13 @@
+ # Build static or dynamic libs?
+ # Default: dynamic libraries
+ # ----------------------------------------------------------------------------
+-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+
+ # ----------------------------------------------------------------------------
+ # Include debug info into debug libs?
+ # Default: yes
+ # ----------------------------------------------------------------------------
+-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
++OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
+
+ # ----------------------------------------------------------------------------
+ # Get actual OpenCV version number from sources
+@@ -117,15 +117,15 @@
+
+ # SUBDIRECTORIES:
+ # Save libs and executables in the same place
+-set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
++set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
+ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
+
+ if(ANDROID OR WIN32)
+ set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(OPENCV_MANGLED_INSTALL_PATHS)
+- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
+ else()
+- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
+ endif()
+
+ if(ANDROID)
+@@ -318,23 +318,23 @@
+
+ # Build/install (or not) some apps:
+ # ===================================================
+-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
+-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
+-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
++option(BUILD_EXAMPLES "Build all examples" OFF)
++option(INSTALL_C_EXAMPLES "Install C examples" OFF)
++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
+ if(ANDROID)
+ set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
+ endif()
+
+ # Build tests:
+ # ===================================================
+-set(BUILD_TESTS ON CACHE BOOL "Build tests")
++option(BUILD_TESTS "Build tests" ON)
+
+ # Build 3rdparty libraries under unix
+ # ===================================================
+ if(WIN32)
+- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
+ else()
+- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
+ endif()
+
+ include(OpenCVPCHSupport.cmake REQUIRED)
+@@ -356,8 +356,8 @@
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
+- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
++ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
++ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
+ set(X86_64 1)
+@@ -376,59 +376,58 @@
+ #ELSE()
+ # SET(_USE_FAST_MATH ON)
+ #ENDIF()
+- set(USE_FAST_MATH ${_USE_FAST_MATH} CACHE BOOL "Enable -ffast-math (not recommended for GCC 4.6.x)")
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
+- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
+- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
+- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
++ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
++ option(ENABLE_SSE "Enable SSE instructions" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
++ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
++ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
++ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
++ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
+ endif()
+ endif()
+
+ if(MSVC)
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
++ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
+ if(CMAKE_C_COMPILER MATCHES "icc")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
+- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
++ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
++ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
+ endif()
+ endif()
+
+ # allow fine grained control over which libraries not to link, even if
+ # they are available on the system
+ # ====================================================================
+-set(WITH_PNG ON CACHE BOOL "Include PNG support")
+-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
+-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
++option(WITH_PNG "Include PNG support" ON)
++option(WITH_JPEG "Include JPEG support" ON)
++option(WITH_JASPER "Include JPEG2K support" ON)
++option(WITH_TIFF "Include TIFF support" ON)
++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
+
+ if(UNIX)
+- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
++ option(WITH_FFMPEG "Include FFMPEG support" ON)
+ if(NOT APPLE)
+- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+- set(WITH_GTK ON CACHE BOOL "Include GTK support")
+- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
++ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
++ option(WITH_GTK "Include GTK support" ON)
++ option(WITH_GSTREAMER "Include Gstreamer support" ON)
++ option(WITH_V4L "Include Video 4 Linux support" ON)
++ option(WITH_XINE "Include Xine support (GPL)" OFF)
+ endif()
+- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
++ option(WITH_PVAPI "Include Prosilica GigE support" ON)
++ option(WITH_1394 "Include IEEE1394 support" ON)
+ endif()
+
+ if(APPLE)
+- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
++ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
++ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
+ endif()
+
+-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
+-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
+-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
+-
+-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
+-set(WITH_XIMEA OFF CACHE BOOL "Include XIMEA cameras support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_IPP "Include Intel IPP support" OFF)
++option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
++
++option(WITH_OPENNI "Include OpenNI support" OFF)
+
+ # ===================================================
+ # Macros that checks if module have been installed.
+@@ -626,13 +625,13 @@
+ include(OpenCVFindOpenEXR.cmake)
+ endif()
+
+-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
++option(BUILD_DOCS "Build OpenCV Documentation" ON)
+
+ if(BUILD_DOCS)
+ include(OpenCVFindLATEX.cmake REQUIRED)
+ endif()
+
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+
+ if (WIN32)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+@@ -665,9 +664,9 @@
+ OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+ else() #debian based assumed, install to the dist-packages.
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+ endif()
+ endif()
+ if(CMAKE_HOST_WIN32)
+@@ -836,8 +835,8 @@
+ #YV
+ ############################### QT ################################
+
+-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
+-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
++option(WITH_QT "Build with Qt Backend support" OFF)
++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
+
+ set(HAVE_QT 0)
+ set(HAVE_QT_OPENGL 0)
+@@ -1054,7 +1053,7 @@
+ ################## Extra HighGUI libs on Windows ###################
+
+ if(WIN32)
+- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
++ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
+ set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
+
+ if(WITH_VIDEOINPUT)
+@@ -1123,7 +1122,7 @@
+ # Set the maximum level of warnings:
+ # ----------------------------------------------------------------------------
+ # Should be set to true for development
+-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
+ if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
+ endif()
+@@ -1347,12 +1346,12 @@
+ set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+ if(ANDROID)
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
+ else()
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+ if(OPENCV_MANGLED_INSTALL_PATHS)
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+ endif()
+ endif()
+
+@@ -1367,16 +1366,16 @@
+ # <prefix>/(share|lib)/<name>*/ (U)
+ # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
+ if(OPENCV_MANGLED_INSTALL_PATHS)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
+ else()
+- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
++ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
+ endif()
+ endif()
+
+ if(ANDROID)
+- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
++ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
+ endif()
+
+ # --------------------------------------------------------------------------------------------
+@@ -1386,7 +1385,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
+ set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+
+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1439,7 +1438,7 @@
+ set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
+ endif(ANDROID)
+
+ # --------------------------------------------------------------------------------------------
+@@ -1494,7 +1493,7 @@
+ #-----------------------------------
+ # Source package:
+ #-----------------------------------
+-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
++option(BUILD_PACKAGE "Build a installer with the SDK" ON)
+
+ if(BUILD_PACKAGE)
+ set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
+--- a/modules/gpu/CMakeLists.txt 2011-09-12 20:42:20.000000000 +0200
++++ b/modules/gpu/CMakeLists.txt 2011-11-06 22:34:09.318041197 +0100
+@@ -113,7 +113,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ # Add the required libraries for linking:
+@@ -141,8 +141,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
+- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}
+--- a/modules/highgui/CMakeLists.txt 2011-09-12 20:41:29.000000000 +0200
++++ b/modules/highgui/CMakeLists.txt 2011-11-06 22:30:32.093756873 +0100
+@@ -294,7 +294,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ LINK_INTERFACE_LIBRARIES ""
+ )
+
+@@ -361,8 +361,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
+- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/highgui
+--- a/data/CMakeLists.txt 2011-11-07 00:26:20.846885505 +0100
++++ b/data/CMakeLists.txt 2011-11-07 00:30:43.967596042 +0100
+@@ -2,6 +2,6 @@
+ file(GLOB LBP_CASCADES lbpcascades/*.xml)
+
+ if(NOT WIN32)
+-install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
++ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
+ endif()
+--- a/OpenCVModule.cmake 2011-09-12 20:45:38.000000000 +0200
++++ b/OpenCVModule.cmake 2011-11-06 22:26:31.197768487 +0100
+@@ -83,7 +83,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ add_opencv_precompiled_headers(${the_target})
+@@ -107,8 +107,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
+- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
new file mode 100644
index 0000000..049b4fd
--- /dev/null
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild
@@ -0,0 +1,165 @@
+# 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-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils fortran-2 python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+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"
+
+RDEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ 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 )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( virtual/latex-base )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.0-numpy.patch"
+ "${FILESDIR}/${PN}-${PV}-convert_sets_to_options.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(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)
+ $(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 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)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use cuda; then
+ if [ "$(gcc-version)" > "4.4" ]; then
+ ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ else
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ fi
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ fi
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
+ # openni: ???
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ "-DWITH_OPENNI=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-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] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-11-13 13:46 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-11-13 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 7fd84ffd69ab80f402760a916765ee2c64a74b7b
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 13:47:31 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 13:47:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7fd84ffd
Split patches logically, cleanup
(Portage version: 2.1.10.34/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-libs/opencv/ChangeLog | 5 +
media-libs/opencv/Manifest | 34 ++--
.../opencv-2.3.1a-convert_sets_to_options.patch | 203 ++------------------
.../opencv/files/opencv-2.3.1a-libsuffix.patch | 33 ++++
media-libs/opencv/files/opencv-2.3.1a-nocaps.patch | 83 ++++++++
media-libs/opencv/opencv-2.3.1a.ebuild | 4 +-
6 files changed, 163 insertions(+), 199 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 735fff6..02d4a19 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 $
+ 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild,
+ files/opencv-2.3.1a-convert_sets_to_options.patch,
+ +files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch:
+ Split patches logically, cleanup
+
*opencv-2.3.1a (13 Nov 2011)
13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.1a.ebuild,
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 0e31bfa..70fa480 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -21,7 +21,9 @@ AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8d
AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
-AUX opencv-2.3.1a-convert_sets_to_options.patch 18487 RMD160 57125a8423e2314dc84466de1734c6ad9af05331 SHA1 c9470137c22729a6bca5b3429d413b6b65546971 SHA256 09ab4daba61c22e376ede535130f5e208c5031714a17d1178c55ab406266e2a0
+AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08
+AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44
+AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
@@ -31,23 +33,23 @@ EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
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
-EBUILD opencv-2.3.1a.ebuild 4085 RMD160 6bdf7b6b3aee7612e753375ffd940e17c9c54990 SHA1 e9c65a5faf71b900462b81158cdf099c434aaf18 SHA256 b0300008b24afef2f94f18993b24a9aec65319b8429118a0b753a7636d895028
-MISC ChangeLog 9008 RMD160 9e62e87ee0bae00eea9343c5e070cbd8cf1098f1 SHA1 998577cad3a1aa0a64e0eebcbe19256f967daac6 SHA256 fc9a9615b23e1a9c4b9074c5d9d42868b450592561abc7758f26355817c41986
+EBUILD opencv-2.3.1a.ebuild 4147 RMD160 7c2286a36878004567cd0026b9b2ac93805da650 SHA1 76f7bdf339f766b755aeb78ecb660654f25dc520 SHA256 000adcefd886d5e02334851cb9aa1a7e100df20d41ff016257ba4729ed0ff1a6
+MISC ChangeLog 9251 RMD160 4c4d4f092c915b5f6485a87de366d020f566f9a7 SHA1 541e7225fcafa0ef3bb3e3ebcd4d1360811744c5 SHA256 177456ce6a5dc8acbc8ecd5b05286e388e80fde1579040c8d1acac1f6c10806e
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOv7rhAAoJEEb+UGWnxTyHRloQALjPExuzsfQAsXEkCxHmSRoA
-q6RbwZhgr9JFdoNPyDjIHZ2vsoOb4qKXCJJ0Qx9Q5SKrzryqUQwiUq4kvNv2tXNA
-VkMtNKfQhVrtXy4p26HdJw4xzQcilc4xdzS1N3ykA0S9lZfsbvyHbbCj+NKuLexV
-8lj88C2+gbWA8XGIMKmy8NYogGkAo97oEXb04DIj0USb0HqRnL7MRk/7g96yARfU
-4DvOWXUvOJQ/MoRONxiaGtM3UEHkcyjIYSY115AMg/HCN/olQwx0d14KElqdeXo1
-tttujiCCB/gL6sKvZHOD4CaCgsmIjvCGKxDFR0eu796dvzZR7CaccGwU6NkEHm7M
-s3vK152C9xzCV+rUwvqSrPVnEIpV5NOgO+IL105mIooMyXm4lDhySA9HyeDDfeGR
-Bg3cEXVbe9lcSjzJ5DXPhU3OqA/kpC+d/Ab0N6RPxy/E6f7t2M0R5RUjN5ijxEOI
-CTDPzXxjmUaELzOCmg3Yxhq5zx9AbVE6/pvrnOPoRqIkV4bzl9Y3mN89BojmB+iT
-/wV9hbf21NKTXRpAuIgNAvCTlhl5tDa2qt61yb4nbNRtBw9Z0OmBrW4r98qzC4Fo
-axG85gEOXKXvOoaA9AOgSBRIR8v7oSmnlY50JHByz4QzcWL255FvL5KG50ezakPa
-gTkEvncjd26ELr69l337
-=iG92
+iQIcBAEBCgAGBQJOv8pzAAoJEEb+UGWnxTyH2boQAJ8vSIVVSqA8ZKXtjDRBi9J/
+bpJF+G3PuUU/d4ilXDBYZ5Nqlbj80/SfAvhTNfxE1XRRwCAFw3nVPElolDgo+ywF
+Odn7zHFS6YBzDSkNAcqZ6XX+02jMjy5AyUPCQEsIdXdWOIcBohYeeCyCKBxx4c+U
+KhgPm75Dj11mLS6+XYqJA8mU2FDT+xfrI5gXeD/DxJbm+/GTDIab/1FYf97hOlbd
+jK8IyV963jnMU96QX+JavuVwXNxGH0GSiBAdS1m2Tk6aektXxceCc+PG4+bM1vlp
+/H6Xhw7P7PC7SCaqiWVCBQFMnSUKz77SVyNJmqvQ7MfegLiOj8xtJcZp0bWrjoHU
+1CVP8REYJpRU9JpLq4yFXwWlj+4F6YiBqVfBND5Ti2LiyhsJI7NwvY2SAD/cVJKi
+Jd489DokqR8jmHaCCIqbEhBuUADKjfz3NGrnK7UB9CL2CnHMVBWz3FWIsNf/qZJb
+PCmr2eHpYuVE7lN/hOMZdzoLaBtJKeFQV/xVg+lc+Y02ygBoIFA0mbA6kUZ4h3Jc
+JUNgSJs6d5ITw2FTpPayVs95kHVSVoCYQr5DPVrH9jZlirzHnjyWdQhgC8pkSph4
+RXADKqpJCS2Ce8Kh5Fvf1TrTqbN5HHczTJuiXRCVxkO3Q4BPf7sTNWckmCM3900h
+f5Nfs9W7s9voDZy8r9Rg
+=lyAB
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
index 63ef717..174a1d6 100644
--- a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
@@ -1,14 +1,6 @@
---- a/CMakeLists.txt 2011-11-07 00:58:06.809057699 +0100
-+++ b/CMakeLists.txt 2011-11-07 00:55:38.921906543 +0100
-@@ -18,7 +18,7 @@
- # Add these standard paths to the search paths for FIND_LIBRARY
- # to find libraries from these locations first
- if(UNIX)
-- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
-+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
- endif()
-
- # it _must_ go before PROJECT(OpenCV) in order to work
+diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeLists.txt
+--- OpenCV-2.3.1-0-vanilla/CMakeLists.txt 2011-09-12 20:45:38.000000000 +0200
++++ OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
@@ -72,13 +72,13 @@
# Build static or dynamic libs?
# Default: dynamic libraries
@@ -25,25 +17,6 @@
# ----------------------------------------------------------------------------
# Get actual OpenCV version number from sources
-@@ -117,15 +117,15 @@
-
- # SUBDIRECTORIES:
- # Save libs and executables in the same place
--set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
-
- if(ANDROID OR WIN32)
- set(OPENCV_DOC_INSTALL_PATH doc)
- elseif(OPENCV_MANGLED_INSTALL_PATHS)
-- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
-+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
- else()
-- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
-+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
- endif()
-
- if(ANDROID)
@@ -318,23 +318,23 @@
# Build/install (or not) some apps:
@@ -55,7 +28,8 @@
+option(INSTALL_C_EXAMPLES "Install C examples" OFF)
+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
if(ANDROID)
- set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
+- set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
++ option(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF)
endif()
# Build tests:
@@ -74,6 +48,15 @@
endif()
include(OpenCVPCHSupport.cmake REQUIRED)
+@@ -344,7 +344,7 @@
+ endif()
+
+ if(PCHSupport_FOUND)
+- SET(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Use precompiled headers")
++ option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
+ else()
+ SET(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Use precompiled headers" FORCE)
+ endif()
@@ -356,8 +356,8 @@
endif()
@@ -85,7 +68,7 @@
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
set(X86_64 1)
-@@ -376,59 +376,58 @@
+@@ -376,59 +376,59 @@
#ELSE()
# SET(_USE_FAST_MATH ON)
#ENDIF()
@@ -174,10 +157,11 @@
+option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
+
+option(WITH_OPENNI "Include OpenNI support" OFF)
++option(WITH_XIMEA "Include XIMEA cameras support" OFF)
# ===================================================
# Macros that checks if module have been installed.
-@@ -626,13 +625,13 @@
+@@ -626,13 +626,13 @@
include(OpenCVFindOpenEXR.cmake)
endif()
@@ -193,19 +177,7 @@
if (WIN32)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-@@ -665,9 +664,9 @@
- OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
- else() #debian based assumed, install to the dist-packages.
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
- endif()
- endif()
- if(CMAKE_HOST_WIN32)
-@@ -836,8 +835,8 @@
+@@ -836,8 +836,8 @@
#YV
############################### QT ################################
@@ -216,7 +188,7 @@
set(HAVE_QT 0)
set(HAVE_QT_OPENGL 0)
-@@ -1054,7 +1053,7 @@
+@@ -1054,7 +1054,7 @@
################## Extra HighGUI libs on Windows ###################
if(WIN32)
@@ -225,7 +197,7 @@
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
if(WITH_VIDEOINPUT)
-@@ -1123,7 +1122,7 @@
+@@ -1123,7 +1123,7 @@
# Set the maximum level of warnings:
# ----------------------------------------------------------------------------
# Should be set to true for development
@@ -234,63 +206,7 @@
if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
endif()
-@@ -1347,12 +1346,12 @@
- set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
- if(ANDROID)
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
- else()
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
- if(OPENCV_MANGLED_INSTALL_PATHS)
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
- endif()
- endif()
-
-@@ -1367,16 +1366,16 @@
- # <prefix>/(share|lib)/<name>*/ (U)
- # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
- if(OPENCV_MANGLED_INSTALL_PATHS)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
- else()
-- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
-+ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
- endif()
- endif()
-
- if(ANDROID)
-- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
-+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
- endif()
-
- # --------------------------------------------------------------------------------------------
-@@ -1386,7 +1385,7 @@
- set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
- set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-
- exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1439,7 +1438,7 @@
- set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
-
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
- endif(ANDROID)
-
- # --------------------------------------------------------------------------------------------
-@@ -1494,7 +1493,7 @@
+@@ -1494,7 +1494,7 @@
#-----------------------------------
# Source package:
#-----------------------------------
@@ -299,80 +215,3 @@
if(BUILD_PACKAGE)
set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
---- a/modules/gpu/CMakeLists.txt 2011-09-12 20:42:20.000000000 +0200
-+++ b/modules/gpu/CMakeLists.txt 2011-11-06 22:34:09.318041197 +0100
-@@ -113,7 +113,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- )
-
- # Add the required libraries for linking:
-@@ -141,8 +141,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
-- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}
---- a/modules/highgui/CMakeLists.txt 2011-09-12 20:41:29.000000000 +0200
-+++ b/modules/highgui/CMakeLists.txt 2011-11-06 22:30:32.093756873 +0100
-@@ -294,7 +294,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- LINK_INTERFACE_LIBRARIES ""
- )
-
-@@ -361,8 +361,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
-- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/highgui
---- a/data/CMakeLists.txt 2011-11-07 00:26:20.846885505 +0100
-+++ b/data/CMakeLists.txt 2011-11-07 00:30:43.967596042 +0100
-@@ -2,6 +2,6 @@
- file(GLOB LBP_CASCADES lbpcascades/*.xml)
-
- if(NOT WIN32)
--install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
--install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
-+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
-+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
- endif()
---- a/OpenCVModule.cmake 2011-09-12 20:45:38.000000000 +0200
-+++ b/OpenCVModule.cmake 2011-11-06 22:26:31.197768487 +0100
-@@ -83,7 +83,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- )
-
- add_opencv_precompiled_headers(${the_target})
-@@ -107,8 +107,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
-- ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
new file mode 100644
index 0000000..6481ee8
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
@@ -0,0 +1,33 @@
+diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt
+--- OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
++++ OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
+@@ -18,7 +18,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY
+ # to find libraries from these locations first
+ if(UNIX)
+- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+ endif()
+
+ # it _must_ go before PROJECT(OpenCV) in order to work
+@@ -117,7 +117,7 @@
+
+ # SUBDIRECTORIES:
+ # Save libs and executables in the same place
+-set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
++set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
+ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
+
+ if(ANDROID OR WIN32)
+@@ -665,9 +665,9 @@
+ OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+ else() #debian based assumed, install to the dist-packages.
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+ endif()
+ endif()
+ if(CMAKE_HOST_WIN32)
diff --git a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
new file mode 100644
index 0000000..23abeb2
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
@@ -0,0 +1,83 @@
+diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt
+--- OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
++++ OpenCV-2.3.1-4-caps/CMakeLists.txt 2011-11-13 14:37:04.000000000 +0100
+@@ -123,9 +123,9 @@
+ if(ANDROID OR WIN32)
+ set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(OPENCV_MANGLED_INSTALL_PATHS)
+- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
+ else()
+- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
+ endif()
+
+ if(ANDROID)
+@@ -1347,12 +1347,12 @@
+ set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+ if(ANDROID)
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
+ else()
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+ if(OPENCV_MANGLED_INSTALL_PATHS)
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+ endif()
+ endif()
+
+@@ -1367,16 +1367,16 @@
+ # <prefix>/(share|lib)/<name>*/ (U)
+ # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
+ if(OPENCV_MANGLED_INSTALL_PATHS)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
+ else()
+- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
++ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
+ endif()
+ endif()
+
+ if(ANDROID)
+- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
++ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
+ endif()
+
+ # --------------------------------------------------------------------------------------------
+@@ -1386,7 +1386,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
+ set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+ set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+
+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1439,7 +1439,7 @@
+ set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
+ endif(ANDROID)
+
+ # --------------------------------------------------------------------------------------------
+diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt
+--- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt 2011-09-12 20:45:36.000000000 +0200
++++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt 2011-11-13 14:35:08.000000000 +0100
+@@ -2,6 +2,6 @@
+ file(GLOB LBP_CASCADES lbpcascades/*.xml)
+
+ if(NOT WIN32)
+-install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
++ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
+ endif()
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index 049b4fd..e895b86 100644
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.3.0-numpy.patch"
- "${FILESDIR}/${PN}-${PV}-convert_sets_to_options.patch"
+ "${FILESDIR}/${P}-convert_sets_to_options.patch"
+ "${FILESDIR}/${P}-libsuffix.patch"
+ "${FILESDIR}/${P}-nocaps.patch"
)
CMAKE_BUILD_TYPE="Release"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2011-12-01 0:45 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2011-12-01 0:45 UTC (permalink / raw
To: gentoo-commits
commit: 0f5654f82e98598dd30b469567af75e003e07ff8
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Nov 29 22:44:05 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 22:44:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0f5654f8
Resync with main tree
(Portage version: 2.1.10.37/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/ChangeLog | 4 ++
media-libs/opencv/Manifest | 31 ++++++++++---------
.../opencv/files/opencv-2.3.1a-libav-0.7.patch | 10 ++++++
media-libs/opencv/opencv-2.3.1a.ebuild | 3 +-
4 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 02d4a19..8eed7ea 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 $
+ 29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild,
+ +files/opencv-2.3.1a-libav-0.7.patch:
+ Resync with main tree
+
13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild,
files/opencv-2.3.1a-convert_sets_to_options.patch,
+files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 70fa480..62d0198 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -22,6 +22,7 @@ AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb2
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08
+AUX opencv-2.3.1a-libav-0.7.patch 415 RMD160 cc9ae832bb72e0ecb09ad25356cb6bcc9ee5e084 SHA1 b1021d451c0949edd0da8dd05c88e2a433c33bbb SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099
AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44
AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
@@ -33,23 +34,23 @@ EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
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
-EBUILD opencv-2.3.1a.ebuild 4147 RMD160 7c2286a36878004567cd0026b9b2ac93805da650 SHA1 76f7bdf339f766b755aeb78ecb660654f25dc520 SHA256 000adcefd886d5e02334851cb9aa1a7e100df20d41ff016257ba4729ed0ff1a6
-MISC ChangeLog 9251 RMD160 4c4d4f092c915b5f6485a87de366d020f566f9a7 SHA1 541e7225fcafa0ef3bb3e3ebcd4d1360811744c5 SHA256 177456ce6a5dc8acbc8ecd5b05286e388e80fde1579040c8d1acac1f6c10806e
+EBUILD opencv-2.3.1a.ebuild 4179 RMD160 0ba8dbaa4ac15f06ac41fdd76cf8ae41ace4bb03 SHA1 dd2e9163aee5e402154eaae66a410c175e8c4dca SHA256 44497a217fe2cee268c51e1341ee0e1daff5b5a8fe7aa7cbc3c2be1c163896f8
+MISC ChangeLog 9395 RMD160 25a6765d81f73c7d25c6bf53852881dfe833aa43 SHA1 047c741ec1ab0b9680d6ed791f0882bcb555ebcb SHA256 97a6879854c5223107dbd4b4a1a2a1e93c55f0fb186a500505cc1fd0a8da538c
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOv8pzAAoJEEb+UGWnxTyH2boQAJ8vSIVVSqA8ZKXtjDRBi9J/
-bpJF+G3PuUU/d4ilXDBYZ5Nqlbj80/SfAvhTNfxE1XRRwCAFw3nVPElolDgo+ywF
-Odn7zHFS6YBzDSkNAcqZ6XX+02jMjy5AyUPCQEsIdXdWOIcBohYeeCyCKBxx4c+U
-KhgPm75Dj11mLS6+XYqJA8mU2FDT+xfrI5gXeD/DxJbm+/GTDIab/1FYf97hOlbd
-jK8IyV963jnMU96QX+JavuVwXNxGH0GSiBAdS1m2Tk6aektXxceCc+PG4+bM1vlp
-/H6Xhw7P7PC7SCaqiWVCBQFMnSUKz77SVyNJmqvQ7MfegLiOj8xtJcZp0bWrjoHU
-1CVP8REYJpRU9JpLq4yFXwWlj+4F6YiBqVfBND5Ti2LiyhsJI7NwvY2SAD/cVJKi
-Jd489DokqR8jmHaCCIqbEhBuUADKjfz3NGrnK7UB9CL2CnHMVBWz3FWIsNf/qZJb
-PCmr2eHpYuVE7lN/hOMZdzoLaBtJKeFQV/xVg+lc+Y02ygBoIFA0mbA6kUZ4h3Jc
-JUNgSJs6d5ITw2FTpPayVs95kHVSVoCYQr5DPVrH9jZlirzHnjyWdQhgC8pkSph4
-RXADKqpJCS2Ce8Kh5Fvf1TrTqbN5HHczTJuiXRCVxkO3Q4BPf7sTNWckmCM3900h
-f5Nfs9W7s9voDZy8r9Rg
-=lyAB
+iQIcBAEBCgAGBQJO1WA1AAoJENwGBM22xffeR6wP/R74YpBAZCsFc/JqGVKI9i1G
+6rbvaUhy/gQ+PXtVOUTB3AS9A1wMiIKEmZDzIgF2wrYONfFajvyUPmL4XBQUZ3br
+og1cd6g3ycTy38XDKkc4lEDsJQmdA3hGey9zBmo6mX/czJWTRK+9Tra0MyPoyvts
+pSTzEMk7oewbBmmpZ3X+S2DUryYMfglX012tu0N8dBaR/IJKrSmUjK7g4ptO8IFN
+vjMyW6ob7g8AaNxT/Yq7QnTNmJxaNfUA6KQ1EkWSCCGGSULOa7NPBEa63v9z6sFs
+vDtQnUMRJXlqv6ziUhZIF3LPwJd14HRv90O69PhRTL0m3GrDxX8bxxL0Ehn9qOrE
+gMDHUce7rNdrMV3ptRMgS5rvc3JzBjoeQT8QL0cSmxb2YMzY6lZ0KhH+suhVzgFu
+Bu4Fd5usIsMuRi7ADkfdZSlBeH4gyVbc8aMERir719Sr9Rlt2o1aaAR+1kGRhg1x
+jfpqIvrbj5J6GsrfWL+TzhBU2jx92t+iQjResWTQNiZ2iZI4Ex+4eCx+1jbinHWe
+66A417TEXpsShCUkAjZKGNfFEwUL2k4kyjQWAbIWK3n5E6mSia3lOuhcynyQElTR
+xQ5cnSDu3f9UHaYs/6Tys5RKC2e0if/vYcoeTmiJT6mkn1EzRqNPFbLQ515p8j1Q
+UF8zTCUCYs/IjV/txM92
+=EOEX
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
new file mode 100644
index 0000000..5909070
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
@@ -0,0 +1,10 @@
+--- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:37.000000000 +0100
++++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:18.000000000 +0100
+@@ -104,6 +104,7 @@
+ #endif
+ #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+ #include <libavcodec/avcodec.h>
++ #include <libavutil/mathematics.h>
+ #endif
+ #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+ #include <libswscale/swscale.h>
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index e895b86..b30e15a 100644
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.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-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $
EAPI=3
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${P}-convert_sets_to_options.patch"
"${FILESDIR}/${P}-libsuffix.patch"
"${FILESDIR}/${P}-nocaps.patch"
+ "${FILESDIR}/${P}-libav-0.7.patch"
)
CMAKE_BUILD_TYPE="Release"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/
@ 2012-12-12 21:46 Andreas Hüttel
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Hüttel @ 2012-12-12 21:46 UTC (permalink / raw
To: gentoo-commits
commit: ad734ceca85efcf786e0238e1414aee637e6cffc
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Dec 12 21:46:30 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 21:46:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ad734cec
[media-libs/opencv] not needed anymore
---
media-libs/opencv/ChangeLog | 247 -------------
media-libs/opencv/Manifest | 56 ---
.../opencv/files/opencv-2.0.0-libpng14.patch | 13 -
media-libs/opencv/files/opencv-2.1.0-mmap.patch | 14 -
.../opencv/files/opencv-2.1.0-multilib.patch | 110 ------
.../opencv-2.2.0-convert_sets_to_options.patch | 365 --------------------
.../opencv/files/opencv-2.2.0-ffmpeg01.patch | 105 ------
.../opencv/files/opencv-2.2.0-ffmpeg02.patch | 58 ---
.../opencv/files/opencv-2.2.0-findblas.patch | 36 --
media-libs/opencv/files/opencv-2.2.0-findnpp.patch | 86 -----
media-libs/opencv/files/opencv-2.2.0-fortran.patch | 13 -
media-libs/opencv/files/opencv-2.2.0-gcc46.patch | 10 -
.../opencv/files/opencv-2.2.0-libpng1.5.patch | 40 ---
media-libs/opencv/files/opencv-2.2.0-numpy.patch | 12 -
.../opencv/files/opencv-2.2.0-ptrcvcapture.patch | 17 -
.../files/opencv-2.2.0-use_system_libs.patch | 94 -----
.../opencv/files/opencv-2.2.0-v4l_2.6.38.patch | 33 --
.../opencv-2.3.0-convert_sets_to_options.patch | 330 ------------------
media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch | 156 ---------
.../opencv/files/opencv-2.3.0-libpng15.patch | 8 -
media-libs/opencv/files/opencv-2.3.0-numpy.patch | 12 -
media-libs/opencv/files/opencv-2.3.0-symlink.patch | 12 -
.../opencv-2.3.1a-convert_sets_to_options.patch | 217 ------------
.../opencv/files/opencv-2.3.1a-libav-0.7.patch | 10 -
.../opencv/files/opencv-2.3.1a-libsuffix.patch | 33 --
media-libs/opencv/files/opencv-2.3.1a-nocaps.patch | 83 -----
media-libs/opencv/metadata.xml | 23 --
media-libs/opencv/opencv-2.1.0.ebuild | 117 -------
media-libs/opencv/opencv-2.2.0-r10.ebuild | 179 ----------
media-libs/opencv/opencv-2.2.0.ebuild | 166 ---------
media-libs/opencv/opencv-2.3.0-r1.ebuild | 168 ---------
media-libs/opencv/opencv-2.3.0.ebuild | 167 ---------
media-libs/opencv/opencv-2.3.1a.ebuild | 168 ---------
33 files changed, 0 insertions(+), 3158 deletions(-)
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
deleted file mode 100644
index 8eed7ea..0000000
--- a/media-libs/opencv/ChangeLog
+++ /dev/null
@@ -1,247 +0,0 @@
-# ChangeLog for media-libs/opencv
-# 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 $
-
- 29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild,
- +files/opencv-2.3.1a-libav-0.7.patch:
- Resync with main tree
-
- 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild,
- files/opencv-2.3.1a-convert_sets_to_options.patch,
- +files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch:
- Split patches logically, cleanup
-
-*opencv-2.3.1a (13 Nov 2011)
-
- 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.1a.ebuild,
- +files/opencv-2.3.1a-convert_sets_to_options.patch:
- Added files from Andreas Sturmlechner with minor modifications
-
-*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:
- Resync with main tree
-
- 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,
- 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
-
- 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,
- 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
-
- 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,
- +files/opencv-2.3.0-convert_sets_to_options.patch,
- +files/opencv-2.3.0-numpy.patch:
- Started with version bump. Work in progress.
-
- 13 Jul 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,
- opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
- +files/opencv-2.2.0-findblas.patch:
- Resync with main tree
-
- 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,
- -opencv-2.2.0.ebuild, -opencv-2.2.0-r10.ebuild:
- Cleanup
-
-*opencv-2.2.0-r11 (14 May 2011)
-
- 14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +opencv-2.2.0-r11.ebuild, +files/opencv-2.2.0-findnpp.patch:
- Fix CUDA support
-
- 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.0.0.ebuild,
- -files/opencv-2.0.0-multilib.patch:
- Drop old
-
- 09 May 2011; Markos Chandras <hwoarang@gentoo.org> opencv-2.2.0.ebuild:
- Stable on amd64 wrt bug #354033
-
- 09 May 2011; Thomas Kahle <tomka@gentoo.org> opencv-2.2.0.ebuild:
- x86 stable per bug 354033
-
- 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- opencv-2.2.0.ebuild:
- Disable cuda to ease stabilization
-
- 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
- +files/opencv-2.2.0-fortran.patch:
- Need fortran enabled in gcc and cmake configure script, bug 365493
-
-*opencv-2.2.0-r10 (30 Apr 2011)
-
- 30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- opencv-2.2.0.ebuild, +opencv-2.2.0-r10.ebuild:
- Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp
- support
-
-*opencv-2.2.0 (30 Apr 2011)
-
- 30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +opencv-2.2.0.ebuild, +files/opencv-2.2.0-convert_sets_to_options.patch,
- +files/opencv-2.2.0-ffmpeg01.patch, +files/opencv-2.2.0-ffmpeg02.patch,
- +files/opencv-2.2.0-gcc46.patch, +files/opencv-2.2.0-libpng1.5.patch,
- +files/opencv-2.2.0-numpy.patch, +files/opencv-2.2.0-ptrcvcapture.patch,
- +files/opencv-2.2.0-use_system_libs.patch,
- +files/opencv-2.2.0-v4l_2.6.38.patch, metadata.xml:
- Version bump, with a lot of help from Scarabeus
-
- 29 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
- Move package to KDE herd because of digikam and kipi-plugins.
-
- 14 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> opencv-2.0.0.ebuild,
- opencv-2.1.0.ebuild:
- Migrate to virutal/ffmpeg. Per bug #362081.
-
- 25 Nov 2010; Jeroen Roovers <jer@gentoo.org> opencv-2.1.0.ebuild:
- Marked ~hppa (bug #340269).
-
- 09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
- opencv-2.1.0.ebuild:
- Use virtual/jpeg wrt #327487.
-
- 27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.1.0.ebuild,
- +files/opencv-2.1.0-mmap.patch:
- Fix bug in v4l code wrt #313649, Comment #14 by Uwe Sauter.
-
-*opencv-2.1.0 (27 Jul 2010)
-
- 27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.1.0.ebuild,
- +files/opencv-2.1.0-multilib.patch, metadata.xml:
- Version bump.
-
- 16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
- opencv-2.0.0-r1.ebuild:
- Fix building with FFmpeg >= 0.6 wrt #324259 by Alexis Ballier.
-
- 12 May 2010; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild:
- Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized.
-
- 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
- opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch:
- Fix building with libpng14.
-
- 06 Feb 2010; Ulrich Mueller <ulm@gentoo.org> opencv-2.0.0.ebuild,
- opencv-2.0.0-r1.ebuild:
- Fix LICENSE, bug 301123.
-
- 06 Jan 2010; Joseph Jezak <josejx@gentoo.org> opencv-2.0.0-r1.ebuild:
- Marked ~ppc64.
-
- 07 Dec 2009; Markus Meier <maekke@gentoo.org> opencv-2.0.0.ebuild:
- x86 stable, bug #295475
-
-*opencv-2.0.0-r1 (04 Dec 2009)
-
- 04 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
- +opencv-2.0.0-r1.ebuild:
- amd64 stable wrt #295475. Revision bump to skip sci-libs/ipp depend for
- -r0.
-
-*opencv-2.0.0 (16 Oct 2009)
-
- 16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.0.0.ebuild,
- +files/opencv-2.0.0-multilib.patch, metadata.xml:
- Version bump wrt #289258. Thanks to Aaron Mavrinac for ebuild.
-
- 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
- opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch:
- Fix building with GCC 4.4 wrt #274261.
-
- 02 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
- opencv-1.0.0-r1.ebuild:
- Bump needed swig version to fix bug #260172
-
- 15 Feb 2009; Patrick Lauer <patrick@gentoo.org>
- +files/opencv-1.0.0-fix-swig.patch, opencv-1.0.0-r1.ebuild:
- Fixing small error in the building of py bindings. Patch from John
- Keeping, closes #258652
-
- 27 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml,
- opencv-1.0.0-r1.ebuild:
- Fix homepage, bug #252367 by Thomas Pani. Tweak metadata.xml a bit
-
- 02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- metadata.xml:
- Removing jmglov as a maintainer since he was retired.
-
- 12 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
- +files/opencv-1.0.0-swiginvalidlinkingoptions.patch,
- opencv-1.0.0-r1.ebuild:
- Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported
- by Blorby in bug #239563, patch stolen from Exherbo
-
- 25 Oct 2008; Pieter Van den Abeele <pvdabeel@gentoo.org> opencv-1.0.0-r1.ebuild:
- Keyworded ~ppc. Closes bug #236085
-
- 14 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
- Picking up maintainership as current maintainer is inactive.
-
- 29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
- +files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch, opencv-1.0.0-r1.ebuild:
- Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg
- raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405.
-
-*opencv-1.0.0-r1 (23 Jun 2008)
-
- 23 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
- +files/opencv-1.0.0-addoptionalsamples.patch,
- +files/opencv-1.0.0-automagicdependencies.patch,
- +files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch,
- +files/opencv-1.0.0-enableuseflags.patch,
- +files/opencv-1.0.0-fixpythonmultilib.patch,
- +files/opencv-1.0.0-havepngexrdefs.patch, -opencv-1.0.0.ebuild,
- +opencv-1.0.0-r1.ebuild:
- Import changes from science overlay, fixes tons of automagic bugs as well as
- multilib bugs. Keyworded ~amd64
-
- 20 Jun 2008; Samuli Suominen <drac@gentoo.org> opencv-1.0.0.ebuild:
- QAbaddep; pkgconfig is only a build-time depend.
-
- 18 Jun 2008; Josh Glover <jmglov@gentoo.org> opencv-1.0.0.ebuild:
- added missing src_install() so that package installs files
-
-*opencv-1.0.0 (18 Jun 2008)
-
- 18 Jun 2008; Josh Glover <jmglov@gentoo.org> +metadata.xml,
- +opencv-1.0.0.ebuild:
- Added to Portage tree
-
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
deleted file mode 100644
index 62d0198..0000000
--- a/media-libs/opencv/Manifest
+++ /dev/null
@@ -1,56 +0,0 @@
------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
-AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
-AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
-AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
-AUX opencv-2.2.0-findblas.patch 1381 RMD160 117b3774ce42e73fc375da79b653c6bf69114be9 SHA1 5e34a74d79b3ec8f53759e3120ff85f054e05e51 SHA256 16f69a37283fb3e8ec3ab5435edd0a800e506c1f25997ecbbd4f7a02fa99aa8c
-AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439
-AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
-AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
-AUX opencv-2.2.0-libpng1.5.patch 1461 RMD160 31db2e4df582c30a6787b3c8d6081c7e6f204e5b SHA1 7025f170a11f286dd2b81e392c3662bc1ab11d9e SHA256 c44a5127cad582a94ea8ad375b5f979f5fb34cde41009319d1265ca4c4d495ca
-AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1 SHA1 cf1cd90150686961a6c2f4d1f2d08d3e4c3cfbdb SHA256 09e62d9d60cc1e7490bc1ed416085fefd933a9a89bc3c6cffe24569166430a25
-AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
-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
-AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
-AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
-AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
-AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
-AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
-AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08
-AUX opencv-2.3.1a-libav-0.7.patch 415 RMD160 cc9ae832bb72e0ecb09ad25356cb6bcc9ee5e084 SHA1 b1021d451c0949edd0da8dd05c88e2a433c33bbb SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099
-AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44
-AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
-DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
-DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
-DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008cde5 SHA1 9784e6824c5f677fac82ae83a2f366743adb3299 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
-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-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7
-EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7
-EBUILD opencv-2.3.1a.ebuild 4179 RMD160 0ba8dbaa4ac15f06ac41fdd76cf8ae41ace4bb03 SHA1 dd2e9163aee5e402154eaae66a410c175e8c4dca SHA256 44497a217fe2cee268c51e1341ee0e1daff5b5a8fe7aa7cbc3c2be1c163896f8
-MISC ChangeLog 9395 RMD160 25a6765d81f73c7d25c6bf53852881dfe833aa43 SHA1 047c741ec1ab0b9680d6ed791f0882bcb555ebcb SHA256 97a6879854c5223107dbd4b4a1a2a1e93c55f0fb186a500505cc1fd0a8da538c
-MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJO1WA1AAoJENwGBM22xffeR6wP/R74YpBAZCsFc/JqGVKI9i1G
-6rbvaUhy/gQ+PXtVOUTB3AS9A1wMiIKEmZDzIgF2wrYONfFajvyUPmL4XBQUZ3br
-og1cd6g3ycTy38XDKkc4lEDsJQmdA3hGey9zBmo6mX/czJWTRK+9Tra0MyPoyvts
-pSTzEMk7oewbBmmpZ3X+S2DUryYMfglX012tu0N8dBaR/IJKrSmUjK7g4ptO8IFN
-vjMyW6ob7g8AaNxT/Yq7QnTNmJxaNfUA6KQ1EkWSCCGGSULOa7NPBEa63v9z6sFs
-vDtQnUMRJXlqv6ziUhZIF3LPwJd14HRv90O69PhRTL0m3GrDxX8bxxL0Ehn9qOrE
-gMDHUce7rNdrMV3ptRMgS5rvc3JzBjoeQT8QL0cSmxb2YMzY6lZ0KhH+suhVzgFu
-Bu4Fd5usIsMuRi7ADkfdZSlBeH4gyVbc8aMERir719Sr9Rlt2o1aaAR+1kGRhg1x
-jfpqIvrbj5J6GsrfWL+TzhBU2jx92t+iQjResWTQNiZ2iZI4Ex+4eCx+1jbinHWe
-66A417TEXpsShCUkAjZKGNfFEwUL2k4kyjQWAbIWK3n5E6mSia3lOuhcynyQElTR
-xQ5cnSDu3f9UHaYs/6Tys5RKC2e0if/vYcoeTmiJT6mkn1EzRqNPFbLQ515p8j1Q
-UF8zTCUCYs/IjV/txM92
-=EOEX
------END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
deleted file mode 100644
index 56f7a4e..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
-
---- src/highgui/grfmt_png.cpp
-+++ src/highgui/grfmt_png.cpp
-@@ -223,7 +223,7 @@
- png_set_palette_to_rgb( png_ptr );
-
- if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
-- png_set_gray_1_2_4_to_8( png_ptr );
-+ png_set_expand_gray_1_2_4_to_8( png_ptr );
-
- if( CV_MAT_CN(m_type) > 1 && color )
- png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
deleted file mode 100644
index b7bbc9b..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.ros.org/trac/opencv/ticket/141
-http://bugs.gentoo.org/313649
-
---- src/highgui/cvcap_libv4l.cpp
-+++ src/highgui/cvcap_libv4l.cpp
-@@ -782,7 +782,7 @@
-
- capture->buffers[n_buffers].length = buf.length;
- capture->buffers[n_buffers].start =
-- mmap (NULL /* start anywhere */,
-+ v4l2_mmap (NULL /* start anywhere */,
- buf.length,
- PROT_READ | PROT_WRITE /* required */,
- MAP_SHARED /* recommended */,
diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
deleted file mode 100644
index 752ca6f..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-multilib.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
-+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
-@@ -89,8 +89,8 @@
- INSTALL (
- TARGETS flann # flann_s
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
- )
-
- # INSTALL (
-diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
---- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
-+++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
-@@ -467,8 +467,8 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- if(WIN32)
- get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
-diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
-+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
-@@ -40,6 +40,6 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
- )
-diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
-+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
-@@ -71,8 +71,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
-+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
-@@ -76,8 +76,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${aux_hdrs_ext}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
-+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
-@@ -71,8 +71,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- # install each module headers separately
- install(FILES ${lib_hdrs}
-diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
-+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
-@@ -282,8 +282,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv
-diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
-+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
-@@ -61,8 +61,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv
diff --git a/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch
deleted file mode 100644
index 7da06cb..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
---- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0.new/CMakeLists.txt 2011-04-30 11:57:37.000000000 +0200
-@@ -13,7 +13,7 @@
- # Add these standard paths to the search paths for FIND_LIBRARY
- # to find libraries from these locations first
- if(UNIX)
-- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
-+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
- endif()
- # it _must_ go before PROJECT(OpenCV) in order to work
- if (NOT CMAKE_INSTALL_PREFIX)
-@@ -94,7 +94,7 @@
- # Build static or dynamic libs?
- # ----------------------------------------------------------------------------
- # Default: dynamic libraries:
--SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-+OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
- IF(BUILD_SHARED_LIBS)
- SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
- ELSE(BUILD_SHARED_LIBS)
-@@ -196,13 +196,13 @@
-
- # Build/install (or not) some apps:
- # ===================================================
--set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
--set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
--set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
-+option(BUILD_EXAMPLES "Build all examples" OFF)
-+option(INSTALL_C_EXAMPLES "Install C examples" OFF)
-+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
-
- # Build tests:
- # ===================================================
--set(BUILD_TESTS ON CACHE BOOL "Build tests")
-+option(BUILD_TESTS "Build tests" ON)
-
- # Build 3rdparty libraries under unix
- # ===================================================
-@@ -229,12 +229,12 @@
- #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
-
- if(CMAKE_COMPILER_IS_GNUCXX)
-- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
-- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
-+ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
-+ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*)
- # We can use only -O2 because the -O3 causes gcc crash
-- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC")
-- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")
-+ option(USE_O2 "Enable -O2 for GCC" ON)
-+ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
- endif()
-
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)
-@@ -255,56 +255,56 @@
- endif()
-
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)
-- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")
-- set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")
-+ option(USE_O3 "Enable -O3 for GCC" ON)
-+ option(ENABLE_POWERPC "Enable PowerPC for GCC" ON)
- endif ()
-
- if(X86 OR X86_64)
- # enable everything, since the available set of instructions is checked at runtime
-- set(USE_O3 ON CACHE BOOL "Enable -O3")
-- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
-- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
-- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
-- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
-- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
-- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
-- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
-+ set(USE_O3 "Enable -O3" ON)
-+ set(USE_FAST_MATH "Enable -ffast-math" ON)
-+ option(ENABLE_SSE "Enable SSE instructions" ON)
-+ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
-+ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
-+ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
-+ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
-+ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
- endif()
- endif()
-
- # allow fine grained control over which libraries not to link, even if
- # they are available on the system
- # ====================================================================
--set(WITH_PNG ON CACHE BOOL "Include PNG support")
--set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
--set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
--set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
--set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
-+option(WITH_PNG "Include PNG support" ON)
-+option(WITH_JPEG "Include JPEG support" ON)
-+option(WITH_JASPER "Include JPEG2K support" ON)
-+option(WITH_TIFF "Include TIFF support" ON)
-+option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
-
- if(UNIX)
-- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
-+ option(WITH_FFMPEG "Include FFMPEG support" ON)
- if(NOT APPLE)
-- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
-- set(WITH_GTK ON CACHE BOOL "Include GTK support")
-- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
-- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
-- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
-+ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
-+ option(WITH_GTK "Include GTK support" ON)
-+ option(WITH_GSTREAMER "Include Gstreamer support" ON)
-+ option(WITH_V4L "Include Video 4 Linux support" ON)
-+ option(WITH_XINE "Include Xine support (GPL)" OFF)
- endif()
-- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
-- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
-+ option(WITH_PVAPI "Include Prosilica GigE support" ON)
-+ option(WITH_1394 "Include IEEE1394 support" ON)
- endif()
-
- if(APPLE)
-- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
-- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
-+ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
-+ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
- endif()
-
--set(WITH_TBB OFF CACHE BOOL "Include TBB support")
--set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
--set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
-+option(WITH_TBB "Include TBB support" OFF)
-+option(WITH_EIGEN2 "Include Eigen2/Eigen3 support" ON)
-+option(WITH_CUDA "Include NVidia Cuda Runtime support" OFF)
-
- if(WIN32)
-- set(WITH_VIDEOINPUT ON CACHE BOOL "Enable VideoInput support")
-+ option(WITH_VIDEOINPUT "Enable VideoInput support" ON)
- endif()
-
- # ===================================================
-@@ -496,7 +496,7 @@
- include(OpenCVFindOpenEXR.cmake)
- endif()
-
--set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
-+option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
-
- if(BUILD_NEW_PYTHON_SUPPORT)
- find_package(PythonInterp)
-@@ -513,8 +513,8 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- if(WIN32)
- get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
-@@ -543,8 +543,8 @@
- #YV
- ############################### QT ################################
-
--set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
--set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
-+option(WITH_QT "Build with Qt Backend support" OFF)
-+option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
-
- set(HAVE_QT 0)
- set(HAVE_QT_OPENGL 0)
-@@ -823,15 +823,12 @@
-
-
- ################## LATEX ##################
--set(BUILD_LATEX_DOCS OFF CACHE BOOL "Build LaTeX OpenCV Documentation")
-+option(BUILD_LATEX_DOCS "Build LaTeX OpenCV Documentation" OFF)
-
- ################### DOXYGEN ###############
-
- find_package(Doxygen)
--
--if(DOXYGEN_FOUND)
-- set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen")
--endif()
-+option(BUILD_DOXYGEN_DOCS "Generate HTML docs using Doxygen" ON)
-
- # ----------------------------------------------------------------------------
- # UPDATE CONFIG FILES & SCRIPTS:
-@@ -863,7 +860,7 @@
- # Set the maximum level of warnings:
- # ----------------------------------------------------------------------------
- # Should be set to true for development
--set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
-+option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
-
- set(EXTRA_C_FLAGS "")
- set(EXTRA_C_FLAGS_RELEASE "")
-@@ -1070,9 +1067,9 @@
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )
-
- if(WIN32)
--set(OPENCV_DOC_INSTALL_PATH doc)
-+set(OPENCV_DOC_INSTALL_PATH doc CACHE PATH "Directory for documentation to install (without prefix)")
- else()
--set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
-+set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
- endif()
-
- # --------------------------------------------------------------------------------------------
-@@ -1106,7 +1103,7 @@
- set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include")
- set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
-
--set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
-+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-
- exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1164,14 +1161,14 @@
- # -------------------------------------------------------------------------------------------
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
- set(includedir "\${prefix}/include")
- set(VERSION ${OPENCV_VERSION})
-
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
-
- if(UNIX)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- endif()
-
-
-@@ -1191,7 +1188,7 @@
- # CPack target
- # ----------------------------------------------------------------------------
-
--set(BUILD_PACKAGE OFF CACHE BOOL "Build a installer with the SDK")
-+option(BUILD_PACKAGE "Build a installer with the SDK" OFF)
-
- if(BUILD_PACKAGE)
-
-diff -urN OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt 2011-04-30 10:51:26.000000000 +0200
-@@ -43,12 +43,12 @@
- VERSION ${OPENCV_VERSION}
- OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
- DEFINE_SYMBOL "CVAPI_EXPORTS"
-- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
- )
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
- )
-diff -urN OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt 2011-04-30 10:51:08.000000000 +0200
-@@ -96,9 +96,9 @@
- # Additional target properties
- set_target_properties(${the_target} PROPERTIES
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
- )
-
- # Add the required libraries for linking:
-@@ -124,8 +124,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv2/${name}
-diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt 2011-04-30 10:53:11.000000000 +0200
-@@ -250,9 +250,9 @@
- # Additional target properties
- set_target_properties(${the_target} PROPERTIES
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
- LINK_INTERFACE_LIBRARIES ""
- )
-
-@@ -302,8 +302,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv2/highgui
-diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0.new/OpenCVModule.cmake
---- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0.new/OpenCVModule.cmake 2011-04-30 10:53:45.000000000 +0200
-@@ -51,9 +51,9 @@
- # Additional target properties
- set_target_properties(${the_target} PROPERTIES
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
- )
-
- # Add the required libraries for linking:
-@@ -75,8 +75,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv2/${name}
-diff -urN OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt
---- OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt 2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt 2011-04-30 10:54:15.000000000 +0200
-@@ -51,7 +51,7 @@
- # Additional target properties
- set_target_properties(${the_target} PROPERTIES
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
- DEFINE_SYMBOL "CVAPI_EXPORTS"
- )
-@@ -64,6 +64,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- endif()
diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch
deleted file mode 100644
index bfde3a9..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-
-Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
-===================================================================
---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2112)
-+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2113)
-@@ -466,7 +466,7 @@
- AVCodecContext *enc = &ic->streams[i]->codec;
- #endif
-
-- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
-+ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
- AVCodec *codec = avcodec_find_decoder(enc->codec_id);
- if (!codec ||
- avcodec_open(enc, codec) < 0)
-@@ -550,15 +550,27 @@
- continue;
- }
-
--#if LIBAVFORMAT_BUILD > 4628
-- avcodec_decode_video(video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#else
-- avcodec_decode_video(&video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#endif
-+
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = packet.data;
-+ avpkt.size = packet.size;
-+ //
-+ // HACK for CorePNG to decode as normal PNG by default
-+ // same method used by ffmpeg
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ avcodec_decode_video2(video_st->codec,
-+ picture, &got_picture, &avpkt);
-+//Functions Removed from ffmpeg on 4/19/11
-+//#if LIBAVFORMAT_BUILD > 4628
-+// avcodec_decode_video(video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#else
-+// avcodec_decode_video(&video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#endif
-
- if (got_picture) {
- // we have a new picture, so memorize it
-@@ -899,7 +911,7 @@
- #endif
-
- #if LIBAVFORMAT_BUILD > 4621
-- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
-+ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
- #else
- c->codec_id = oc->oformat->video_codec;
- #endif
-@@ -911,7 +923,7 @@
- //if(codec_tag) c->codec_tag=codec_tag;
- codec = avcodec_find_encoder(c->codec_id);
-
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
-
- /* put sample parameters */
- c->bit_rate = bitrate;
-@@ -998,7 +1010,7 @@
- AVPacket pkt;
- av_init_packet(&pkt);
-
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= (uint8_t *)picture;
- pkt.size= sizeof(AVPicture);
-@@ -1018,7 +1030,7 @@
- pkt.pts = c->coded_frame->pts;
- #endif
- if(c->coded_frame->key_frame)
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= outbuf;
- pkt.size= out_size;
-@@ -1215,7 +1227,7 @@
- av_register_all ();
-
- /* auto detect the output format from the name and fourcc code. */
-- fmt = guess_format(NULL, filename, NULL);
-+ fmt = av_guess_format(NULL, filename, NULL);
- if (!fmt)
- return false;
-
-@@ -1238,7 +1250,7 @@
- #endif
-
- // alloc memory for context
-- oc = av_alloc_format_context();
-+ oc = avformat_alloc_context();
- assert (oc);
-
- /* set file name */
diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch
deleted file mode 100644
index 00ee541..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
-===================================================================
---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2121)
-+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2122)
-@@ -815,24 +815,25 @@
- #endif
- };
-
--static const char * icvFFMPEGErrStr(int err)
--{
-- switch(err) {
-- case AVERROR_NUMEXPECTED:
-- return "Incorrect filename syntax";
-- case AVERROR_INVALIDDATA:
-- return "Invalid data in header";
-- case AVERROR_NOFMT:
-- return "Unknown format";
-- case AVERROR_IO:
-- return "I/O error occurred";
-- case AVERROR_NOMEM:
-- return "Memory allocation error";
-- default:
-- break;
-- }
-- return "Unspecified error";
--}
-+//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
-+//static const char * icvFFMPEGErrStr(int err)
-+//{
-+// switch(err) {
-+// case AVERROR_NUMEXPECTED:
-+// return "Incorrect filename syntax";
-+// case AVERROR_INVALIDDATA:
-+// return "Invalid data in header";
-+// case AVERROR_NOFMT:
-+// return "Unknown format";
-+// case AVERROR_IO:
-+// return "I/O error occurred";
-+// case AVERROR_NOMEM:
-+// return "Memory allocation error";
-+// default:
-+// break;
-+// }
-+// return "Unspecified error";
-+//}
-
- /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
- extern "C" {
-@@ -1322,7 +1323,7 @@
- /* open the codec */
- if ( (err=avcodec_open(c, codec)) < 0) {
- char errtext[256];
-- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
-+ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
- CV_Error(CV_StsBadArg, errtext);
- }
-
diff --git a/media-libs/opencv/files/opencv-2.2.0-findblas.patch b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
deleted file mode 100644
index 0c205f5..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-findblas.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
---- OpenCV-2.2.0.orig/CMakeLists.txt 2011-07-13 21:49:54.474595691 +0200
-+++ OpenCV-2.2.0/CMakeLists.txt 2011-07-13 21:51:01.917595716 +0200
-@@ -196,10 +196,30 @@
- # ----------------------------------------------------------------------------
- # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
- # ----------------------------------------------------------------------------
-+find_package(PkgConfig REQUIRED)
-+
-+if(BLAS_LIBRARIES)
-+ include(CheckFortranFunctionExists)
-+ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
-+ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
-+ unset( CMAKE_REQUIRED_LIBRARIES )
-+ if(BLAS_FOUND)
-+ message(STATUS "BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
-+ else(BLAS_FOUND)
-+ message(FATAL_ERROR "BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
-+ endif(BLAS_FOUND)
-+else(BLAS_LIBRARIES)
-+ # User did not provide a BLAS Library
-+ pkg_check_modules(BLAS blas)
-+endif (BLAS_LIBRARIES)
-+
-+if(NOT BLAS_FOUND)
-+ message(FATAL_ERROR "BLAS libraries not found.")
-+endif(NOT BLAS_FOUND)
-+
- find_package(LAPACK REQUIRED)
--find_package(BLAS REQUIRED)
- find_package(ZLIB REQUIRED)
--find_package(PkgConfig REQUIRED)
-+
- pkg_check_modules(FLANN REQUIRED flann)
-
- # Build/install (or not) some apps:
diff --git a/media-libs/opencv/files/opencv-2.2.0-findnpp.patch b/media-libs/opencv/files/opencv-2.2.0-findnpp.patch
deleted file mode 100644
index 86ef8e2..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-findnpp.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ruN OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake OpenCV-2.2.0/modules/gpu/FindNPP.cmake
---- OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/gpu/FindNPP.cmake 2011-05-14 20:52:29.026582967 +0200
-@@ -7,42 +7,12 @@
- # CUDA_NPP_LIBRARIES -- NPP libraries.
- # NPP_VERSION -- NPP version in format "major.minor.build".
- #
--# If not found automatically, please set CUDA_NPP_LIBRARY_ROOT_DIR
--# in CMake or set enviroment varivabe $CUDA_NPP_ROOT
--#
--# Author: Anatoly Baksheev, Itseez Ltd.
--#
--# The MIT License
--#
--# License for the specific language governing rights and limitations under
--# Permission is hereby granted, free of charge, to any person obtaining a
--# copy of this software and associated documentation files (the "Software"),
--# to deal in the Software without restriction, including without limitation
--# the rights to use, copy, modify, merge, publish, distribute, sublicense,
--# and/or sell copies of the Software, and to permit persons to whom the
--# Software is furnished to do so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
--# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
--# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
--# DEALINGS IN THE SOFTWARE.
--#
- ###############################################################################
-
- cmake_policy(PUSH)
- cmake_minimum_required(VERSION 2.8.0)
- cmake_policy(POP)
-
--if(NOT "${CUDA_NPP_LIBRARY_ROOT_DIR}" STREQUAL "${CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL}")
-- unset(CUDA_NPP_INCLUDES CACHE)
-- unset(CUDA_NPP_LIBRARIES CACHE)
--endif()
-
- if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- if (UNIX OR APPLE)
-@@ -58,28 +28,18 @@
- endif()
- endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-
--if(NOT CUDA_NPP_LIBRARY_ROOT_DIR OR CUDA_NPP_LIBRARY_ROOT_DIR STREQUAL "")
-- unset(CUDA_NPP_LIBRARY_ROOT_DIR CACHE)
-- find_path(CUDA_NPP_LIBRARY_ROOT_DIR "common/npp/include/npp.h" PATHS ENV CUDA_NPP_ROOT DOC "NPP root directory.")
-- MESSAGE(STATUS "NPP root directory: " ${CUDA_NPP_LIBRARY_ROOT_DIR})
--endif()
-+unset(CUDA_NPP_LIBRARY_ROOT_DIR)
-
--# Search includes in our own paths.
--find_path(CUDA_NPP_INCLUDES npp.h PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}/common/npp/include")
--# Search default search paths, after we search our own set of paths.
--find_path(CUDA_NPP_INCLUDES device_functions.h)
-+# Search includes
-+find_path(CUDA_NPP_INCLUDES npp.h PATHS "/opt/cuda/include")
- mark_as_advanced(CUDA_NPP_INCLUDES)
-
- # Find NPP library
- find_library(CUDA_NPP_LIBRARIES
- NAMES "npp" "npp${NPP_SUFFIX}" "libnpp${NPP_SUFFIX}"
-- PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}"
-- PATH_SUFFIXES "common/lib" "common/npp/lib"
-+ PATHS "/opt/cuda/lib"
- DOC "NPP library"
- )
--
--# Search default search paths, after we search our own set of paths.
--find_library(CUDA_NPP_LIBRARIES NAMES npp${NPP_SUFFIX} libnpp${NPP_SUFFIX} DOC "NPP library")
- mark_as_advanced(CUDA_NPP_LIBRARIES)
-
- if(EXISTS ${CUDA_NPP_INCLUDES}/nppversion.h)
-@@ -120,6 +80,3 @@
- endif()
-
- set(CUDA_NPP_FOUND TRUE)
--set(CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL "${CUDA_NPP_LIBRARY_ROOT_DIR}" CACHE INTERNAL "This is the value of the last time CUDA_NPP_LIBRARY_ROOT_DIR was set successfully." FORCE)
--
--
diff --git a/media-libs/opencv/files/opencv-2.2.0-fortran.patch b/media-libs/opencv/files/opencv-2.2.0-fortran.patch
deleted file mode 100644
index 3ebe570..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-fortran.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
---- OpenCV-2.2.0.orig/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt 2011-05-01 19:49:06.901193498 +0200
-@@ -3,6 +3,9 @@
- #
- # From the off-tree build directory, invoke:
- # $ cmake <PATH_TO_OPENCV_ROOT>
-+
-+ENABLE_LANGUAGE(Fortran)
-+
- #
- #
- # - OCT-2008: Initial version <joseluisblancoc@gmail.com>
diff --git a/media-libs/opencv/files/opencv-2.2.0-gcc46.patch b/media-libs/opencv/files/opencv-2.2.0-gcc46.patch
deleted file mode 100644
index a69499b..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp
-===================================================================
---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804)
-+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861)
-@@ -56,4 +56,5 @@
- #include <algorithm>
- #include <cmath>
-+#include <cstddef>
- #include <complex>
- #include <map>
diff --git a/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch b/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch
deleted file mode 100644
index fce010d..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
-===================================================================
---- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337)
-+++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
-@@ -108,5 +108,5 @@
- {
- png_structp png_ptr = (png_structp)_png_ptr;
-- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
-+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
- CV_Assert( decoder );
- const Mat& buf = decoder->m_buf;
-@@ -139,5 +139,5 @@
- if( info_ptr && end_info )
- {
-- if( setjmp( png_ptr->jmpbuf ) == 0 )
-+ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
- {
- if( !m_buf.empty() )
-@@ -201,5 +201,5 @@
- png_infop end_info = (png_infop)m_end_info;
-
-- if( setjmp(png_ptr->jmpbuf) == 0 )
-+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
- {
- int y;
-@@ -285,5 +285,5 @@
- return;
- png_structp png_ptr = (png_structp)_png_ptr;
-- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
-+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
- CV_Assert( encoder && encoder->m_buf );
- size_t cursz = encoder->m_buf->size();
-@@ -327,5 +327,5 @@
- if( info_ptr )
- {
-- if( setjmp( png_ptr->jmpbuf ) == 0 )
-+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
- {
- if( m_buf )
diff --git a/media-libs/opencv/files/opencv-2.2.0-numpy.patch b/media-libs/opencv/files/opencv-2.2.0-numpy.patch
deleted file mode 100644
index 0690eab..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-numpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up OpenCV-2.2.0/CMakeLists.txt.numpy OpenCV-2.2.0/CMakeLists.txt
---- OpenCV-2.2.0/CMakeLists.txt.numpy 2010-12-07 17:54:56.369070005 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 17:58:31.987070004 +0100
-@@ -532,7 +532,7 @@ if(BUILD_NEW_PYTHON_SUPPORT)
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(PYTHON_NUMPY_PROCESS EQUAL 0)
- set(PYTHON_USE_NUMPY 1)
-- add_definitions(-D PYTHON_USE_NUMPY=1)
-+ add_definitions(-DPYTHON_USE_NUMPY=1)
- include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
- message(STATUS " Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}")
- else()
diff --git a/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch b/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch
deleted file mode 100644
index c1316f0..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: modules/highgui/src/cap.cpp
-===================================================================
---- modules/highgui/src/cap.cpp (revision 4283)
-+++ modules/highgui/src/cap.cpp (working copy)
-@@ -52,10 +52,10 @@
- namespace cv
- {
-
--template<> inline void Ptr<CvCapture>::delete_obj()
-+template<> void Ptr<CvCapture>::delete_obj()
- { cvReleaseCapture(&obj); }
-
--template<> inline void Ptr<CvVideoWriter>::delete_obj()
-+template<> void Ptr<CvVideoWriter>::delete_obj()
- { cvReleaseVideoWriter(&obj); }
-
- }
diff --git a/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch b/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch
deleted file mode 100644
index 5d22a9b..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
---- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 23:48:20.000000000 +0200
-@@ -193,6 +193,11 @@
- # ----------------------------------------------------------------------------
- # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
- # ----------------------------------------------------------------------------
-+find_package(LAPACK REQUIRED)
-+find_package(BLAS REQUIRED)
-+find_package(ZLIB REQUIRED)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(FLANN REQUIRED flann)
-
- # Build/install (or not) some apps:
- # ===================================================
-diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-30 10:56:32.000000000 +0200
-@@ -1,3 +1,3 @@
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
--set(deps opencv_lapack zlib)
-+include_directories("${ZLIB_INCLUDE_DIRS}")
-+set(deps ${ZLIB_LIBRARIES} ${LAPACK_LIBRARIES})
- define_opencv_module(core ${deps})
-diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
---- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-30 11:50:09.000000000 +0200
-@@ -48,7 +48,7 @@
- typedef __CLPK_integer integer;
- typedef __CLPK_real real;
- #else
-- #include "clapack.h"
-+ #include <clapack/clapack.h>
- #endif
-
- #undef abs
-diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.2.0/modules/haartraining/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt 2011-04-29 23:48:41.000000000 +0200
-@@ -18,7 +18,7 @@
- link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
- endif()
-
--set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)
-+set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${BLAS_LIBRARIES} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES})
-
- link_libraries(${haartraining_libs})
-
-diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt
---- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200
-@@ -219,8 +219,8 @@
- set(the_target "opencv_highgui")
-
- add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS)
--
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
-+include_directories("${ZLIB_INCLUDE_DIRS}"
-+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
- "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
- "${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include"
- "${CMAKE_CURRENT_SOURCE_DIR}/src"
-@@ -285,7 +285,7 @@
- #target_link_libraries(${the_target} libtiff)
- endif()
-
--target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
-+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
-
- if(APPLE)
- target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
-diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp
---- OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp 2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp 2011-04-29 22:25:25.000000000 +0200
-@@ -42,6 +42,7 @@
-
- #include "precomp.hpp"
-
-+#include <zlib.h>
- #ifdef HAVE_PNG
-
- /****************************************************************************************\
-diff -urN OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake
---- OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake 2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2011-04-30 10:57:21.000000000 +0200
-@@ -44,7 +44,7 @@
- IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
- SET(OPENEXR_FOUND TRUE)
- SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
-- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR")
-+ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
- ENDIF ()
-
- IF(OPENEXR_FOUND)
diff --git a/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch b/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch
deleted file mode 100644
index dd23cd1..0000000
--- a/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800
-@@ -214,7 +214,7 @@
- #include <sys/types.h>
- #include <sys/mman.h>
-
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-
- #include <string.h>
- #include <stdlib.h>
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800
-@@ -224,7 +224,7 @@
- #include "highgui.h"
- #include "precomp.hpp"
-
--#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
-+#if !defined WIN32 && defined HAVE_CAMV4L2
-
- #define CLEAR(x) memset (&(x), 0, sizeof (x))
-
-@@ -241,7 +241,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/videodev2.h>
-
- #include <libv4l1.h>
diff --git a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
deleted file mode 100644
index 2f768bc..0000000
--- a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/CMakeLists.txt 2011-07-04 06:21:50.000000000 +0200
-+++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
-@@ -14,7 +14,7 @@
- # Add these standard paths to the search paths for FIND_LIBRARY
- # to find libraries from these locations first
- if(UNIX)
-- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
-+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
- endif()
-
-
-@@ -77,13 +77,13 @@
- # Build static or dynamic libs?
- # Default: dynamic libraries
- # ----------------------------------------------------------------------------
--set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-+OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
-
- # ----------------------------------------------------------------------------
- # Include debug info into debug libs?
- # Default: yes
- # ----------------------------------------------------------------------------
--set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
-+OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
-
- # ----------------------------------------------------------------------------
- # Current version number:
-@@ -285,20 +285,20 @@
-
- # Build/install (or not) some apps:
- # ===================================================
--set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
--set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
--set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
-+option(BUILD_EXAMPLES "Build all examples" OFF)
-+option(INSTALL_C_EXAMPLES "Install C examples" OFF)
-+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
-
- # Build tests:
- # ===================================================
--set(BUILD_TESTS ON CACHE BOOL "Build tests")
-+option(BUILD_TESTS "Build tests" ON)
-
- # Build 3rdparty libraries under unix
- # ===================================================
- if(WIN32)
-- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
-+ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
- else()
-- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
-+ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
- endif()
-
- include(OpenCVPCHSupport.cmake REQUIRED)
-@@ -324,8 +324,8 @@
- #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
-
- if(CMAKE_COMPILER_IS_GNUCXX)
-- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
-- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
-+ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
-+ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
-
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
- set(X86_64 1)
-@@ -341,58 +341,58 @@
-
- if(X86 OR X86_64)
- # enable everything, since the available set of instructions is checked at runtime
-- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
-- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
-- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
-- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
-- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
-- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
-- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
-+ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
-+ option(ENABLE_SSE "Enable SSE instructions" ON)
-+ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
-+ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
-+ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
-+ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
-+ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
- endif()
- endif()
-
- if(MSVC)
-- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
-- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
-+ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
-+ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
- if(CMAKE_C_COMPILER MATCHES "icc")
-- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
-- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
-+ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
-+ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
- endif()
- endif()
-
- # allow fine grained control over which libraries not to link, even if
- # they are available on the system
- # ====================================================================
--set(WITH_PNG ON CACHE BOOL "Include PNG support")
--set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
--set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
--set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
--set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
-+option(WITH_PNG "Include PNG support" ON)
-+option(WITH_JPEG "Include JPEG support" ON)
-+option(WITH_JASPER "Include JPEG2K support" ON)
-+option(WITH_TIFF "Include TIFF support" ON)
-+option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
-
- if(UNIX)
-- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
-+ option(WITH_FFMPEG "Include FFMPEG support" ON)
- if(NOT APPLE)
-- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
-- set(WITH_GTK ON CACHE BOOL "Include GTK support")
-- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
-- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
-- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
-+ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
-+ option(WITH_GTK "Include GTK support" ON)
-+ option(WITH_GSTREAMER "Include Gstreamer support" ON)
-+ option(WITH_V4L "Include Video 4 Linux support" ON)
-+ option(WITH_XINE "Include Xine support (GPL)" OFF)
- endif()
-- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
-- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
-+ option(WITH_PVAPI "Include Prosilica GigE support" ON)
-+ option(WITH_1394 "Include IEEE1394 support" ON)
- endif()
-
- if(APPLE)
-- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
-- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
-+ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
-+ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
- endif()
-
--set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
--set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
--set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
--set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
-+option(WITH_TBB "Include TBB support" OFF)
-+option(WITH_IPP "Include Intel IPP support" OFF)
-+option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
-+option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
-
--set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
-+option(WITH_OPENNI "Include OpenNI support" OFF)
-
- # ===================================================
- # Macros that checks if module have been installed.
-@@ -586,13 +586,13 @@
- include(OpenCVFindOpenEXR.cmake)
- endif()
-
--set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
-+option(BUILD_DOCS "Build OpenCV Documentation" ON)
-
- if(BUILD_DOCS)
- include(OpenCVFindLATEX.cmake REQUIRED)
- endif()
-
--set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
-+option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
-
- if (WIN32)
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-@@ -619,11 +619,11 @@
-
- string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
- if(UNIX)
-- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
- if(APPLE)
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
- else() #debian based assumed, install to the dist-packages.
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
- endif()
- endif()
- if(WIN32)
-@@ -665,8 +665,8 @@
- #YV
- ############################### QT ################################
-
--set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
--set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
-+option(WITH_QT "Build with Qt Backend support" OFF)
-+option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
-
- set(HAVE_QT 0)
- set(HAVE_QT_OPENGL 0)
-@@ -876,8 +876,8 @@
- ################## Extra HighGUI libs on Windows ###################
-
- if(WIN32)
-- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
--
-+ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
-+
- set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
-
- if(WITH_VIDEOINPUT)
-@@ -956,7 +956,7 @@
- # Set the maximum level of warnings:
- # ----------------------------------------------------------------------------
- # Should be set to true for development
--set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
-+option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
-
- set(EXTRA_C_FLAGS "")
- set(EXTRA_C_FLAGS_RELEASE "")
-@@ -1197,7 +1197,7 @@
- if(WIN32)
- set(OPENCV_DOC_INSTALL_PATH doc)
- else()
--set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
-+set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
- endif()
-
-
-@@ -1232,7 +1232,7 @@
- set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"")
- set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
-
--set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"")
-+set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib${LIB_SUFFIX}\"")
-
- exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1327,14 +1327,14 @@
- # -------------------------------------------------------------------------------------------
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
- set(includedir "\${prefix}/include")
- set(VERSION ${OPENCV_VERSION})
-
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
-
- if(UNIX)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- endif()
-
-
-@@ -1354,7 +1354,7 @@
- # CPack target
- # ----------------------------------------------------------------------------
-
--set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
-+option(BUILD_PACKAGE "Build a installer with the SDK" ON)
-
- if(BUILD_PACKAGE)
-
-diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0/OpenCVModule.cmake
---- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake 2011-07-04 06:21:59.000000000 +0200
-+++ OpenCV-2.3.0/OpenCVModule.cmake 2011-09-18 19:32:20.000000000 +0200
-@@ -63,7 +63,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- )
-
- if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
-@@ -97,8 +97,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0/modules/gpu/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
-@@ -121,7 +121,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- )
-
- # Add the required libraries for linking:
-@@ -149,8 +149,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${lib_hdrs}
- DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0/modules/highgui/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
-@@ -295,7 +295,7 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-- INSTALL_NAME_DIR lib
-+ INSTALL_NAME_DIR lib${LIB_SUFFIX}
- LINK_INTERFACE_LIBRARIES ""
- )
-
-@@ -362,8 +362,8 @@
-
- install(TARGETS ${the_target}
- RUNTIME DESTINATION bin COMPONENT main
-- LIBRARY DESTINATION lib COMPONENT main
-- ARCHIVE DESTINATION lib COMPONENT main)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
-
- install(FILES ${highgui_ext_hdrs}
- DESTINATION include/opencv2/highgui
diff --git a/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch b/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch
deleted file mode 100644
index 4f93d4e..0000000
--- a/media-libs/opencv/files/opencv-2.3.0-ffmpeg.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp
---- OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-09-18 20:27:05.000000000 +0200
-@@ -489,7 +489,7 @@
- AVCodecContext *enc = &ic->streams[i]->codec;
- #endif
-
-- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
-+ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
- AVCodec *codec = avcodec_find_decoder(enc->codec_id);
- if (!codec ||
- avcodec_open(enc, codec) < 0)
-@@ -576,15 +576,27 @@
- continue;
- }
-
--#if LIBAVFORMAT_BUILD > 4628
-- avcodec_decode_video(video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#else
-- avcodec_decode_video(&video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#endif
-+
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = packet.data;
-+ avpkt.size = packet.size;
-+ //
-+ // HACK for CorePNG to decode as normal PNG by default
-+ // same method used by ffmpeg
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ avcodec_decode_video2(video_st->codec,
-+ picture, &got_picture, &avpkt);
-+//Functions Removed from ffmpeg on 4/19/11
-+//#if LIBAVFORMAT_BUILD > 4628
-+// avcodec_decode_video(video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#else
-+// avcodec_decode_video(&video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#endif
-
- if (got_picture) {
- // we have a new picture, so memorize it
-@@ -822,24 +834,25 @@
- #endif
- };
-
--static const char * icvFFMPEGErrStr(int err)
--{
-- switch(err) {
-- case AVERROR_NUMEXPECTED:
-- return "Incorrect filename syntax";
-- case AVERROR_INVALIDDATA:
-- return "Invalid data in header";
-- case AVERROR_NOFMT:
-- return "Unknown format";
-- case AVERROR_IO:
-- return "I/O error occurred";
-- case AVERROR_NOMEM:
-- return "Memory allocation error";
-- default:
-- break;
-- }
-- return "Unspecified error";
--}
-+//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
-+//static const char * icvFFMPEGErrStr(int err)
-+//{
-+// switch(err) {
-+// case AVERROR_NUMEXPECTED:
-+// return "Incorrect filename syntax";
-+// case AVERROR_INVALIDDATA:
-+// return "Invalid data in header";
-+// case AVERROR_NOFMT:
-+// return "Unknown format";
-+// case AVERROR_IO:
-+// return "I/O error occurred";
-+// case AVERROR_NOMEM:
-+// return "Memory allocation error";
-+// default:
-+// break;
-+// }
-+// return "Unspecified error";
-+//}
-
- /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
- extern "C" {
-@@ -918,7 +931,7 @@
- #endif
-
- #if LIBAVFORMAT_BUILD > 4621
-- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
-+ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
- #else
- c->codec_id = oc->oformat->video_codec;
- #endif
-@@ -930,7 +943,7 @@
- //if(codec_tag) c->codec_tag=codec_tag;
- codec = avcodec_find_encoder(c->codec_id);
-
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
-
- /* put sample parameters */
- c->bit_rate = bitrate;
-@@ -1015,7 +1028,7 @@
- AVPacket pkt;
- av_init_packet(&pkt);
-
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= (uint8_t *)picture;
- pkt.size= sizeof(AVPicture);
-@@ -1035,7 +1048,7 @@
- pkt.pts = c->coded_frame->pts;
- #endif
- if(c->coded_frame->key_frame)
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= outbuf;
- pkt.size= out_size;
-@@ -1237,7 +1250,7 @@
- av_register_all ();
-
- /* auto detect the output format from the name and fourcc code. */
-- fmt = guess_format(NULL, filename, NULL);
-+ fmt = av_guess_format(NULL, filename, NULL);
- if (!fmt)
- return false;
-
-@@ -1260,7 +1273,7 @@
- #endif
-
- // alloc memory for context
-- oc = av_alloc_format_context();
-+ oc = avformat_alloc_context();
- assert (oc);
-
- /* set file name */
-@@ -1336,7 +1349,7 @@
- /* open the codec */
- if ( (err=avcodec_open(c, codec)) < 0) {
- char errtext[256];
-- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
-+ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
- return false;
- }
-
diff --git a/media-libs/opencv/files/opencv-2.3.0-libpng15.patch b/media-libs/opencv/files/opencv-2.3.0-libpng15.patch
deleted file mode 100644
index c811766..0000000
--- a/media-libs/opencv/files/opencv-2.3.0-libpng15.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
-+++ opencv/modules/highgui/src/grfmt_png.cpp (revision 6143)
-@@ -57,4 +57,5 @@
- #include <png.h>
- #endif
-+#include <zlib.h>
- #include "grfmt_png.hpp"
-
diff --git a/media-libs/opencv/files/opencv-2.3.0-numpy.patch b/media-libs/opencv/files/opencv-2.3.0-numpy.patch
deleted file mode 100644
index e0706d2..0000000
--- a/media-libs/opencv/files/opencv-2.3.0-numpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt
---- OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200
-+++ OpenCV-2.3.0-2-numpy/CMakeLists.txt 2011-08-28 15:26:37.000000000 +0200
-@@ -640,7 +640,7 @@
-
- if(PYTHON_NUMPY_PROCESS EQUAL 0)
- set(PYTHON_USE_NUMPY 1)
-- add_definitions(-D PYTHON_USE_NUMPY=1)
-+ add_definitions(-DPYTHON_USE_NUMPY=1)
- include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
- message(STATUS " Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
- else()
diff --git a/media-libs/opencv/files/opencv-2.3.0-symlink.patch b/media-libs/opencv/files/opencv-2.3.0-symlink.patch
deleted file mode 100644
index d6f5efb..0000000
--- a/media-libs/opencv/files/opencv-2.3.0-symlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN OpenCV-2.3.0-1-s2o/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
---- OpenCV-2.3.0-1-s2o/CMakeLists.txt 2011-09-18 18:40:04.000000000 +0200
-+++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 18:55:47.000000000 +0200
-@@ -1240,7 +1240,7 @@
- if(UNIX)
- # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/cmake/FOO/FOOConfig.cmake, so:
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv/)
-- install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
-+ install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"$ENV{D}/${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
- endif()
-
- # --------------------------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
deleted file mode 100644
index 174a1d6..0000000
--- a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeLists.txt
---- OpenCV-2.3.1-0-vanilla/CMakeLists.txt 2011-09-12 20:45:38.000000000 +0200
-+++ OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
-@@ -72,13 +72,13 @@
- # Build static or dynamic libs?
- # Default: dynamic libraries
- # ----------------------------------------------------------------------------
--set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-+OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
-
- # ----------------------------------------------------------------------------
- # Include debug info into debug libs?
- # Default: yes
- # ----------------------------------------------------------------------------
--set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
-+OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
-
- # ----------------------------------------------------------------------------
- # Get actual OpenCV version number from sources
-@@ -318,23 +318,23 @@
-
- # Build/install (or not) some apps:
- # ===================================================
--set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
--set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
--set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
-+option(BUILD_EXAMPLES "Build all examples" OFF)
-+option(INSTALL_C_EXAMPLES "Install C examples" OFF)
-+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
- if(ANDROID)
-- set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
-+ option(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF)
- endif()
-
- # Build tests:
- # ===================================================
--set(BUILD_TESTS ON CACHE BOOL "Build tests")
-+option(BUILD_TESTS "Build tests" ON)
-
- # Build 3rdparty libraries under unix
- # ===================================================
- if(WIN32)
-- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
-+ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
- else()
-- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
-+ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
- endif()
-
- include(OpenCVPCHSupport.cmake REQUIRED)
-@@ -344,7 +344,7 @@
- endif()
-
- if(PCHSupport_FOUND)
-- SET(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Use precompiled headers")
-+ option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
- else()
- SET(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Use precompiled headers" FORCE)
- endif()
-@@ -356,8 +356,8 @@
- endif()
-
- if(CMAKE_COMPILER_IS_GNUCXX)
-- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
-- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
-+ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
-+ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
-
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
- set(X86_64 1)
-@@ -376,59 +376,59 @@
- #ELSE()
- # SET(_USE_FAST_MATH ON)
- #ENDIF()
-- set(USE_FAST_MATH ${_USE_FAST_MATH} CACHE BOOL "Enable -ffast-math (not recommended for GCC 4.6.x)")
-- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
-- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
-- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
-- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
-- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
-- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
-+ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
-+ option(ENABLE_SSE "Enable SSE instructions" ON)
-+ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
-+ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
-+ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
-+ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
-+ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
- endif()
- endif()
-
- if(MSVC)
-- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
-- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
-+ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
-+ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
- if(CMAKE_C_COMPILER MATCHES "icc")
-- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
-- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
-+ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
-+ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
- endif()
- endif()
-
- # allow fine grained control over which libraries not to link, even if
- # they are available on the system
- # ====================================================================
--set(WITH_PNG ON CACHE BOOL "Include PNG support")
--set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
--set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
--set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
--set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
-+option(WITH_PNG "Include PNG support" ON)
-+option(WITH_JPEG "Include JPEG support" ON)
-+option(WITH_JASPER "Include JPEG2K support" ON)
-+option(WITH_TIFF "Include TIFF support" ON)
-+option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
-
- if(UNIX)
-- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
-+ option(WITH_FFMPEG "Include FFMPEG support" ON)
- if(NOT APPLE)
-- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
-- set(WITH_GTK ON CACHE BOOL "Include GTK support")
-- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
-- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
-- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
-+ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
-+ option(WITH_GTK "Include GTK support" ON)
-+ option(WITH_GSTREAMER "Include Gstreamer support" ON)
-+ option(WITH_V4L "Include Video 4 Linux support" ON)
-+ option(WITH_XINE "Include Xine support (GPL)" OFF)
- endif()
-- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
-- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
-+ option(WITH_PVAPI "Include Prosilica GigE support" ON)
-+ option(WITH_1394 "Include IEEE1394 support" ON)
- endif()
-
- if(APPLE)
-- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
-- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
-+ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
-+ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
- endif()
-
--set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
--set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
--set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
--set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
--
--set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
--set(WITH_XIMEA OFF CACHE BOOL "Include XIMEA cameras support")
-+option(WITH_TBB "Include TBB support" OFF)
-+option(WITH_IPP "Include Intel IPP support" OFF)
-+option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
-+option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
-+
-+option(WITH_OPENNI "Include OpenNI support" OFF)
-+option(WITH_XIMEA "Include XIMEA cameras support" OFF)
-
- # ===================================================
- # Macros that checks if module have been installed.
-@@ -626,13 +626,13 @@
- include(OpenCVFindOpenEXR.cmake)
- endif()
-
--set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
-+option(BUILD_DOCS "Build OpenCV Documentation" ON)
-
- if(BUILD_DOCS)
- include(OpenCVFindLATEX.cmake REQUIRED)
- endif()
-
--set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
-+option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
-
- if (WIN32)
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-@@ -836,8 +836,8 @@
- #YV
- ############################### QT ################################
-
--set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
--set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
-+option(WITH_QT "Build with Qt Backend support" OFF)
-+option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
-
- set(HAVE_QT 0)
- set(HAVE_QT_OPENGL 0)
-@@ -1054,7 +1054,7 @@
- ################## Extra HighGUI libs on Windows ###################
-
- if(WIN32)
-- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
-+ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
- set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
-
- if(WITH_VIDEOINPUT)
-@@ -1123,7 +1123,7 @@
- # Set the maximum level of warnings:
- # ----------------------------------------------------------------------------
- # Should be set to true for development
--set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
-+option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
- if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
- endif()
-@@ -1494,7 +1494,7 @@
- #-----------------------------------
- # Source package:
- #-----------------------------------
--set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
-+option(BUILD_PACKAGE "Build a installer with the SDK" ON)
-
- if(BUILD_PACKAGE)
- set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
deleted file mode 100644
index 5909070..0000000
--- a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:37.000000000 +0100
-+++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:18.000000000 +0100
-@@ -104,6 +104,7 @@
- #endif
- #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
- #include <libavcodec/avcodec.h>
-+ #include <libavutil/mathematics.h>
- #endif
- #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
- #include <libswscale/swscale.h>
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
deleted file mode 100644
index 6481ee8..0000000
--- a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt
---- OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
-+++ OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
-@@ -18,7 +18,7 @@
- # Add these standard paths to the search paths for FIND_LIBRARY
- # to find libraries from these locations first
- if(UNIX)
-- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
-+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
- endif()
-
- # it _must_ go before PROJECT(OpenCV) in order to work
-@@ -117,7 +117,7 @@
-
- # SUBDIRECTORIES:
- # Save libs and executables in the same place
--set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
-
- if(ANDROID OR WIN32)
-@@ -665,9 +665,9 @@
- OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
- else() #debian based assumed, install to the dist-packages.
-- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
-+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
- endif()
- endif()
- if(CMAKE_HOST_WIN32)
diff --git a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
deleted file mode 100644
index 23abeb2..0000000
--- a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt
---- OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
-+++ OpenCV-2.3.1-4-caps/CMakeLists.txt 2011-11-13 14:37:04.000000000 +0100
-@@ -123,9 +123,9 @@
- if(ANDROID OR WIN32)
- set(OPENCV_DOC_INSTALL_PATH doc)
- elseif(OPENCV_MANGLED_INSTALL_PATHS)
-- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
-+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
- else()
-- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
-+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
- endif()
-
- if(ANDROID)
-@@ -1347,12 +1347,12 @@
- set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
- if(ANDROID)
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
- else()
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
- if(OPENCV_MANGLED_INSTALL_PATHS)
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
- endif()
- endif()
-
-@@ -1367,16 +1367,16 @@
- # <prefix>/(share|lib)/<name>*/ (U)
- # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
- if(OPENCV_MANGLED_INSTALL_PATHS)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
- else()
-- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
-+ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
- endif()
- endif()
-
- if(ANDROID)
-- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
-+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
- endif()
-
- # --------------------------------------------------------------------------------------------
-@@ -1386,7 +1386,7 @@
- set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
- set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
- set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-- set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+ set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-
- exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1439,7 +1439,7 @@
- set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
-
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
-- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
-+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
- endif(ANDROID)
-
- # --------------------------------------------------------------------------------------------
-diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt
---- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt 2011-09-12 20:45:36.000000000 +0200
-+++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt 2011-11-13 14:35:08.000000000 +0100
-@@ -2,6 +2,6 @@
- file(GLOB LBP_CASCADES lbpcascades/*.xml)
-
- if(NOT WIN32)
--install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
--install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
-+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
-+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
- endif()
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
deleted file mode 100644
index 22966c0..0000000
--- a/media-libs/opencv/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer>
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Huettel</name>
-</maintainer>
-<longdescription>
-OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
-Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
-Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
-</longdescription>
-<use>
- <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
- <flag name="deprecated">Build deprecated python binding features</flag>
- <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
- <flag name="ipp">Enable Intel Integrated Primitive support</flag>
- <flag name="octave">Enable octave support</flag>
- <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
- <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-</use>
-</pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
deleted file mode 100644
index c8dec83..0000000
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.12 2011/08/10 16:49:17 xarthisius Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils flag-o-matic python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
-
-RDEPEND="
- sys-libs/zlib
- virtual/fortran
- ipp? ( sci-libs/ipp )
- ieee1394? (
- sys-libs/libraw1394
- media-libs/libdc1394:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? ( media-libs/gstreamer )
- gtk? ( x11-libs/gtk+:2 )
- jpeg2k? ( media-libs/jasper )
- jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4 )
- tiff? ( media-libs/tiff )
- xine? ( media-libs/xine-lib )
- octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
- octave? ( dev-lang/swig )
- python? ( deprecated? ( dev-lang/swig ) )
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test" #296681
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "s:share/opencv/doc:share/doc/${PF}:" \
- CMakeLists.txt || die
-
- epatch "${FILESDIR}"/${P}-multilib.patch \
- "${FILESDIR}"/${P}-mmap.patch \
- "${FILESDIR}"/${PN}-2.0.0-libpng14.patch
-}
-
-src_configure() {
- append-cppflags -D__STDC_CONSTANT_MACROS #324259
-
- mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- $(cmake-utils_use_build examples)
- "-DBUILD_LATEX_DOCS=OFF"
- $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
- $(cmake-utils_use_build octave OCTAVE_SUPPORT)
- $(cmake-utils_use_build test TESTS)
- $(cmake-utils_use sse USE_SSE)
- $(cmake-utils_use sse2 USE_SSE2)
- $(cmake-utils_use sse3 USE_SSE3)
- $(cmake-utils_use ssse3 USE_SSSE3)
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use_with ipp)
- "-DUSE_O3=OFF"
- $(cmake-utils_use_with ieee1394 1394)
- $(cmake-utils_use_with ffmpeg)
- $(cmake-utils_use_with gstreamer)
- $(cmake-utils_use_with gtk)
- $(cmake-utils_use_with jpeg2k jasper)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with tiff)
- "-DWITH_UNICAP=OFF"
- $(cmake-utils_use_with v4l)
- $(cmake-utils_use_with xine)
- )
-
- if use octave; then
- mycmakeargs+=(
- $(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
- $(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- use python && python_mod_optimize opencv
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup opencv
-}
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
deleted file mode 100644
index e067847..0000000
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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.9 2011/09/06 20:56:37 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-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 test tiff v4l xine"
-
-# all tests fail, needs further investigation, bug 296681 - dilfridge
-RESTRICT=test
-
-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
- )
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- ieee1394? ( >=media-libs/libdc1394-2.1.3-r1 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
- opengl? ( x11-libs/qt-opengl:4 )
- )
- tiff? ( media-libs/tiff )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[-nodot] )
- >=dev-util/cmake-2.8.5-r2
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${P}-convert_sets_to_options.patch"
- "${FILESDIR}/${P}-fortran.patch"
- "${FILESDIR}/${P}-ffmpeg01.patch"
- "${FILESDIR}/${P}-ffmpeg02.patch"
- "${FILESDIR}/${P}-gcc46.patch"
- "${FILESDIR}/${P}-libpng1.5.patch"
- "${FILESDIR}/${P}-numpy.patch"
- "${FILESDIR}/${P}-ptrcvcapture.patch"
- "${FILESDIR}/${P}-use_system_libs.patch"
- "${FILESDIR}/${P}-v4l_2.6.38.patch"
- "${FILESDIR}/${P}-findnpp.patch"
- "${FILESDIR}/${P}-findblas.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOXYGEN_DOCS)
- $(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_use 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 jpeg2k JASPER)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- )
-
- # things we want to be hardly enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
- cmake-utils_src_test
-}
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
deleted file mode 100644
index b65ff3b..0000000
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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.ebuild,v 1.8 2011/06/21 16:12:06 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-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
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/libf2c
- sys-libs/zlib
- >=sci-libs/clapack-3.2.1-r4
- sci-libs/flann
- virtual/lapack
- virtual/fortran
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- openexr? ( media-libs/openexr )
- png? ( media-libs/libpng )
- python? ( dev-python/numpy )
- qt4? (
- x11-libs/qt-gui:4
- opengl? ( x11-libs/qt-opengl:4 )
- )
- tiff? ( media-libs/tiff )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[-nodot] )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${P}-convert_sets_to_options.patch"
- "${FILESDIR}/${P}-fortran.patch"
- "${FILESDIR}/${P}-ffmpeg01.patch"
- "${FILESDIR}/${P}-ffmpeg02.patch"
- "${FILESDIR}/${P}-gcc46.patch"
- "${FILESDIR}/${P}-libpng1.5.patch"
- "${FILESDIR}/${P}-numpy.patch"
- "${FILESDIR}/${P}-ptrcvcapture.patch"
- "${FILESDIR}/${P}-use_system_libs.patch"
- "${FILESDIR}/${P}-v4l_2.6.38.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOXYGEN_DOCS)
- $(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)
- -DUSE_ipp=OFF
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_cuda=OFF
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- $(cmake-utils_use_with gstreamer)
- $(cmake-utils_use_with gtk)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- )
-
- # things we want to be hardly enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
- cmake-utils_src_test
-}
diff --git a/media-libs/opencv/opencv-2.3.0-r1.ebuild b/media-libs/opencv/opencv-2.3.0-r1.ebuild
deleted file mode 100644
index 8fbeaca..0000000
--- a/media-libs/opencv/opencv-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-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"
-
-RDEPEND="
- app-arch/bzip2
- sys-libs/zlib
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- 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 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
- "${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"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(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)
- $(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 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)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use cuda; then
- if [ "$(gcc-version)" > "4.4" ]; then
- ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- else
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- fi
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- fi
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
- # openni: ???
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- "-DWITH_OPENNI=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
deleted file mode 100644
index fcc1d4e..0000000
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.10 2011/10/15 23:14:39 maekke Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-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 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
-
-RDEPEND="
- app-arch/bzip2
- sys-libs/zlib
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- 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 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
- "${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"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(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)
- $(cmake-utils_use_enable sse SSE)
- $(cmake-utils_use_enable sse2 SSE2)
- $(cmake-utils_use_enable sse3 SSE3)
- $(cmake-utils_use_enable ssse3 SSSE3)
- -DWITH_IPP=OFF
- $(cmake-utils_use_with ieee1394 1394)
- $(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)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use cuda; then
- if [ "$(gcc-version)" > "4.4" ]; then
- ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- else
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- fi
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- fi
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
- # openni: ???
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- "-DWITH_OPENNI=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
deleted file mode 100644
index b30e15a..0000000
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils fortran-2 python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-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"
-
-RDEPEND="
- app-arch/bzip2
- sys-libs/zlib
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
- eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
- gstreamer? (
- media-libs/gstreamer
- media-libs/gst-plugins-base
- )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- 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 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )
- dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.0-numpy.patch"
- "${FILESDIR}/${P}-convert_sets_to_options.patch"
- "${FILESDIR}/${P}-libsuffix.patch"
- "${FILESDIR}/${P}-nocaps.patch"
- "${FILESDIR}/${P}-libav-0.7.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(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)
- $(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 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)
- $(cmake-utils_use_with qt4 QT)
- $(cmake-utils_use_with opengl QT_OPENGL)
- $(cmake-utils_use_with tiff)
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with xine)
- )
-
- if use cuda; then
- if [ "$(gcc-version)" > "4.4" ]; then
- ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- else
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- fi
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- fi
-
- if use python && use examples; then
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
- else
- mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
- fi
-
- # things we want to be hard off or not yet figured out
- # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
- # openni: ???
- mycmakeargs+=(
- "-DUSE_OMIT_FRAME_POINTER=OFF"
- "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
- "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
- "-DBUILD_LATEX_DOCS=OFF"
- "-DENABLE_POWERPC=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- "-DUSE_O2=OFF"
- "-DUSE_O3=OFF"
- "-DUSE_FAST_MATH=OFF"
- "-DENABLE_SSE41=OFF"
- "-DENABLE_SSE42=OFF"
- "-DWITH_PVAPI=OFF"
- "-DWITH_UNICAP=OFF"
- "-DWITH_TBB=OFF"
- "-DWITH_OPENNI=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-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] 12+ messages in thread
end of thread, other threads:[~2012-12-12 21:46 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-14 18:43 [gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/ Andreas K. Huettel
-- strict thread matches above, loose matches on Subject: below --
2012-12-12 21:46 Andreas Hüttel
2011-12-01 0:45 Andreas Hüttel
2011-11-13 13:46 Andreas Hüttel
2011-11-13 13:46 Andreas Hüttel
2011-09-28 1:48 Andreas Hüttel
2011-09-18 18:36 Andreas Hüttel
2011-09-18 17:33 Andreas Hüttel
2011-08-28 14:31 Andreas Hüttel
2011-07-13 21:16 Andreas Hüttel
2011-05-14 18:43 Andreas K. Huettel
2011-05-14 18:43 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