Version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

5 files changed, 230 insertions, 16 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 731b27c7f2c4..2a26d474bbec 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.81 2012/09/11 14:03:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.82 2012/11/05 21:25:37 dilfridge Exp $
+
+*opencv-2.4.3 (05 Nov 2012)
+
+  05 Nov 2012; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.4.3.ebuild,
+  +files/opencv-2.4.3-gcc47.patch:
+  Version bump
 
   11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -opencv-2.3.1a-r20.ebuild, -opencv-2.4.0.ebuild,
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 61e3c537cc94..cccc8cdc453f 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -9,26 +9,29 @@ AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b
 AUX opencv-2.3.1a-libsuffix.patch 1949 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44 SHA512 353609bfa761833945afee5b78f5efe0feaf435409b6aca1780da28bfe77b966d0511b1c173cf58ccaea2b8fcd49bbcf6f270dbd46f32eea7282bdb2be8f32bf WHIRLPOOL 3479194bcb35b633ae2a0d6a10d6f7278b5f7cf1bcc9c5c333cfb61c900434d895b1f2d86f764c3717f8ddcf50ddcc4239a90c63787e6ee789edf3a2d4449081
 AUX opencv-2.3.1a-nocaps.patch 5220 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207 SHA512 4df5cc178246befdf2913877abfc0e842dc76ab59baa82423d48979b3c18077020755708995a4c20d1d7a3e6bbfa54c9e6907ea472fe07ef791fa16f717c0ce1 WHIRLPOOL f00c5aa6e2b15740eb022c4d52c3217f8fdcaad14f177e350f64b1c3dab039ae24d43537b1374967145c8bc9953750fccdf8236aaeb90821692799cd2c304f29
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
+AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4ee4159f6592af0e76e86b7b00 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220 WHIRLPOOL 52aa228d8ebf2ba51eb67cc31ba4eee27f43d5fc86d3b5028e32e2a8caf1350ebda70bab2a060f9a387312795788b575253d446380645e52e7cf10f57cad9a88
 DIST OpenCV-2.3.1a.tar.bz2 32669613 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c SHA512 6875eae92fa099766410dece37b65ee51c95eb8ed6d1bbe19b533c66361686b31bf5513f6558efdd37332e68b30c5a5f221d17492c00822aeb07efcbf956584d WHIRLPOOL 7cea733b5ea764b229b72565b3c8ea7b2665aa7063c98f97d05bc82d6a41000110a1935b9061050bf17fdf2cb3f382778ba924aa5c8ce7fbf96895a0317e4489
 DIST OpenCV-2.4.2.tar.bz2 52562911 SHA256 690023811e03e21df996291392fcf78e43e42ef557b9307503c74c74b4272c28 SHA512 1e009817553668e4040c7959e07b402d06d66f6d4743ac4da2e44a38bef6c73ae0fa454932f7aae778915d29f5d457248fa3488f5df208d1cfb5775a26e34f44 WHIRLPOOL 8412be6b0f51ec76cce9fcb1fc1450b4b50aa3a98a2ab7d312d62ea47fc2b40f997cf09843de048a71d2cc1b5b2f1bf5eea92696ad3d4f5f520c4f3c850266e1
+DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57
 EBUILD opencv-2.3.1a-r1.ebuild 4210 SHA256 725e02dea14c43c3fc5fc25970dbc884af6229211b78a174cdb587e45369cc09 SHA512 e4cb91055fd138f16a4def4eca90c791fdf372ab94b89d11b019776dcb60f8265600ae3b2d0e8843a01489ee440682c922e3e782a2b0c1f67e768880edca26b3 WHIRLPOOL e370a15429be343942c55a08e4fedf0bf5f6cdf1345520ca6d492266ab3c557dc2c96a2a82a50d7d171bf4cab677dca91b44a9ed2cdadb6fa4e6a5c9cbec5308
 EBUILD opencv-2.4.2.ebuild 4684 SHA256 22cef403f0b3bb855a4d0eb3488cc77ba3664d0fa75c19e378ad10cfa87493c5 SHA512 9975b9ddd1ef54132b141946151661684018b8fbdb36d8b03934eea100ca6f57a81f57140afe45d35b85b32aa2825b609eb6194024d760e9c8d56f13079b2a51 WHIRLPOOL 550d8427b2cc0f8541541bae1d6a16410d5ecd450b2d64a13351f5bfe8321db7e1dc9120e16636b6d90cf3ea897babcb1011bd557ee9bd1cd6b031d559abf446
