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

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 33 insertions, 171 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/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
-}