Add patch by Nicolas Schlumberger to fix gcc-4.7 compilation, bug 413159

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 51 insertions, 183 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index b724a225d8f3..eb81806fac42 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2012/05/04 13:26:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.71 2012/05/06 20:05:25 dilfridge Exp $
+
+  06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.3.1a.ebuild,
+  opencv-2.3.1a-r1.ebuild, opencv-2.3.1a-r20.ebuild,
+  +files/opencv-2.3.1a-gcc47.patch:
+  Add patch by Nicolas Schlumberger to fix gcc-4.7 compilation, bug 413159
 
   04 May 2012; Johannes Huber <johu@gentoo.org> opencv-2.3.0.ebuild,
   opencv-2.3.1a-r1.ebuild, opencv-2.3.1a-r20.ebuild, opencv-2.3.1a.ebuild:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3fdd475f10b1..ed2dbba9615c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,25 +8,31 @@ AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f
 AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
 AUX opencv-2.3.1a-True-False.patch 5120 RMD160 a8b22fa625dab6a6aa589226bab3169594bab2bb SHA1 f0e8e393c57ea70a4e1b78b7a56413e04eb3ebfd SHA256 8076260c01e8ec22d30ced74be64b158e96408b81990a7d14f031170e3165f7f
 AUX opencv-2.3.1a-convert_sets_to_options.patch 10029 RMD160 20e811ed397740cb7d0238b11a9fef1e265d6c27 SHA1 81cd8bb7c5df0a0cd9195d2ec273d47f41428839 SHA256 7ac857ed496245cb39ccbb4ec7bfdcc4128654def5732bb0de3631404a7ffc2c
+AUX opencv-2.3.1a-gcc47.patch 811 RMD160 5dcf1c607f40791ae07727f1e49261b42f724d4e SHA1 17aa20fa5c802f4445d2235ac1fc5482050c0ce7 SHA256 62defcf34b6e4c00ddfe67d64234b68ba5ac1315037d427aa81133399e2b430e
 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.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.3.0.ebuild 4129 RMD160 71db1389a483a9f71830a338116a4206100ce9db SHA1 cb5ffec76058d6b1e4f608bfc941c6fb8a122c61 SHA256 ec5cba3b3c911f4457c17a3c1dc89617191c8f85e4957c06dea7ce4791d72edc
