commit:     4f5b990bd068f98184e7ecfabf461a33275569c5
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 14:42:31 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 14:42:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5b990b

media-libs/opencv: disable pch for gcc-6.0 bug #617654

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/opencv/Manifest                         |   1 +
 .../opencv/files/opencv-2.4.13-gcc-6.0.patch       |  23 ++
 media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch |  11 +
 media-libs/opencv/opencv-2.4.13-r1.ebuild          | 240 +++++++++++++++
 media-libs/opencv/opencv-3.2.0-r1.ebuild           | 330 +++++++++++++++++++++
 5 files changed, 605 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 040a0468305..a529669fefa 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
+DIST opencv-2.4.13.tar.gz 91669572 SHA256 
94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff SHA512 
efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 WHIRLPOOL 
9fdbf2e47edeb8c177cb03ed5dc129475dd704c022975bc875d444a6e6c3df630f1151e738cf07fbe48343d0eb87723091131063fe776c63a386c46c0153f1d5
 DIST opencv-2.4.13.zip 94319943 SHA256 
fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 
b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
 WHIRLPOOL 
86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 DIST opencv-3.1.0.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 
57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
 WHIRLPOOL 
b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 
478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 
d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
 WHIRLPOOL 
18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353

diff --git a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch 
b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
new file mode 100644
index 00000000000..b0a5084752c
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
@@ -0,0 +1,23 @@
+From fb598bb76a0431aa3a880ecfa45054c996a070fb Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin <[email protected]>
+Date: Fri, 13 May 2016 13:28:09 +0300
+Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0
+
+Command line generation routine uses "-isystem" to include headers outside of 
"<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem 
/usr/include" option.
+---
+ cmake/OpenCVPCHSupport.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
+index 13619daf27e..e6585cae020 100644
+--- a/cmake/OpenCVPCHSupport.cmake
++++ b/cmake/OpenCVPCHSupport.cmake
+@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+         OUTPUT_VARIABLE gcc_compiler_version)
+     #MESSAGE("GCC Version: ${gcc_compiler_version}")
+-    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
++    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version 
VERSION_LESS "6.0.0")
+         SET(PCHSupport_FOUND TRUE)
+     ENDIF()
+ 

diff --git a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch 
b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
new file mode 100644
index 00000000000..457d3595e49
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVPCHSupport.cmake     2017-06-06 15:05:09.180022719 +0200
++++ b/cmake/OpenCVPCHSupport.cmake     2017-06-06 15:05:50.775022684 +0200
+@@ -14,7 +14,7 @@
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+-    IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
++    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version 
VERSION_LESS "6.0.0")
+         SET(PCHSupport_FOUND TRUE)
+     ENDIF()
+ 

diff --git a/media-libs/opencv/opencv-2.4.13-r1.ebuild 
b/media-libs/opencv/opencv-2.4.13-r1.ebuild
new file mode 100644
index 00000000000..b57b2652493
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.13-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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}.tar.gz -> ${P}.tar.gz"
+
+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}/${PN}-3.0.0-gles.patch"
+       "${FILESDIR}/${P}-gcc-6.0.patch"
+)
+#"${FILESDIR}/${P}-git-autodetect.patch
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+       use python && python-single-r1_pkg_setup
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # 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() {
+
+       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)
+               -DWITH_AVFOUNDATION=OFF
+               -DWITH_VTK=$(usex vtk)
+               -DWITH_EIGEN=$(usex eigen)
+               -DWITH_VFW=OFF
+               -DWITH_FFMPEG=$(usex ffmpeg)
+               -DWITH_GSTREAMER=$(usex gstreamer)
+               -DWITH_GSTREAMER_0_10=OFF
+               -DWITH_GTK=$(usex gtk)
+               -DWITH_IMAGEIO=OFF
+               -DWITH_IPP=$(usex ipp)
+               -DWITH_JASPER=$(usex jpeg2k)
+               -DWITH_JPEG=$(usex jpeg)
+               -DWITH_OPENEXR=$(usex openexr)
+               -DWITH_OPENGL=$(usex opengl)
+               -DWITH_OPENCL=$(usex opencl)
+               -DWITH_OPENNI=OFF
+               -DWITH_PNG=$(usex png)
+               -DWITH_PVAPI=OFF
+               -DWITH_GIGEAPI=OFF
+               -DWITH_WIN32UI=OFF
+               -DWITH_QUICKTIME=OFF
+               -DWITH_TBB=$(usex threads)
+               -DWITH_OPENMP=$(usex openmp)
+               -DWITH_CSTRIPES=OFF
+               -DWITH_TIFF=$(usex tiff)
+               -DWITH_UNICAP=OFF
+               -DWITH_V4L=$(usex v4l)
+               -DWITH_LIBV4L=$(usex v4l)
+               -DWITH_DSHOW=ON
+               -DWITH_MSMF=OFF
+               -DWITH_XIMEA=OFF
+               -DWITH_XINE=$(usex xine)
+               -DWITH_OPENCL=$(usex opencl)
+               -DWITH_OPENCLAMDFFT=$(usex opencl)
+               -DWITH_OPENCLAMDBLAS=$(usex opencl)
+               -DWITH_INTELPERC=OFF
+               -DWITH_JAVA=$(usex java)
+
+               # the build components
+               -DBUILD_SHARED_LIBS=ON
+               -DBUILD_ANDROID_EXAMPLES=OFF
+               -DBUILD_DOCS=OFF #too much dark magic in cmakelists
+               -DBUILD_EXAMPLES=$(usex examples)
+               -DBUILD_PERF_TESTS=OFF
+               -DBUILD_TESTS=$(usex testprograms)
+
+               # install examples
+               -DINSTALL_C_EXAMPLES=$(usex examples)
+               -DINSTALL_TESTS=$(usex testprograms)
+
+               # build options
+               -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+               -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
+}

