[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/, media-libs/opencv/files/

["Amy Winston" <amynka@gentoo.org>]

commit:     dbd568dda672d12c7bf7b6a3b4522e3631af1bb3
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 18:23:58 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 18:25:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd568dd

media-libs/opencv: eapi=6 bump

- Fix cuda bug #577410
- Add qt5 support
- Remove doc useflag bug #556198

Package-Manager: portage-2.2.28

 .../files/opencv-2.4.12-git-autodetect.patch       |   4 +-
 media-libs/opencv/opencv-2.4.12-r1.ebuild          | 241 +++++++++++++++++++++
 2 files changed, 243 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
index e981c37..8d6fcaf 100644
--- a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
+++ b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
@@ -1,5 +1,5 @@
---- opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt.old	2016-04-07 14:44:17.461912634 +0200
-+++ opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt	2016-04-07 14:45:10.674910396 +0200
+--- a/CMakeLists.txt	2016-04-07 14:44:17.461912634 +0200
++++ b/CMakeLists.txt	2016-04-07 14:45:10.674910396 +0200
 @@ -388,32 +388,32 @@
  # ----------------------------------------------------------------------------
  

diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
new file mode 100644
index 0000000..16b48f7
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.org"
+
+SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( qt4 qt5 )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		dev-qt/qtconcurrent:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
+	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
+	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+	"${FILESDIR}/${P}-git-autodetect.patch"
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled stuff
+	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		-DWITH_1394=$(usex ieee1394 ON OFF)
+		-DWITH_AVFOUNDATION=OFF
+		-DWITH_VTK=$(usex vtk ON OFF)
+		-DWITH_EIGEN=$(usex eigen ON OFF)
+		-DWITH_VFW=OFF
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER=$(usex gstreamer ON OFF)
+		-DWITH_GSTREAMER_0_10=OFF
+		-DWITH_GTK=$(usex gtk ON OFF)
+		-DWITH_IMAGEIO=OFF
+		-DWITH_IPP=$(usex ipp ON OFF)
+		-DWITH_JASPER=$(usex jpeg2k ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_OPENEXR=$(usex openexr ON OFF)
+		-DWITH_OPENGL=$(usex opengl ON OFF)
+		-DWITH_OPENCL=$(usex opencl ON OFF)
+		-DWITH_OPENNI=OFF
+		-DWITH_PNG=$(usex png ON OFF)
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_WIN32UI=OFF
+		-DWITH_QUICKTIME=OFF
+		-DWITH_TBB=$(usex threads ON OFF)
+		-DWITH_OPENMP=$(usex openmp ON OFF)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_TIFF=$(usex tiff ON OFF)
+		-DWITH_UNICAP=OFF
+		-DWITH_V4L=$(usex v4l ON OFF)
+		-DWITH_LIBV4L=$(usex v4l ON OFF)
+		-DWITH_DSHOW=ON
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF
+		-DWITH_XINE=$(usex xine ON OFF)
+		-DWITH_OPENCL=$(usex opencl ON OFF)
+		-DWITH_OPENCLAMDFFT=$(usex opencl ON OFF)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl ON OFF)
+		-DWITH_INTELPERC=OFF
+		-DWITH_JAVA=$(usex java ON OFF)
+
+		# the build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_DOCS=OFF #too much dark magic in cmakelists
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(usex testprograms ON OFF)
+
+		# install examples
+		-DINSTALL_C_EXAMPLES=$(usex examples ON OFF)
+		-DINSTALL_TESTS=$(usex testprograms ON OFF)
+
+		# build options
+		-DENABLE_PRECOMPILED_HEADERS=$(usex pch ON OFF)
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+		-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 qt4; then
+		mycmakeargs+=( -DWITH_QT=4 )
+	elif use qt5; then
+		mycmakeargs+=( -DWITH_QT=5 )
+	else
+		mycmakeargs+=( -DWITH_QT=OFF )
+	fi
+
+	if use cuda; then
+		if [[ "$(gcc-version)" > "4.8" ]]; then
+			# bug 577410 
+			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
+			ewarn "CUDA and >=sys-devel/gcc-4.9 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 )
+			mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
+		fi
+	else
+		mycmakeargs+=( -DWITH_CUDA=OFF )
+		mycmakeargs+=( -DWITH_CUBLAS=OFF )
+		mycmakeargs+=( -DWITH_CUFFT=OFF )
+	fi
+
+	if use examples && use python; 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_PACKAGE=OFF
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}