-MISC ChangeLog 14534 SHA256 aa5bdf08012d2042e8b53d6003570f1116e297bb92b5d0bc4fa7d90f9b42e261 SHA512 f532d05dbf6fd1665c9301cb575feba1742d2f811bf48b0b7ff58a1b80ef9def63121654d7739dd23fc1c56ad0e382fdda46be4deef0ffb67106a505481cb095 WHIRLPOOL 67a3eef912f2e3d8a87d770505cb4d6ab5f79a8da22e0f94972c83a0b020e5af0a9b807e55af1cc6e1c2c67eba2afb54eb3d70ff63fde906b894034f1b3ccb1d
-MISC metadata.xml 1276 SHA256 136997ca68983dcc93f04a622699777946a73407f0a689cb9a0cab2760e42226 SHA512 5bc5b4cf280cb02b93b5a6393cab3b3a1a9b5d68139acd70491fb39996f5e7c8918628e4111e914d548281235bcf292da0ce726944a361a7a60d99d5d3c326c8 WHIRLPOOL ecb425f3275c633efd55f1f2dccae95c64151b9709f897635412ef66218876f4d4ce0f2387f7823f4bbe362913f85a0e6cd011507b46867bd00cb0842a7dc3e1
+EBUILD opencv-2.4.3.ebuild 4775 SHA256 20218b198a21427ee1b5bd7f8546b796ca4f86b797bc524fef7904fc3e1009d2 SHA512 b4eac9b4196e071831759a70acc8e7c38f702d9bfae896d4f376bd504df83d050d4549192c9069d6fc76e4488a2806a2c48f6ce7064aad35408cfd45e49a2403 WHIRLPOOL 8ee614c54b524263cae8c622001b6f35e4380366e883c7a7892c059ef38584b4b0c7a8cc5a6a9d13ba3bf4effbdca05e6ed13d3d2f0e2d1e472c135fea865cd9
+MISC ChangeLog 14693 SHA256 ddc57830c07a76e207c1e02be705d37ed4ad9037730477675900c4e017463172 SHA512 5529ea950bcfb47c848628ac4f406390af66e3512a7e584a4b35f06c864859714e66ce5e97fcf1f3493124547da7be72eaf4714f87e7834131d08d699b370277 WHIRLPOOL c8ce934f7d9c24638f6006a8fe32deda647898c96c2a42548e2a8f81441dee5ce2854816bae8eaa37e25af0d6b81cc2bac813d39d65ba2be6ca7ece501f84020
+MISC metadata.xml 1327 SHA256 572366f1f13fcaa7c7773ef255f519a6e8a8c94ef49eabb2ab58631d621a5d89 SHA512 e8b0b9c864e71871f27334f52f6b90d14132c75ea6b63f72e34f26770989a73b07cd50c2ca96a3b9aa42af95c6b83c39b405b7bd41c2d4c2ed35ad5a57966340 WHIRLPOOL e8a0532a83665b47064be8a41a6ca72d3e678e3797c7a971bf4b3817c95fb12895ac6cfc09eaff429a08fbadaef80fab250155bc2bdc43d628571796f3fce5d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQT0U1AAoJEEb+UGWnxTyHGfAQAICp/1gWNybq2k1JN+7FU/z3
-nMQTvp8PwDIMS4cZCSLJDs2ATZJVuLZpYdbt8Ti5+y8rkZJb9PH6sjoPa7mhBSIr
-LTSm5Ew4CTaM4Cp+5VOIG9d2Sp1XsrMnf4RFdLGLQUnF3PS8ciA3EpSnSW9m3Wl+
-bx7n0ERl3K5oFFTuuobM/V+YfuRSB9FZ/JTxdrKGTGsFez6ACoG6VVwo9+vAsRfG
-+joNls0bt6ydrPIZoBUG7foTaR3cNUR9AVq+M3DHkQ6sK/Z53D+f19x71F+HfrzC
-Rnj7Fu9kkThlNXywEzsuK6SHLJ0BP/hqX1Ynxr+0xkdC/VhHp8dwdfs//tSrL4yv
-K8laSN4EMHa27LKvAX8ar8s7stelPTUUiX0XcVK7OsMgr3ENciH+VI6HtlAujJ+D
-xDdeO4w3XTvPCG96q2ULamXc06LA/gZanpx4izltWWiIBUkigdaIKgzXZHSRPnb5
-DK2MpyJsWqbbseryGUJlsDzkVUIvqCHX2tRX8QVKrn04LxHVSKmPyrAJT96zL5gk
-gSUTO5mXqk3OK2Y3qVtD2WiOBSQ6LVTysZLp9xpcZOMxn8GG7R0C7cLt+pICD8SF
-AMfJfHG7/SvWR+jfTUPW+RhZFiZVKv2ELI+POBWFe0qdoZqCHLOq9k9rNVbh1yM8
-jlvuNFZllEX97Hkw66Hv
-=TUdz
+iQIcBAEBCAAGBQJQmC/JAAoJENwGBM22xffe2BwP/j/TQmQ0pWnsfJgyn4T2QbRe
+6V2hlZqVPlIXLxrBXftp5EpiY3v5VUB8qc+pLlXCCaSwGe923VoQEd8THyiNR9L9
++bKQPzFRWPY7Q2cKTdgIWuzSnRs9M7mAUR38QE7WPNRNT6gHDBc39JB1nleCPQxl
+Lw44KOq30ZXoeJWgjt7EhOSfkuzlUQiJMSBjOowPScytdvJmtRP70VTa4EfGV2qW
+ZaQC1lL2ome5x0RvpZMOQ7RU66NDp9lyh+hKdg7rc597N+uIzjjxF8bi83JLUJOX
+JFLg5PuAj+JH7tTG8oQgKEiZqlQZ+aDIw3/AvTHNo31sSTFeoENiiY9a++r1LhDj
+gsofbSL+3pMmmClrUdcfonGDGcgO5GalmVACgoAsupwxUPZ91WdbgbtE56tnUeAf
+lGIjTaYBB9DsW3q8YVk82BofAPtzIW0kqxTHQGtXHilz3UosBfHasRO+FHrj3i/r
+LKppd9PHkS5FDsnqtNDnsw/WUDETA+VrWo2NmJo52dWe7we7rp7SqxH8k9LJydlG
+KC0fizMUBly8St56wNi481LnLGyDynwPk2Akxmy0I6/AbrA4LOGu7G3FJlISmJbx
+dn/91MUj2opXQZ1CgYoJnMBrjx0KX6gTbaIjNMcHdBXbk216HlWWmnMAeAo8osd/
+quOYnxUCrkOU56u+Dh2l
+=EpYx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.4.3-gcc47.patch b/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
new file mode 100644
index 000000000000..13ac8f8fb58f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
@@ -0,0 +1,22 @@
+diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp
+--- OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp	2012-10-12 00:55:12.000000000 +0200
++++ OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp	2012-11-05 21:37:40.000000000 +0100
+@@ -47,6 +47,7 @@
+ 
+ #include "precomp.hpp"
+ #include "grfmt_tiff.hpp"
++#include "unistd.h"
+ 
+ namespace cv
+ {
+diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h OpenCV-2.4.3/modules/highgui/src/window_QT.h
+--- OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h	2012-10-18 00:55:38.000000000 +0200
++++ OpenCV-2.4.3/modules/highgui/src/window_QT.h	2012-11-05 21:38:41.000000000 +0100
+@@ -41,6 +41,7 @@
+ #define __OPENCV_HIGHGUI_QT_H__
+ 
+ #include "precomp.hpp"
++#include "unistd.h"
+ 
+ #if defined( HAVE_QT_OPENGL )
+ #include <QtOpenGL>
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index a35f3f87de2d..06482d11d4de 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -17,6 +17,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 	<flag name="ipp">Enable Intel Integrated Primitive 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>
+	<flag name="opencl">Add support for OpenCL</flag>
 	<flag name="tbb">Add support for the Intel threadingbuildingblocks library</flag>
 	<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
 </use>
diff --git a/media-libs/opencv/opencv-2.4.3.ebuild b/media-libs/opencv/opencv-2.4.3.ebuild
new file mode 100644
index 000000000000..0a9bb5e0195d
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.3.ebuild,v 1.1 2012/11/05 21:25:37 dilfridge Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+
+inherit base toolchain-funcs 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 ~amd64-linux"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-python/numpy
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.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 )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/glu )
+	png? ( media-libs/libpng )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-test:4
+		opengl? ( x11-libs/qt-opengl:4 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		$(cmake-utils_use_with ieee1394 1394)
+		-DWITH_AVFOUNDATION=OFF
+		-DWITH_CARBON=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 ipp)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with opencl)
+	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
+	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with opengl)
+		-DWITH_OPENNI=OFF					# not packaged
+		$(cmake-utils_use_with png)
+		-DWITH_PVAPI=OFF					# not packaged
+		$(cmake-utils_use_with qt4 QT)
+		-DWITH_QUICKTIME=OFF
+		$(cmake-utils_use_with threads TBB)
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF					# not packaged
+		$(cmake-utils_use_with v4l V4L)
+		-DWITH_VIDEOINPUT=OFF					# windows only
+		-DWITH_XIMEA=OFF					# windows only
+		$(cmake-utils_use_with xine)
+	# the build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build examples)
+		-DBUILD_PERF_TESTS=OFF
+		$(cmake-utils_use_build testprograms TESTS)
+	# install examples
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+	# build options
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+		-DENABLE_OMIT_FRAME_POINTER=OFF				#
+		-DENABLE_FAST_MATH=OFF					#
+		-DENABLE_SSE=OFF					# these options do nothing but
+		-DENABLE_SSE2=OFF					# add params to CFLAGS
+		-DENABLE_SSE3=OFF
+		-DENABLE_SSSE3=OFF
+		-DENABLE_SSE41=OFF
+		-DENABLE_SSE42=OFF
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use cuda; then
+		if [[ "$(gcc-version)" > "4.6" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( "-DWITH_CUDA=OFF" )
+			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+		else
+			mycmakeargs+=( "-DWITH_CUDA=ON" )
+			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+			mycmakeargs+=( "-DWITH_CUFFT=ON" )
+		fi
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+	fi
+
+	if 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
+	mycmakeargs+=(
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=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
+}