commit:     f3c8fe50642f04ec8434ee96f153689cedb8ec5c
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 19:23:46 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:26:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c8fe50

media-libs/opencv: version bump 3.4.1

Closes: https://bugs.gentoo.org/642800
Closes: https://bugs.gentoo.org/633900
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/opencv/Manifest                         |   4 +
 .../files/opencv-3.4.0-disable-download.patch      |  29 ++
 media-libs/opencv/metadata.xml                     |   1 +
 media-libs/opencv/opencv-3.4.1.ebuild              | 495 +++++++++++++++++++++
 4 files changed, 529 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b193d22127a..26353736e85 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,5 +6,9 @@ DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 
6d44263792b9cd2d009c7eeaddc2ef87acb014
 DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 
6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7
 SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 
9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34
 SHA512 
13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
 DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 
53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b
 SHA512 
ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
+DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 
58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c
 SHA512 
2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
+DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 
2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf
 SHA512 
96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
+DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 
87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac
 SHA512 
e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
+DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 
63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc
 SHA512 
431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 
85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562
 SHA512 
5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 
1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63
 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44

diff --git a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch 
b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch
new file mode 100644
index 00000000000..245ad3b3d02
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt   2018-05-13 20:47:11.635871328 +0200
++++ b/CMakeLists.txt   2018-05-13 20:47:49.289872617 +0200
+@@ -187,6 +187,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF)
++OCV_OPTION(ENABLE_DOWNLOAD "Enable download during configure" ON)
+ 
+ # 3rd party libs
+ OCV_OPTION(BUILD_ZLIB               "Build zlib from source"             
WIN32 OR APPLE)
+
+--- a/cmake/OpenCVDownload.cmake       2018-05-13 21:22:14.966943336 +0200
++++ b/cmake/OpenCVDownload.cmake       2018-05-13 21:23:15.959945424 +0200
+@@ -32,6 +32,7 @@
+ 
+ 
+ function(ocv_download)
++ if(ENABLE_DOWNLOAD)
+   cmake_parse_arguments(DL "UNPACK;RELATIVE_URL" 
"FILENAME;HASH;DESTINATION_DIR;ID;STATUS" "URL" ${ARGN})
+ 
+   macro(ocv_download_log)
+@@ -236,4 +237,7 @@
+   if(OCV_DOWNLOAD_HASH_NAME)
+     set(${OCV_DOWNLOAD_HASH_NAME} "${DL_HASH}" CACHE INTERNAL "")
+   endif()
++ else()
++  message( "Download was disabled during configure phase by 
ENABLE_DOWNLOAD=OFF" )
++ endif()
+ endfunction()

diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 5e3541cd325..f87770fadaf 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -27,6 +27,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego 
Motion, Motion Under
                <flag restrict="&gt;=media-libs/opencv-3.3.0" 
name="contrib_dnn">DNN module contrib requires tiny dnn</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag>
+               <flag restrict="&gt;=media-libs/opencv-3.4.0" 
name="dnn_samples">Download dnn caffeemodel samples</flag>
                <flag name="opencl">Add support for OpenCL</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="tesseract">Use Google's OCR Engine</flag>
                <flag name="testprograms">Build and install programs for 
testing OpenCV (performance)</flag>

diff --git a/media-libs/opencv/opencv-3.4.1.ebuild 
b/media-libs/opencv/opencv-3.4.1.ebuild
new file mode 100644
index 00000000000..0f07d45bf9b
--- /dev/null
+++ b/media-libs/opencv/opencv-3.4.1.ebuild
@@ -0,0 +1,495 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
+
+DESCRIPTION="A collection of algorithms and sample code for various computer 
vision problems"
+HOMEPAGE="https://opencv.org";
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+       dnn_samples? ( 
https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz
 )
+       contrib? (
+               https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> 
${P}_contrib.tar.gz
+               contrib_dnn? ( 
https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> 
tiny-dnn-${TINY_DNN_PV}.tar.gz
+                              
https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
+               )
+               contrib_xfeatures2d? ( 
https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+       )"
+
+LICENSE="BSD"
+SLOT="0/3.4.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm 
contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 
cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt 
cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples 
+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"
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+       cpu_flags_x86_sse
+       cpu_flags_x86_sse2
+       cuda? ( tesseract? ( opencl ) )
+       dnn_samples? ( examples )
+       gflags? ( contrib )
+       glog? ( contrib )
+       contrib_cvv? ( contrib qt5 )
+       contrib_dnn? ( contrib )
+       contrib_hdf? ( contrib )
+       contrib_sfm? ( contrib eigen gflags glog )
+       contrib_xfeatures2d? ( contrib cuda )
+       java? ( python )
+       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[${MULTILIB_USEDEP}]
+       dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+       sys-libs/zlib[${MULTILIB_USEDEP}]
+       cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+       contrib_hdf? ( sci-libs/hdf5 )
+       ffmpeg? (
+               libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+               !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+       )
+       gdal? ( sci-libs/gdal:= )
+       gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+       glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
+       gstreamer? (
+               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+               media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+       )
+       gtk? (
+               dev-libs/glib:2[${MULTILIB_USEDEP}]
+               x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+               opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
+       )
+       ieee1394? (
+               media-libs/libdc1394[${MULTILIB_USEDEP}]
+               sys-libs/libraw1394[${MULTILIB_USEDEP}]
+       )
+       ipp? ( sci-libs/ipp )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+       jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+       lapack? ( virtual/lapack )
+       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+       openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+       opengl? (
+               virtual/opengl[${MULTILIB_USEDEP}]
+               virtual/glu[${MULTILIB_USEDEP}]
+       )
+       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+       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[${MULTILIB_USEDEP}] )
+       tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+       v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+       vtk? ( sci-libs/vtk[rendering] )
+       webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
+       xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig[${MULTILIB_USEDEP}]
+       contrib_dnn? ( dev-libs/cereal )
+       eigen? ( dev-cpp/eigen:3 )
+       java?  ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/opencv2/cvconfig.h
+       /usr/include/opencv2/opencv_modules.hpp
+       # [contrib_cvv]
+       /usr/include/opencv2/cvv.hpp
+       /usr/include/opencv2/cvv/call_meta_data.hpp
+       /usr/include/opencv2/cvv/cvv.hpp
+       /usr/include/opencv2/cvv/debug_mode.hpp
+       /usr/include/opencv2/cvv/dmatch.hpp
+       /usr/include/opencv2/cvv/filter.hpp
+       /usr/include/opencv2/cvv/final_show.hpp
+       /usr/include/opencv2/cvv/show_image.hpp
+       # [contrib_hdf]
+       /usr/include/opencv2/hdf.hpp
+       /usr/include/opencv2/hdf/hdf5.hpp
+       # [vtk]
+       /usr/include/opencv2/viz.hpp
+       /usr/include/opencv2/viz/types.hpp
+       /usr/include/opencv2/viz/viz3d.hpp
+       /usr/include/opencv2/viz/vizcore.hpp
+       /usr/include/opencv2/viz/widget_accessor.hpp
+       /usr/include/opencv2/viz/widgets.hpp
+       # [cudev]
+       /usr/include/opencv2/cudaarithm.hpp
+       /usr/include/opencv2/cudabgsegm.hpp
+       /usr/include/opencv2/cudacodec.hpp
+       /usr/include/opencv2/cudafeatures2d.hpp
+       /usr/include/opencv2/cudafilters.hpp
+       /usr/include/opencv2/cudaimgproc.hpp
+       /usr/include/opencv2/cudalegacy.hpp
+       /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+       /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+       /usr/include/opencv2/cudalegacy/NCV.hpp
+       /usr/include/opencv2/cudalegacy/NCVPyramid.hpp
+       /usr/include/opencv2/cudalegacy/NPP_staging.hpp
+       /usr/include/opencv2/cudaobjdetect.hpp
+       /usr/include/opencv2/cudaoptflow.hpp
+       /usr/include/opencv2/cudastereo.hpp
+       /usr/include/opencv2/cudawarping.hpp
+       /usr/include/opencv2/cudev/block/block.hpp
+       /usr/include/opencv2/cudev/block/detail/reduce.hpp
+       /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
+       /usr/include/opencv2/cudev/block/dynamic_smem.hpp
+       /usr/include/opencv2/cudev/block/reduce.hpp
+       /usr/include/opencv2/cudev/block/scan.hpp
+       /usr/include/opencv2/cudev/block/vec_distance.hpp
+       /usr/include/opencv2/cudev/common.hpp
+       /usr/include/opencv2/cudev/expr/binary_func.hpp
+       /usr/include/opencv2/cudev/expr/binary_op.hpp
+       /usr/include/opencv2/cudev/expr/color.hpp
+       /usr/include/opencv2/cudev/expr/deriv.hpp
+       /usr/include/opencv2/cudev/expr/expr.hpp
+       /usr/include/opencv2/cudev/expr/per_element_func.hpp
+       /usr/include/opencv2/cudev/expr/reduction.hpp
+       /usr/include/opencv2/cudev/expr/unary_func.hpp
+       /usr/include/opencv2/cudev/expr/unary_op.hpp
+       /usr/include/opencv2/cudev/expr/warping.hpp
+       /usr/include/opencv2/cudev/functional/color_cvt.hpp
+       /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
+       /usr/include/opencv2/cudev/functional/functional.hpp
+       /usr/include/opencv2/cudev/functional/tuple_adapter.hpp
+       /usr/include/opencv2/cudev/grid/copy.hpp
+       /usr/include/opencv2/cudev/grid/detail/copy.hpp
+       /usr/include/opencv2/cudev/grid/detail/histogram.hpp
+       /usr/include/opencv2/cudev/grid/detail/integral.hpp
+       /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
+       /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
+       /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
+       /usr/include/opencv2/cudev/grid/detail/reduce.hpp
+       /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
+       /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
+       /usr/include/opencv2/cudev/grid/detail/split_merge.hpp
+       /usr/include/opencv2/cudev/grid/detail/transform.hpp
+       /usr/include/opencv2/cudev/grid/detail/transpose.hpp
+       /usr/include/opencv2/cudev/grid/histogram.hpp
+       /usr/include/opencv2/cudev/grid/integral.hpp
+       /usr/include/opencv2/cudev/grid/pyramids.hpp
+       /usr/include/opencv2/cudev/grid/reduce.hpp
+       /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
+       /usr/include/opencv2/cudev/grid/split_merge.hpp
+       /usr/include/opencv2/cudev/grid/transform.hpp
+       /usr/include/opencv2/cudev/grid/transpose.hpp
+       /usr/include/opencv2/cudev.hpp
+       /usr/include/opencv2/cudev/ptr2d/constant.hpp
+       /usr/include/opencv2/cudev/ptr2d/deriv.hpp
+       /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
+       /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
+       /usr/include/opencv2/cudev/ptr2d/glob.hpp
+       /usr/include/opencv2/cudev/ptr2d/gpumat.hpp
+       /usr/include/opencv2/cudev/ptr2d/interpolation.hpp
+       /usr/include/opencv2/cudev/ptr2d/lut.hpp
+       /usr/include/opencv2/cudev/ptr2d/mask.hpp
+       /usr/include/opencv2/cudev/ptr2d/remap.hpp
+       /usr/include/opencv2/cudev/ptr2d/resize.hpp
+       /usr/include/opencv2/cudev/ptr2d/texture.hpp
+       /usr/include/opencv2/cudev/ptr2d/traits.hpp
+       /usr/include/opencv2/cudev/ptr2d/transform.hpp
+       /usr/include/opencv2/cudev/ptr2d/warping.hpp
+       /usr/include/opencv2/cudev/ptr2d/zip.hpp
+       /usr/include/opencv2/cudev/util/atomic.hpp
+       /usr/include/opencv2/cudev/util/detail/tuple.hpp
+       /usr/include/opencv2/cudev/util/detail/type_traits.hpp
+       /usr/include/opencv2/cudev/util/limits.hpp
+       /usr/include/opencv2/cudev/util/saturate_cast.hpp
+       /usr/include/opencv2/cudev/util/simd_functions.hpp
+       /usr/include/opencv2/cudev/util/tuple.hpp
+       /usr/include/opencv2/cudev/util/type_traits.hpp
+       /usr/include/opencv2/cudev/util/vec_math.hpp
+       /usr/include/opencv2/cudev/util/vec_traits.hpp
+       /usr/include/opencv2/cudev/warp/detail/reduce.hpp
+       /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
+       /usr/include/opencv2/cudev/warp/reduce.hpp
+       /usr/include/opencv2/cudev/warp/scan.hpp
+       /usr/include/opencv2/cudev/warp/shuffle.hpp
+       /usr/include/opencv2/cudev/warp/warp.hpp
+)
+
+PATCHES=(
+       "${FILESDIR}/${PN}-3.0.0-gles.patch"
+       "${FILESDIR}/${PN}-3.4.0-disable-download.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 dnn_samples; then
+               mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" 
"${WORKDIR}/${P}/samples/dnn/" || die
+       fi
+
+       if use contrib; then
+               cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+               eapply 
"${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
+
+               if use contrib_xfeatures2d; then
+                       mv "${WORKDIR}"/*.i 
"${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+               fi
+       fi
+
+       java-pkg-opt-2_src_prepare
+
+       # this really belongs in src_prepare() too
+       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
+}
+
+multilib_src_configure() {
+       # please dont sort here, order is the same as in CMakeLists.txt
+       GLOBALCMAKEARGS=(
+       # Optional 3rd party components
+       # ===================================================
+               -DENABLE_DOWNLOAD=OFF
+               -DWITH_1394=$(usex ieee1394)
+       #       -DWITH_AVFOUNDATION=OFF # IOS
+               -DWITH_VTK=$(multilib_native_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=$(multilib_native_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=$(multilib_native_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=$(multilib_native_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_IPP_A=OFF
+               -DWITH_MATLAB=OFF
+               -DWITH_VA=$(usex vaapi)
+               -DWITH_VA_INTEL=$(usex vaapi)
+               -DWITH_GDAL=$(multilib_native_usex gdal)
+               -DWITH_GPHOTO2=$(usex gphoto2)
+               -DWITH_LAPACK=$(multilib_native_usex lapack)
+               -DWITH_ITT=OFF # 3dparty libs itt_notify
+       # ===================================================
+       # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+       # ===================================================
+               -DWITH_CUDA=$(multilib_native_usex cuda)
+               -DWITH_CUBLAS=$(multilib_native_usex cuda)
+               -DWITH_CUFFT=$(multilib_native_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_JAVA=$(multilib_native_usex java) # Ant needed, no 
compile flag
+               -DBUILD_ANDROID_EXAMPLES=OFF
+               -BUILD_opencv_apps=
+               -DBUILD_DOCS=OFF # Doesn't install anyways.
+               -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+               -DBUILD_PERF_TESTS=OFF
+               -DBUILD_TESTS=$(multilib_native_usex testprograms)
+               -DBUILD_WITH_DEBUG_INFO=$(usex debug)
+       #       -DBUILD_WITH_STATIC_CRT=OFF
+               -DBUILD_WITH_DYNAMIC_IPP=OFF
+               -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
+       #       -DBUILD_ANDROID_SERVICE=OFF
+               -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+               -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib 
"${WORKDIR}/opencv_contrib-${PV}/modules" "")
+       # ===================================================
+       # OpenCV installation options
+       # ===================================================
+               -DINSTALL_CREATE_DISTRIB=OFF
+               -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+               -DINSTALL_TESTS=$(multilib_native_usex testprograms)
+               -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+       #       -DINSTALL_ANDROID_EXAMPLES=OFF
+               -DINSTALL_TO_MANGLED_PATHS=OFF
+               # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+               # to set its destination libdir
+               -DLIB_SUFFIX=
+       # ===================================================
+       # OpenCV build options
+       # ===================================================
+               -DENABLE_CCACHE=OFF
+               -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+               -DENABLE_SOLUTION_FOLDERS=OFF
+               -DENABLE_PROFILING=OFF
+               -DENABLE_COVERAGE=OFF
+
+               -DHAVE_opencv_java=$(multilib_native_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
+       # ===================================================
+       # Not building protobuf but update files bug #631418
+       # ===================================================
+               -DBUILD_PROTOBUF=OFF
+               -DPROTOBUF_UPDATE_FILES=ON
+       # ===================================================
+       # things we want to be hard enabled not worth useflag
+       # ===================================================
+               -DCMAKE_SKIP_RPATH=ON
+               -DOPENCV_DOC_INSTALL_PATH=
+       # ==================================================
+       # cpu flags, should solve 633900
+       #===================================================
+               -DCPU_DISPATCH=OFF
+               -DENABLE_SSE=$(usex cpu_flags_x86_sse)
+               -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+               -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+               -DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
+               -DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
+               -DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
+               -DENABLE_AVX=$(usex cpu_flags_x86_avx)
+               -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+               -DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
+       )
+
+       # ===================================================
+       # OpenCV Contrib Modules
+       # ===================================================
+       if use contrib; then
+               GLOBALCMAKEARGS+=(
+                       -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
+                       -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+                       -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=$(multilib_native_usex contrib_hdf 
ON OFF)
+                       -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
+               )
+
+               if multilib_is_native_abi; then
+                       GLOBALCMAKEARGS+=(
+                               -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex 
!tesseract)
+                       )
+               else
+                       GLOBALCMAKEARGS+=(
+                               -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+                       )
+               fi
+       fi
+
+       # workaround for bug 413429
+       tc-export CC CXX
+
+       local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
+               -DPYTHON_EXECUTABLE=OFF
+               -DINSTALL_PYTHON_EXAMPLES=OFF
+       )
+
+       cmake-utils_src_configure
+
+       # Copy face_land_model to 
${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+       # TODO patch ocv_download to copy files into destination dirs
+       if use contrib_dnn; then
+               mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+               cp "${WORKDIR}"/face_landmark_model.dat 
"${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+       fi
+
+}
+
+python_module_compile() {
+       local BUILD_DIR=${orig_BUILD_DIR}
+       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)
+       )
+
+       # 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"
+}
+
+multilib_src_install() {
+       cmake-utils_src_install
+
+       # Build and install the python modules for all targets
+       if multilib_is_native_abi && use python; then
+               local orig_BUILD_DIR=${BUILD_DIR}
+               python_foreach_impl python_module_compile
+       fi
+}

Reply via email to