diff --git a/media-libs/opencv/opencv-3.2.0-r1.ebuild 
b/media-libs/opencv/opencv-3.2.0-r1.ebuild
new file mode 100644
index 00000000000..6e33ecd87af
--- /dev/null
+++ b/media-libs/opencv/opencv-3.2.0-r1.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit toolchain-funcs cmake-utils python-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/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+       contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz 
-> ${P}_contrib.tar.gz
+               contrib_xfeatures2d? ( 
http://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
+LICENSE="BSD"
+SLOT="0/3.2" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 
gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl 
openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk 
webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it without the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+       cuda? ( tesseract? ( opencl ) )
+       gflags? ( contrib )
+       glog? ( contrib )
+       contrib_cvv? ( contrib qt5 )
+       contrib_hdf? ( contrib )
+       contrib_sfm? ( contrib eigen gflags glog )
+       opengl? ( || ( gtk qt5 ) )
+       python? ( ${PYTHON_REQUIRED_USE} )
+       tesseract? ( contrib )"
+
+# 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? ( !qt5 )
+#      openmp? ( !threads )
+
+RDEPEND="
+       app-arch/bzip2
+       sys-libs/zlib
+       cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+       contrib_hdf? ( sci-libs/hdf5 )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       gdal? ( sci-libs/gdal:= )
+       gflags? ( dev-cpp/gflags )
+       glog? ( dev-cpp/glog )
+       gphoto2? ( media-libs/libgphoto2 )
+       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 )
+       )
+       ieee1394? (
+               media-libs/libdc1394
+               sys-libs/libraw1394
+               )
+       ipp? ( sci-libs/ipp )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0 )
+       jpeg2k? ( media-libs/jasper:= )
+       lapack? ( virtual/lapack )
+       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}] )
+       qt5? (
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+               dev-qt/qttest:5
+               dev-qt/qtconcurrent:5
+               opengl? ( dev-qt/qtopengl:5 )
+       )
+       tesseract? ( app-text/tesseract[opencl=] )
+       threads? ( dev-cpp/tbb )
+       tiff? ( media-libs/tiff:0 )
+       v4l? ( >=media-libs/libv4l-0.8.3 )
+       vtk? ( sci-libs/vtk[rendering] )
+       webp? ( media-libs/libwebp )
+       xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       eigen? ( dev-cpp/eigen:3 )
+       java?  ( >=virtual/jdk-1.6 )"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-3.0.0-gles.patch"
+       "${FILESDIR}/${PN}-3.1.0-java-magic.patch"
+       "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
+       "${FILESDIR}/${P}-vtk.patch"
+       "${FILESDIR}/${P}-gcc-6.0.patch"
+)
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # remove bundled stuff
+       rm -rf 3rdparty || die "Removing 3rd party components failed"
+       sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+               -i CMakeLists.txt cmake/*cmake || die
+
+       if use contrib && use contrib_xfeatures2d; then
+               cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+               eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
+               mv "${WORKDIR}"/*.i 
"${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+       fi
+
+       java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+       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
+       GLOBALCMAKEARGS=(
+       # Optional 3rd party components
+       # ===================================================
+               -DWITH_1394=$(usex ieee1394)
+       #       -DWITH_AVFOUNDATION=OFF         # IOS
+               -DWITH_VTK=$(usex vtk)
+               -DWITH_EIGEN=$(usex eigen)
+               -DWITH_VFW=OFF                  # Video windows support
+               -DWITH_FFMPEG=$(usex ffmpeg)
+               -DWITH_GSTREAMER=$(usex gstreamer)
+               -DWITH_GSTREAMER_0_10=OFF       # Don't want this
+               -DWITH_GTK=$(usex gtk)
+               -DWITH_GTK_2_X=$(usex gtk)
+               -DWITH_IPP=$(usex ipp)
+               -DWITH_JASPER=$(usex jpeg2k)
+               -DWITH_JPEG=$(usex jpeg)
+               -DWITH_WEBP=$(usex webp)
+               -DWITH_OPENEXR=$(usex openexr)
+               -DWITH_OPENGL=$(usex opengl)
+               -DWITH_OPENVX=OFF
+               -DWITH_OPENNI=OFF               # Not packaged
+               -DWITH_OPENNI2=OFF              # Not packaged
+               -DWITH_PNG=$(usex png)
+               -DWITH_GDCM=OFF
+               -DWITH_PVAPI=OFF
+               -DWITH_GIGEAPI=OFF
+               -DWITH_ARAVIS=OFF
+               -DWITH_QT=$(usex qt5 5 OFF)
+               -DWITH_WIN32UI=OFF              # Windows only
+       #       -DWITH_QUICKTIME=OFF
+       #       -DWITH_QTKIT=OFF
+               -DWITH_TBB=$(usex threads)
+               -DWITH_OPENMP=$(usex openmp)
+               -DWITH_CSTRIPES=OFF
+               -DWITH_PTHREADS_PF=ON
+               -DWITH_TIFF=$(usex tiff)
+               -DWITH_UNICAP=OFF               # Not packaged
+               -DWITH_V4L=$(usex v4l)
+               -DWITH_LIBV4L=$(usex v4l)
+               -DWITH_DSHOW=ON                 # direct show supp
+               -DWITH_MSMF=OFF
+               -DWITH_XIMEA=OFF                # Windows only
+               -DWITH_XINE=$(usex xine)
+               -DWITH_CLP=OFF
+               -DWITH_OPENCL=$(usex opencl)
+               -DWITH_OPENCL_SVM=OFF
+               -DWITH_OPENCLAMDFFT=$(usex opencl)
+               -DWITH_OPENCLAMDBLAS=$(usex opencl)
+               -DWITH_DIRECTX=OFF
+               -DWITH_INTELPERC=OFF
+               -DWITH_JAVA=$(usex java) # Ant needed, no compile flag
+               -DWITH_IPP_A=OFF
+               -DWITH_MATLAB=OFF
+               -DWITH_VA=$(usex vaapi)
+               -DWITH_VA_INTEL=$(usex vaapi)
+               -DWITH_GDAL=$(usex gdal)
+               -DWITH_GPHOTO2=$(usex gphoto2)
+               -DWITH_LAPACK=$(usex lapack)
+       # ===================================================
+       # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+       # ===================================================
+               -DWITH_CUDA=$(usex cuda)
+               -DWITH_CUBLAS=$(usex cuda)
+               -DWITH_CUFFT=$(usex cuda)
+               -DWITH_NVCUVID=OFF
+#              -DWITH_NVCUVID=$(usex cuda)
+               -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" 
"")
+       # ===================================================
+       # OpenCV build components
+       # ===================================================
+               -DBUILD_SHARED_LIBS=ON
+               -DBUILD_ANDROID_EXAMPLES=OFF
+               -BUILD_opencv_apps=
+               -DBUILD_DOCS=OFF # Doesn't install anyways.
+               -DBUILD_EXAMPLES=$(usex examples)
+               -DBUILD_PERF_TESTS=OFF
+               -DBUILD_TESTS=$(usex testprograms)
+               -DBUILD_WITH_DEBUG_INFO=$(usex debug)
+       #       -DBUILD_WITH_STATIC_CRT=OFF
+               -DBUILD_WITH_DYNAMIC_IPP=OFF
+               -DBUILD_FAT_JAVA_LIB=$(usex java)
+       #       -DBUILD_ANDROID_SERVICE=OFF
+               -DBUILD_CUDA_STUBS=$(usex cuda)
+               -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib 
"${WORKDIR}/opencv_contrib-${PV}/modules" "")
+       # ===================================================
+       # OpenCV installation options
+       # ===================================================
+               -DINSTALL_CREATE_DISTRIB=OFF
+               -DINSTALL_C_EXAMPLES=$(usex examples)
+               -DINSTALL_TESTS=$(usex testprograms)
+               -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+       #       -DINSTALL_ANDROID_EXAMPLES=OFF
+               -DINSTALL_TO_MANGLED_PATHS=OFF
+       # ===================================================
+       # OpenCV build options
+       # ===================================================
+               -DENABLE_CCACHE=OFF
+               -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+               -DENABLE_SOLUTION_FOLDERS=OFF
+               -DENABLE_PROFILING=OFF
+               -DENABLE_COVERAGE=OFF
+               -DENABLE_OMIT_FRAME_POINTER=OFF
+               -DENABLE_FAST_MATH=OFF
+               -DENABLE_SSE=OFF
+               -DENABLE_SSE2=OFF
+               -DENABLE_SSE3=OFF
+               -DENABLE_SSSE3=OFF
+               -DENABLE_SSE41=OFF
+               -DENABLE_SSE42=OFF
+               -DENABLE_POPCNT=OFF
+               -DENABLE_AVX=OFF
+               -DENABLE_AVX=OFF
+               -DENABLE_AVX2=OFF
+               -DENABLE_FMA3=OFF
+               -DENABLE_NEON=OFF
+
+               -DHAVE_opencv_java=$(usex java YES NO)
+               -DENABLE_NOISY_WARNINGS=OFF
+               -DOPENCV_WARNINGS_ARE_ERRORS=OFF
+               -DENABLE_IMPL_COLLECTION=OFF
+               -DENABLE_INSTRUMENTATION=OFF
+               -DGENERATE_ABI_DESCRIPTOR=OFF
+               -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+       # ===================================================
+       # things we want to be hard off or not yet figured out
+       # ===================================================
+               -DBUILD_PACKAGE=OFF
+               -DENABLE_PROFILING=OFF
+       # ===================================================
+       # things we want to be hard enabled not worth useflag
+       # ===================================================
+               -DCMAKE_SKIP_RPATH=ON
+               -DOPENCV_DOC_INSTALL_PATH=
+       )
+
+       # ===================================================
+       # OpenCV Contrib Modules
+       # ===================================================
+       if use contrib; then
+               GLOBALCMAKEARGS+=(
+                       -DBUILD_opencv_dnn=OFF
+                       -DBUILD_opencv_dnns_easily_fooled=OFF
+                       -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d 
ON OFF)
+                       -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
+                       -DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
+                       -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
+               )
+       fi
+
+       # workaround for bug 413429
+       tc-export CC CXX
+
+       local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
+               -DPYTHON_EXECUTABLE=OFF
+               -DINSTALL_PYTHON_EXAMPLES=OFF
+       )
+
+       cmake-utils_src_configure
+}
+
+python_module_compile() {
+       local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+       # Set all python variables to load the correct Gentoo paths
+       mycmakeargs+=(
+               # cheap trick: python_setup sets one of them as a symlink
+               # to the correct interpreter, and the other to fail-wrapper
+               -DPYTHON2_EXECUTABLE=$(type -P python2)
+               -DPYTHON3_EXECUTABLE=$(type -P python3)
+               -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+       )
+
+       # Compile and install all at once because configuration will be wiped
+       # for each impl of Python
+       BUILD_DIR="${WORKDIR}"/${P}_build
+       cd "${BUILD_DIR}" || die "cd failed"
+
+       # Regenerate cache file. Can't use rebuild_cache as it won't
+       # have the Gentoo specific options.
+       rm -rf CMakeCache.txt || die "rm failed"
+       cmake-utils_src_configure
+       cmake-utils_src_compile
+       cmake-utils_src_install
+
+       # Remove compiled binary so new version compiles
+       # Avoid conflicts with new module builds as build system doesn't
+       # really support it.
+       rm -rf modules/python2 || die "rm failed"
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       # Build and install the python modules for all targets
+       use python && python_foreach_impl python_module_compile
+}

Reply via email to