-EBUILD opencv-2.3.1a-r1.ebuild 4173 RMD160 ba0c2978409a1685ec26b4378aff7b179279e412 SHA1 812ed804da24e4f2d299c87b69d0c7e7d2227305 SHA256 34dee1577e2e06a2fa0a4200220c44a9f43b3c300a5bc71d80c2d8d45c194d48
-EBUILD opencv-2.3.1a-r20.ebuild 4215 RMD160 05840bc1c2217b79e0c9a017e67e87576ddc6ba7 SHA1 4fadd3c8ca458a755c050764694ab0878144e5d6 SHA256 45153142c69701f487e9038a8e2fd69e0259882a96925debc532dd36e56c2c59
-EBUILD opencv-2.3.1a.ebuild 4162 RMD160 17183a2dc1e986553f136580ae22560504e7221c SHA1 6a5922b3fa3138a21d42e9919505d304849c44cc SHA256 d50067db2162022c998a811a3cab820403919ab1930a353a1a4f1e8ee14980e8
-MISC ChangeLog 12516 RMD160 130ea32a25e1b098d08869bd1d7a726be225aecb SHA1 f335263bdbba213c5cf791f80fc64c52cea6b070 SHA256 0e072bfb05bcee49c760fe4ffeb5dca7e0b3df9fccf7ab912a86a7bfd585dc30
+EBUILD opencv-2.3.1a-r1.ebuild 4210 RMD160 8ef2672e682a35df6814ab3d73b31417b5315ce4 SHA1 1f37a1153f046606f3f6f35cac01b7e13fe716a8 SHA256 d1f2a0dc90b0eaaf0b172aebeb3a3195a99cecc189d118e02c26870165ba4bc5
+EBUILD opencv-2.3.1a-r20.ebuild 4253 RMD160 1dade03db32a14a20037deae7a2ca810e18a89bb SHA1 14ef77d1a7e39a9c8a4367034b08923abd7c3e29 SHA256 0101773f11add8197935bf854c0290f50fc3f735233d48d545a1bbe3f4fbc314
+MISC ChangeLog 12766 RMD160 538d14f18d1cb4d88eff000e1a1bdd638e868e85 SHA1 f7d8befc8c2e9263210a16b23644993a36f47eec SHA256 c94bcf1c9040dd9b848a9ff2d6f96961477716d37af4a8b8fff8f2f4b3a21777
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPo9kQAAoJEO+t9ga+3I3aQK4IAMCfWDkCi/OMVfcQopRpyWd9
-L1cgJomCXVmeKmuIwXl6aCiU23IxugUVUpgQdyR16vz6gk6Z6yiKveSMqFcTKb15
-FMiAr3+DuBM5oKZCkMkarSu8bu1SO/H2qZ0tIGtKPWXq9nlgFPFLTTi/Q2EHYMaH
-HEacKts8bg9W/GzMqD/oiXPl7V+ndpoQPAHVj784hFSyF6iaeOfKWG72fLgotsla
-kuxIGfYR6/og80evDKl370GZ791Rjq2XOXvGTLRGtT007ws0zFP965yp1eWd3Y/K
-M+zaLwkk4ARQpRhE8FV/8SyTNQiRDTFvxspPX2kTX5FeVq12hhoX/9dEpU+KRW8=
-=xKXG
+iQIcBAEBCgAGBQJPptmpAAoJENwGBM22xffenDwP/25jSU3nwf0NmvpdLEcyNnQ9
+zFQr9lyNdXkoJgPUE8GK992S7gTNko4NFWoFHWvZ3pAgIn5TBgqYiofjP3MJlCOF
+os7VHHlILG0kcLN8dlDksTNd46DGE+bglMFhSS8X4dO5EPfjg4D3+gEMqYGp5ska
+RyUKeMrtuFJbMJ9icqqBfkuCC18sQVp7zQLOnWK7dFKKRjIqc5mB30r4U1WlK8WX
+k0rBMd5/YBMdVHD6W2o0abntoUrxoPyLSt5vimDjc1heOYwOix8Blq7GhU0o+pwD
+KUXVMpjYs2ghRpJsyL+71Iu3y/igMpMAdIsp+uMWgXlLXVcuGIHIO7YBiZWiXgun
+uIkPyHYvpH+iylOd4+PkGAnzeymYcp5aqfL6We60eINPUJmOaOWlXAuHo+vn0PwS
+C7n2uKfmO/jlJLw0jDrWGDWkVgBab5oQlJByCBRZuZ8rZRmavNSHSGWOe+FoIf6D
+m6gKKzN/AjYUaLJJMAQJlbRERB4+8G/f2HnkeujTF16YiuQpS1zLp+ddQfqD/FNl
+vdpRiEPy7l9rPPo/QZFOEMN3/i8ZC/8i1lWJ5wvUM2gqU6NZGj9yg7YRZIAAhD3d
+IG45L8WfAPYJUGEVPpPQkv6mO7bN3xPlXm7+e5njGuuOSvTF9AfYQ1D6c/yvjHmx
+W7y07JLo4kJX+IvlP0uv
+=VrH3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch b/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
new file mode 100644
index 000000000000..4a7263f4babe
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
@@ -0,0 +1,22 @@
+diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp
+--- OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp	2011-09-12 20:41:29.000000000 +0200
++++ OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp	2012-05-06 22:02:17.041467539 +0200
+@@ -47,6 +47,7 @@
+ 
+ #include "precomp.hpp"
+ #include "grfmt_tiff.hpp"
++#include "unistd.h"
+ 
+ namespace cv
+ {
+diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h OpenCV-2.3.1/modules/highgui/src/window_QT.h
+--- OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h	2011-09-12 20:41:29.000000000 +0200
++++ OpenCV-2.3.1/modules/highgui/src/window_QT.h	2012-05-06 22:02:58.208469764 +0200
+@@ -42,6 +42,7 @@
+ 

+ 

+ #include "precomp.hpp"

++#include "unistd.h"

+ 

+ #if defined( HAVE_QT_OPENGL )

+ #include <QtOpenGL>

diff --git a/media-libs/opencv/opencv-2.3.1a-r1.ebuild b/media-libs/opencv/opencv-2.3.1a-r1.ebuild
index cfdf952c09c7..ace0a7842da1 100644
--- a/media-libs/opencv/opencv-2.3.1a-r1.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1a-r1.ebuild,v 1.6 2012/05/04 13:26:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r1.ebuild,v 1.7 2012/05/06 20:05:25 dilfridge Exp $
 
 EAPI=3
 
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-nocaps.patch"
 	"${FILESDIR}/${P}-libav-0.7.patch"
 	"${FILESDIR}/${P}-True-False.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
diff --git a/media-libs/opencv/opencv-2.3.1a-r20.ebuild b/media-libs/opencv/opencv-2.3.1a-r20.ebuild
index 5817cff4e440..4a59f179273a 100644
--- a/media-libs/opencv/opencv-2.3.1a-r20.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a-r20.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1a-r20.ebuild,v 1.2 2012/05/04 13:26:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r20.ebuild,v 1.3 2012/05/06 20:05:25 dilfridge Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 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="
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-nocaps.patch"
 	"${FILESDIR}/${P}-libav-0.7.patch"
 	"${FILESDIR}/${P}-True-False.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
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 f34d0fb74fb2..000000000000
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.3.1a.ebuild,v 1.7 2012/05/04 13:26:36 johu Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 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 ~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 )
-	virtual/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() {
-	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
-}