diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
tree | 6208a7f4fc744684fce0f55acbb47511acace498 /media-libs/opencv | |
parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) |
gentoo resync : 25.08.2018
Diffstat (limited to 'media-libs/opencv')
-rw-r--r-- | media-libs/opencv/Manifest | 14 | ||||
-rw-r--r-- | media-libs/opencv/metadata.xml | 1 | ||||
-rw-r--r-- | media-libs/opencv/opencv-2.4.13-r3.ebuild | 5 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.2.0-r2.ebuild | 332 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.2.0-r3.ebuild | 7 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.3.0-r2.ebuild | 361 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.3.0-r5.ebuild | 5 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.4.1-r2.ebuild | 5 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.4.1-r4.ebuild (renamed from media-libs/opencv/opencv-3.3.0-r4.ebuild) | 88 |
9 files changed, 82 insertions, 736 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index c54555031160..1fefc68ff845 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -34,11 +34,9 @@ DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1 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 -EBUILD opencv-2.4.13-r3.ebuild 6007 BLAKE2B 1b78cbb84733a057876a8e0a942c753786ac0b836b4e1116b9225b46cb36c37deca4c53d5df78784b99ce628e15010bf60ee750691c657d935ffa75733f54cdf SHA512 eb633e9f6e19de369a8bfcc75ca644a47cb2ca2fb2ccc8a91703e1c964d952dbdbcbae635163014839d62a647b0fa9a6c6ad8ae20c9d72fa87b270de55a57a44 -EBUILD opencv-3.2.0-r2.ebuild 10387 BLAKE2B d9b6b704e465ee03862a2b264af592025197b7b7a79b8ce61ca0e2535bd4b7d0930d53d5e4acefb44774a1135488c394424066ce3320560bc8f694358272628f SHA512 e065790498734f16ce6f5fa4446e44e776b7097467f4ce8dc9da39d65038f4c8a646ef0e286daa4c1a5070c41595cbfe7731cc6965206b7650969306385db8af -EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0bfa948ce4b06ee9f80c91f2acceeefccc6fa4a03cbf05f609d1d51ebe58f9b192df071a016d157f921b738d00ef13 SHA512 b4dc53882ea13aeb90454dd54818d5d7ea3f0d00425c2f3eaea9ee493f84dd0956115bf2289e58b36b5de35dff455a86e24df0a804faf0f53db490030e99affb -EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6 -EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba -EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f -EBUILD opencv-3.4.1-r2.ebuild 18471 BLAKE2B 88ae4e84db3546588aa16bc9a627c25559246254838f9c8b20d452a3d0dc2778c583eb2f157ee87ab55482fec8ea45156ce71ec79cdab966e43c794e46b1d74d SHA512 cc9ef5c86592cfd5fbbbe68c648891e33087fccc0cc6ffea04b36050e215b635ede62d7843454fcc293dab154130e784e9ff95e0816bf401d1dccee94f5ed9b2 -MISC metadata.xml 2648 BLAKE2B fe794c98503b602b365ea04bf32c1011fc485faf7da60e4475db32a3403be3f13be3c713270121feab8f5ec7dc6ac4caa7cbd9dbefaa121fa337273184d5a326 SHA512 60544f21407bffb30e12a2207288832487f0e2ff535343f06d103c0db13441776d84c0645d568ee7a9f7d502ca4267a8be923fe1cbbb8902a950ca7395616848 +EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b +EBUILD opencv-3.2.0-r3.ebuild 12120 BLAKE2B ec841b5fb9fef1ea6cd7c61bb693830d9c95b8a21c1cb85db1b31c06ebd6127d27ec6bffc40ec740f808312ae29283610df4eaced04749c405a3d48c267f4feb SHA512 fa3c372253b3edc09095603b6cb867ab2d0f3020607a9e11013bb96b56a4fc755575785c0328b5877f5590b554eebac2fe65fad2c11fee677f0853c8bd1f13c5 +EBUILD opencv-3.3.0-r5.ebuild 17045 BLAKE2B 61f4d401f71ff70af717cf04be8e672705531183b7641cc0d5b26a2bea3486ecba8db844e34d9bce181f4386d7881ca13cef2cbab0799ca1c8161c5e9250e73a SHA512 1c4a1a1d4a36b0c703422cd803613b087c0b6c07d42daa0a00f16e42ee488cc4650789d627d50e4b641f6981b9ed4e40eca11214b3c1182968715fdbb53e6109 +EBUILD opencv-3.4.1-r2.ebuild 18420 BLAKE2B 1d002a35c093aede94f968fe4a8b5bde8af55508442094813b9e701da87e6eef437b2261caa525cf738c73206c894bc1ac1357844230b162252ff0f2208ce7d7 SHA512 78e79f66d1736b3bda066066ff9a2b8ff7034faf1d855f1c479ac79b6ceba6686c3a27865e4506522646cf40b7179e95cf63a64f0fa9d23d8ee52ca839109d48 +EBUILD opencv-3.4.1-r4.ebuild 18495 BLAKE2B 08a3a897c917669691b1c5fb7d7f39b81cd0b8f23b41a5ca4ef03e8b5d619867420001bd466db2fdcb8bd1d9b4f84d5f9f92b94be262146d2e98db80eebeefc3 SHA512 986839e6f74e608fd6d85077314565412f031d814442faa360a25fad04450164df202dec243f980146d865e1222c29f77213d08678274d29f943cb7e7ff5010d +MISC metadata.xml 2580 BLAKE2B fa071ec1998c6e3daf2b09feb25f5f4a42ebe4a01e3bfa1ca8c6b9a9bc81f73f27b2916eed81d92e252127ca3fb07513f90bc655fd0976b9acd080d4747f55a4 SHA512 fe025e3adf0f6a8f5e1e1c8db0caacbbf871981217bfbcb43ab1bc2e949e2bfe82c19086dbc76d587fef2c4b53bf880e874861148aab61a525fc23df558f1e05 diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index f87770fadafa..edc61febd4c1 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -21,7 +21,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under <flag name="gdal">Enable support for sci-libs/gdal library</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="glog">Use Google's C++ loggin library</flag> - <flag name="ipp">Enable Intel Integrated Primitive support</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag> <flag restrict=">=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag> diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild index 9ff99bb067e2..37b41c40568e 100644 --- a/media-libs/opencv/opencv-2.4.13-r3.ebuild +++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild @@ -14,7 +14,7 @@ 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 qt5 testprograms threads tiff v4l vtk xine" +IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -48,7 +48,6 @@ RDEPEND=" media-libs/libdc1394 sys-libs/libraw1394 ) - ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) @@ -122,7 +121,7 @@ src_configure() { -DWITH_GSTREAMER_0_10=OFF -DWITH_GTK=$(usex gtk) -DWITH_IMAGEIO=OFF - -DWITH_IPP=$(usex ipp) + -DWITH_IPP=OFF -DWITH_JASPER=$(usex jpeg2k) -DWITH_JPEG=$(usex jpeg) -DWITH_OPENEXR=$(usex openexr) diff --git a/media-libs/opencv/opencv-3.2.0-r2.ebuild b/media-libs/opencv/opencv-3.2.0-r2.ebuild deleted file mode 100644 index f12619bdadbf..000000000000 --- a/media-libs/opencv/opencv-3.2.0-r2.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# 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="https://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? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )" -LICENSE="BSD" -SLOT="0/3.2" # subslot = libopencv* soname version -KEYWORDS="~amd64 ~arm ~arm64 ~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" - "${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch" - "${FILESDIR}/${P}-cpu-mno-sse2.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 -} diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild index 4046f42d260b..ed0aa785e85b 100644 --- a/media-libs/opencv/opencv-3.2.0-r3.ebuild +++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/3.2" # subslot = libopencv* soname version KEYWORDS="~amd64 ~arm ~arm64 ~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" +IUSE="contrib cuda debug +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 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 @@ -63,7 +63,6 @@ RDEPEND=" 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}] ) @@ -176,7 +175,7 @@ multilib_src_configure() { -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_IPP=OFF -DWITH_JASPER=$(usex jpeg2k) -DWITH_JPEG=$(usex jpeg) -DWITH_WEBP=$(usex webp) diff --git a/media-libs/opencv/opencv-3.3.0-r2.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild deleted file mode 100644 index d37063d4ff3d..000000000000 --- a/media-libs/opencv/opencv-3.3.0-r2.ebuild +++ /dev/null @@ -1,361 +0,0 @@ -# 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 python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" -HOMEPAGE="https://opencv.org" - -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz - contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz - contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) ) " -LICENSE="BSD" -SLOT="0/3.3" # subslot = libopencv* soname version -KEYWORDS="~amd64 ~arm ~arm64 ~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 ) - 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}] - 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 -) - -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" - "${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376 -) - -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.patch" - mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die - 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 - # =================================================== - -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_JAVA=$(multilib_native_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=$(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_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 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= - ) - - # =================================================== - # 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=$(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 -} - -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 -} diff --git a/media-libs/opencv/opencv-3.3.0-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r5.ebuild index 8b76d7910413..b9fbce050f1e 100644 --- a/media-libs/opencv/opencv-3.3.0-r5.ebuild +++ b/media-libs/opencv/opencv-3.3.0-r5.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/3.3" # subslot = libopencv* soname version KEYWORDS="~amd64 ~arm ~arm64 ~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_dnn contrib_hdf contrib_sfm contrib_xfeatures2d" +IUSE="contrib cuda debug +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 contrib_cvv contrib_dnn 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 @@ -68,7 +68,6 @@ RDEPEND=" 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}] ) @@ -280,7 +279,7 @@ multilib_src_configure() { -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_IPP=OFF -DWITH_JASPER=$(usex jpeg2k) -DWITH_JPEG=$(usex jpeg) -DWITH_WEBP=$(usex webp) diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild index 34085a8db247..2b315c3dae25 100644 --- a/media-libs/opencv/opencv-3.4.1-r2.ebuild +++ b/media-libs/opencv/opencv-3.4.1-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.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_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 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" +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 # will silently disable it Wwithout the user knowing, which defeats the # purpose of the opengl use flag. @@ -73,7 +73,6 @@ RDEPEND=" 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}] ) @@ -286,7 +285,7 @@ multilib_src_configure() { -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_IPP=OFF -DWITH_JASPER=$(usex jpeg2k) -DWITH_JPEG=$(usex jpeg) -DWITH_WEBP=$(usex webp) diff --git a/media-libs/opencv/opencv-3.3.0-r4.ebuild b/media-libs/opencv/opencv-3.4.1-r4.ebuild index 5910a643bae5..e2aeffdea2cd 100644 --- a/media-libs/opencv/opencv-3.3.0-r4.ebuild +++ b/media-libs/opencv/opencv-3.4.1-r4.ebuild @@ -1,31 +1,40 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) -inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +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 - https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz - contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz - contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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.3" # subslot = libopencv* soname version +SLOT="0/3.4.1" # subslot = libopencv* soname version KEYWORDS="~amd64 ~arm ~arm64 ~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" - +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 -# will silently disable it without the user knowing, which defeats the +# will silently disable it Wwithout the user knowing, which defeats the # purpose of the opengl use flag. REQUIRED_USE=" 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 ) @@ -66,7 +75,6 @@ RDEPEND=" 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}] ) @@ -95,6 +103,7 @@ RDEPEND=" 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 )" @@ -217,9 +226,10 @@ MULTILIB_WRAPPED_HEADERS=( 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" - "${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376 + "${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" ) pkg_pretend() { @@ -239,10 +249,17 @@ src_prepare() { sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ -i CMakeLists.txt cmake/*cmake || die - if use contrib && use contrib_xfeatures2d; then + 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}/${P}-contrib-xfeatures2d.patch" - mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || 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 @@ -259,6 +276,7 @@ multilib_src_configure() { GLOBALCMAKEARGS=( # Optional 3rd party components # =================================================== + -DENABLE_DOWNLOAD=OFF -DWITH_1394=$(usex ieee1394) # -DWITH_AVFOUNDATION=OFF # IOS -DWITH_VTK=$(multilib_native_usex vtk) @@ -269,7 +287,7 @@ multilib_src_configure() { -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_IPP=OFF -DWITH_JASPER=$(usex jpeg2k) -DWITH_JPEG=$(usex jpeg) -DWITH_WEBP=$(usex webp) @@ -306,7 +324,6 @@ multilib_src_configure() { -DWITH_OPENCLAMDBLAS=$(usex opencl) -DWITH_DIRECTX=OFF -DWITH_INTELPERC=OFF - -DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag -DWITH_IPP_A=OFF -DWITH_MATLAB=OFF -DWITH_VA=$(usex vaapi) @@ -328,6 +345,7 @@ multilib_src_configure() { # 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. @@ -350,6 +368,9 @@ multilib_src_configure() { -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 # =================================================== @@ -380,6 +401,21 @@ multilib_src_configure() { # =================================================== -DCMAKE_SKIP_RPATH=ON -DOPENCV_DOC_INSTALL_PATH= + # ================================================== + # cpu flags, should solve 633900 + #=================================================== + -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON + -DCPU_DISPATCH= + -DENABLE_SSE=$(usex cpu_flags_x86_sse) + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) + -DENABLE_SSE3=$(usex cpu_flags_x86_sse3) + -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3) + -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) ) # =================================================== @@ -387,7 +423,8 @@ multilib_src_configure() { # =================================================== if use contrib; then GLOBALCMAKEARGS+=( - -DBUILD_opencv_dnn=OFF + -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) @@ -415,6 +452,14 @@ multilib_src_configure() { ) 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() { @@ -428,6 +473,7 @@ python_module_compile() { -DPYTHON2_EXECUTABLE=$(type -P python2) -DPYTHON3_EXECUTABLE=$(type -P python3) -DINSTALL_PYTHON_EXAMPLES=$(usex examples) + -DLIBPY_SUFFIX=64 ) # Regenerate cache file. Can't use rebuild_cache as it won't |