diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-libs/opencv | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'media-libs/opencv')
-rw-r--r-- | media-libs/opencv/Manifest | 4 | ||||
-rw-r--r-- | media-libs/opencv/metadata.xml | 1 | ||||
-rw-r--r-- | media-libs/opencv/opencv-4.1.2-r3.ebuild (renamed from media-libs/opencv/opencv-4.1.2-r2.ebuild) | 41 |
3 files changed, 25 insertions, 21 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 18f3994454bb..2cbc4152be0d 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -30,5 +30,5 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7 EBUILD opencv-2.4.13-r4.ebuild 6028 BLAKE2B 49e634cf091fdbaf69e518f2fde2f3916bdaf39b0fed413d253c22f3c823ef132d49c2c7891b2c6d73e3a7c9b1e3b8efe999940d4d5aff50844b4ad9a5728eb6 SHA512 464e49cf782cabe002d3d5c499932c31cde6ec69658330a8040eb7cbd8a56e94f94ca3cf073780665066e34ee06c338dadbddc18602c6f900a9922ae1edcba74 EBUILD opencv-3.4.1-r7.ebuild 18644 BLAKE2B 636275f9a39e3fef49f59d2d93e4fe288e73de35e210aec8ec7982058e1f0c98d25a7e7e9ffd85aeccf088225058357c2d7e23330d4a912e3f345a501735a030 SHA512 eba05037ccbdf8858aa799dddad2ddbc031677a69ed808d324e4aa2ae10a29f7f6c0424f92892ea8cdbcf3915da4b47f2a97227bfa35fe390e43c3f5d0439cb5 EBUILD opencv-4.1.2-r1.ebuild 18329 BLAKE2B f917c45b9d91c362c1470f41ef6f4ad72b5c45d4c3c2c2901a714ebe5898cc3a742ae8a7d15646399d3568bff70b32e63d5d5f82cb6da12864aab88ca98e8cfb SHA512 4ee76673c4284546aa9018cdde1e2b2278e64650695fac63d1677c79beae28dd18b696c19dea7e30d661a9a2dcca22b11bd272c736a582a5b2049029497c4269 -EBUILD opencv-4.1.2-r2.ebuild 18370 BLAKE2B 347aad52543221205f22bf1672b540bb67eb917065b9cb2c9f1dc113ecb4ba967851912ba7abeb48c00a2d3ae076e0a46d51c8a8e682ef8e12401b88627fa8e3 SHA512 c9b204281dee9ca4ba73ee2bca2dfe54d837944a05f8f4f890ec8b82a4177e5d2095c31adbd9a64cf58679f23ebe68cbcb728d3cd8aa0cfe0d0484f8bff29c5a -MISC metadata.xml 2728 BLAKE2B aff1160741e363d0bfd7b7d6c96a28025f885a785c6d106e5fb2dd5704883d2542ad627cdaf0d8c612522720006a1df18104fa225cf47eb0e5aff029b8ebc6fb SHA512 924e3f9c58cee3e00ed7f3690444637f0889cc9140cd5ca14fcff8fd35d84724703516f07c803c79c242e209f50edf24b7156ca4ad79fffbc19e1166d4e730bd +EBUILD opencv-4.1.2-r3.ebuild 18414 BLAKE2B bfc40c7c183bc9eb9112ec5487c296d60b5665358e401ca753ced6df67e4ec6517b212e499057cbac9b638c982e79def94d4e66d8de4296c91d44e9b75f3c797 SHA512 3c7198c638889bbfcf30e9419782bd8c42389b717e4a1b388d9db6aea409e5aa30c55ee45548f4c31546803749b4ec2fb76e9eebe085ed3258e86483e59b26d1 +MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index f7bccfa408e7..98984a7467b5 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -17,6 +17,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag> <flag name="features2d">Enable features2d module</flag> <flag name="gdal">Enable support for sci-libs/gdal library</flag> + <flag name="gtk3">Enable x11-libs/gtk+:3 support</flag> <flag restrict=">=media-libs/opencv-4.1.2" name="opencvapps">Enable compilation with opencvapps</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> diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild index 6597c3fdc4a4..4b4180760a3f 100644 --- a/media-libs/opencv/opencv-4.1.2-r2.ebuild +++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/4.1.2" # subslot = libopencv* soname version KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d 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 dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" +IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d 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 dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps 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. @@ -36,13 +36,13 @@ REQUIRED_USE=" contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) - opengl? ( || ( gtk qt5 ) ) + opengl? ( qt5 ) python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib )" + tesseract? ( contrib ) + ?? ( gtk3 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? ( !qt5 ) # openmp? ( !threads ) RDEPEND=" @@ -63,10 +63,9 @@ RDEPEND=" media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) - gtk? ( + gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] ) + x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] @@ -98,10 +97,12 @@ RDEPEND=" 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 ) - vaapi? ( x11-libs/libva )" + java? ( >=virtual/jdk-1.6 ) + vaapi? ( x11-libs/libva )" +BDEPEND=" + java? ( >=virtual/jdk-1.6 ) + virtual/pkgconfig[${MULTILIB_USEDEP}]" MULTILIB_WRAPPED_HEADERS=( /usr/include/opencv2/cvconfig.h @@ -231,11 +232,11 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}/${PN}-3.0.0-gles.patch" - "${FILESDIR}/${PN}-3.4.0-disable-download.patch" - "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch" - "${FILESDIR}/${P}-pkg-config-file.patch" - "${FILESDIR}/${P}-opencl-license.patch" + "${FILESDIR}"/${PN}-3.0.0-gles.patch + "${FILESDIR}"/${PN}-3.4.0-disable-download.patch + "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch + "${FILESDIR}"/${P}-pkg-config-file.patch + "${FILESDIR}"/${P}-opencl-license.patch ) pkg_pretend() { @@ -290,8 +291,8 @@ multilib_src_configure() { -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_GTK=$(usex gtk3) + -DWITH_GTK_2_X=OFF # only want gtk3 nowadays -DWITH_IPP=OFF -DWITH_JASPER=OFF -DWITH_JPEG=$(usex jpeg) @@ -318,7 +319,7 @@ multilib_src_configure() { -DWITH_UNICAP=OFF # Not packaged -DWITH_V4L=$(usex v4l) -DWITH_LIBV4L=$(usex v4l) - #-DWITH_DSHOW=ON # direct show supp + # -DWITH_DSHOW=ON # direct show supp -DWITH_MSMF=OFF -DWITH_XIMEA=OFF # Windows only -DWITH_XINE=$(multilib_native_usex xine) @@ -344,7 +345,7 @@ multilib_src_configure() { -DWITH_CUBLAS=$(multilib_native_usex cuda) -DWITH_CUFFT=$(multilib_native_usex cuda) -DWITH_NVCUVID=OFF -# -DWITH_NVCUVID=$(usex cuda) + # -DWITH_NVCUVID=$(usex cuda) -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") # =================================================== # OpenCV build components @@ -485,6 +486,8 @@ python_module_compile() { # Avoid conflicts with new module builds as build system doesn't # really support it. rm -rf modules/python2 || die "rm failed" + + python_optimize "${D}"/$(python_get_sitedir) } multilib_src_install() { |