--- /usr/portage/media-libs/opencv/opencv-3.4.1-r5.ebuild 2019-01-24 10:39:29.000000000 +0100 +++ /usr/local/portage/overlay/media-libs/opencv/opencv-4.0.1.ebuild 2019-02-17 17:57:32.083914164 +0100 @@ -22,7 +22,7 @@ )" LICENSE="BSD" -SLOT="0/3.4.1" # subslot = libopencv* soname version +SLOT="0/4.0.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_ssse3 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 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 @@ -225,16 +225,16 @@ /usr/include/opencv2/cudev/warp/warp.hpp ) -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-gles.patch" - "${FILESDIR}/${PN}-3.4.0-disable-download.patch" - "${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530 - "${FILESDIR}/${P}-python-lib-suffix-hack.patch" - "${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch" - "${FILESDIR}/${P}-remove-git-autodetect.patch" - "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576 - "${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900 -) +#PATCHES=( +# "${FILESDIR}/${PN}-3.0.0-gles.patch" +# "${FILESDIR}/${PN}-3.4.0-disable-download.patch" +# "${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530 +# "${FILESDIR}/${P}-python-lib-suffix-hack.patch" +# "${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch" +# "${FILESDIR}/${P}-remove-git-autodetect.patch" +# "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576 +# "${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900 +#) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -336,6 +336,7 @@ -DWITH_GPHOTO2=$(usex gphoto2) -DWITH_LAPACK=$(multilib_native_usex lapack) -DWITH_ITT=OFF # 3dparty libs itt_notify + -DWITH_QUIRC=OFF # =================================================== # CUDA build components: nvidia-cuda-toolkit takes care of GCC version # ===================================================