* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-08-18 12:14 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-08-18 12:14 UTC (permalink / raw
To: gentoo-commits
commit: c030d441200f3ed0c35ea730c3cae7af68f68ced
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 11:39:42 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 12:13:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c030d441
media-libs/opencv: contrib useflag added bug #557870.
Package-Manager: portage-2.2.20.1
media-libs/opencv/Manifest | 1 +
media-libs/opencv/metadata.xml | 41 ++++++++++++++++-------------------
media-libs/opencv/opencv-3.0.0.ebuild | 9 ++++++--
3 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c6dfcf3..afecfbd 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
+DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 94c7862..97bdf9d 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,30 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <maintainer>
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Huettel</name>
- </maintainer>
- <maintainer>
- <email>amynka@gentoo.org</email>
- <name>Amy Winston</name>
- </maintainer>
- <longdescription>
+<herd>kde</herd>
+<maintainer>
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Huettel</name>
+</maintainer>
+<maintainer>
+ <email>amynka@gentoo.org</email>
+ <name>Amy Winston</name>
+</maintainer>
+<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
</longdescription>
- <use>
- <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
- <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
- <flag name="ipp">Enable Intel Integrated Primitive support</flag>
- <flag name="opencl">Add support for OpenCL</flag>
- <flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
- <flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">opencvlibrary</remote-id>
- <remote-id type="github">Itseez/opencv</remote-id>
- </upstream>
+<use>
+ <flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
+ <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+ <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+ <flag name="ipp">Enable Intel Integrated Primitive support</flag>
+ <flag name="opencl">Add support for OpenCL</flag>
+ <flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
+ <flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
+</use>
</pkgmetadata>
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 5f56167..a528d73 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -12,12 +12,13 @@ HOMEPAGE="http://opencv.org"
SRC_URI="
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
- https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip"
+ https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+ contrib? ( https://github.com/Itseez/${PN}_contrib/archive/master.zip -> ${PN}_contrib.zip )"
LICENSE="BSD"
SLOT="0/3.0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="cuda doc +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"
+IUSE="contrib cuda doc +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 )
@@ -173,6 +174,10 @@ src_configure() {
mycmakeargs+=( "-DWITH_QT=OFF" )
fi
+ if use contrib; then
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
+ fi
+
if use cuda; then
if [[ "$(gcc-version)" > "4.7" ]]; then
ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-08-18 14:19 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-08-18 14:19 UTC (permalink / raw
To: gentoo-commits
commit: de31c3fb3c54681e0b3f85256712f92bd1a31992
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:18:55 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:18:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de31c3fb
media-libs/opencv: drop old gstreamer support bug #547664.
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-2.4.10.ebuild | 4 ++--
media-libs/opencv/opencv-3.0.0.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.10.ebuild b/media-libs/opencv/opencv-2.4.10.ebuild
index 4586759..ce86d91 100644
--- a/media-libs/opencv/opencv-2.4.10.ebuild
+++ b/media-libs/opencv/opencv-2.4.10.ebuild
@@ -35,8 +35,8 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
)
gtk? (
dev-libs/glib:2
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index a528d73..b71e509 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -41,8 +41,8 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
)
gtk? (
dev-libs/glib:2
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-08-18 15:41 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-08-18 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 62e62d96e222203f221b39479730adc0b5e4ee04
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 15:40:19 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 15:40:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e62d96
media-libs/opencv: url for contrib changed.
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-3.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index b71e509..e2d2c75 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
SRC_URI="
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/${PN}_contrib/archive/master.zip -> ${PN}_contrib.zip )"
+ contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
LICENSE="BSD"
SLOT="0/3.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-10-30 17:09 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-10-30 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 8fafb947e66eefac34dc6a43ffecbe16269a54c5
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 17:07:51 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 17:07:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fafb947
media-libs/opencv: contrib path changed bug #558104.
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-3.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index e2d2c75..322f4b5 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -175,7 +175,7 @@ src_configure() {
fi
if use contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-master/modules" )
fi
if use cuda; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-10-30 23:55 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-10-30 23:55 UTC (permalink / raw
To: gentoo-commits
commit: d6d0861e762feae700de504781660a08d541e32c
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 23:53:47 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 23:53:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d0861e
media-libs/opencv: contrib path changed back
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-3.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 322f4b5..e2d2c75 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -175,7 +175,7 @@ src_configure() {
fi
if use contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-master/modules" )
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
fi
if use cuda; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-10-31 8:27 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-10-31 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 875fab34771b06d73495896ee560a7834a760c31
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 08:26:06 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 08:26:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875fab34
media-libs/opencv: contrib updated, broken example removed bug #558104.
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-3.0.0.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index e2d2c75..a101fc4 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
SRC_URI="
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
+ contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
LICENSE="BSD"
SLOT="0/3.0"
@@ -103,6 +103,9 @@ src_prepare() {
-e '/add_subdirectory(.*3rdparty.*)/ d' \
CMakeLists.txt cmake/*cmake || die
+ #removing broken sample bug #558104
+ rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+
java-pkg-opt-2_src_prepare
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-11-10 22:37 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-11-10 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 62c94c5065d2582079caf89fb8cab0ba768d2b67
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 22:36:17 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 22:36:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c94c50
media-libs/opencv: version bump bug #564942.
Package-Manager: portage-2.2.20.1
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-2.4.11.ebuild | 220 +++++++++++++++++++++++++++++++++
2 files changed, 221 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index afecfbd..57bffd8 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,5 @@
DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
+DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0 WHIRLPOOL 1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild
new file mode 100644
index 0000000..08de065
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.11.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit base 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.willowgarage.com"
+
+SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# 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 )
+ )
+ 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"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ 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
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF
+ -DWITH_CARBON=OFF
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with opencl)
+ # $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ # $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF # not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_QUICKTIME=OFF
+ $(cmake-utils_use_with threads TBB)
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ # the build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -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" )
+ else
+ mycmakeargs+=( "-DWITH_QT=OFF" )
+ fi
+
+ if use cuda; then
+ if [[ "$(gcc-version)" > "4.7" ]]; then
+ ewarn "CUDA and >=sys-devel/gcc-4.8 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" )
+ 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_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-11-26 21:13 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-11-26 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 7bbdf13eaf0d8b6da619fa15581d1ba56c1cc072
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 21:10:58 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 21:11:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbdf13e
media-libs/opencv: cuda restriction for >=gcc-4.8 disabled bug #566244.
Package-Manager: portage-2.2.20.1
media-libs/opencv/metadata.xml | 1 +
media-libs/opencv/opencv-3.0.0.ebuild | 13 +++----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 47c3b51..12a445a 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -9,6 +9,7 @@
<maintainer>
<email>amynka@gentoo.org</email>
<name>Amy Winston</name>
+ <description>Assign bugs on me.</description>
</maintainer>
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index a101fc4..aec55eb 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -182,16 +182,9 @@ src_configure() {
fi
if use cuda; then
- if [[ "$(gcc-version)" > "4.7" ]]; then
- ewarn "CUDA and >=sys-devel/gcc-4.8 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" )
- fi
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
else
mycmakeargs+=( "-DWITH_CUDA=OFF" )
mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2015-12-16 9:06 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2015-12-16 9:06 UTC (permalink / raw
To: gentoo-commits
commit: fb0c3bf29f49a48f01f7880023baacd88249d8bd
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 09:04:26 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 09:04:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0c3bf2
media-libs/opencv: required_use qt changed to at-most-one-of
Package-Manager: portage-2.2.20.1
media-libs/opencv/opencv-3.0.0.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index aec55eb..c5587ae 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="contrib cuda doc +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 )
- qt5? ( !qt4 )
+ ?? ( qt4 qt5 )
"
# The following logic is intrinsic in the build system, but we do not enforce
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-19 17:49 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-01-19 17:49 UTC (permalink / raw
To: gentoo-commits
commit: 75b7f6b2d9f56db65129c894978678e64a3c8623
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:28:55 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:48:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b7f6b2
media-libs/opencv: 2.4.11 base migration
Package-Manager: portage-2.2.24
media-libs/opencv/opencv-2.4.11.ebuild | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild
index 08de065..d5fc0f7 100644
--- a/media-libs/opencv/opencv-2.4.11.ebuild
+++ b/media-libs/opencv/opencv-2.4.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+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.willowgarage.com"
@@ -73,21 +73,17 @@ DEPEND="${RDEPEND}
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"
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- base_src_prepare
+ epatch "${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"
# remove bundled stuff
rm -rf 3rdparty
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-19 17:49 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-01-19 17:49 UTC (permalink / raw
To: gentoo-commits
commit: b4d8d72b827bca5505da099fd455bf5eb58fe9ad
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 16:59:00 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:48:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d8d72b
media-libs/opencv: 2.4.9 base migration
Package-Manager: portage-2.2.24
media-libs/opencv/opencv-2.4.9.ebuild | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.9.ebuild b/media-libs/opencv/opencv-2.4.9.ebuild
index b91b22f..872d74c 100644
--- a/media-libs/opencv/opencv-2.4.9.ebuild
+++ b/media-libs/opencv/opencv-2.4.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+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.willowgarage.com"
@@ -73,23 +73,20 @@ DEPEND="${RDEPEND}
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.patch"
- "${FILESDIR}/${PN}-2.4.9-libav10.patch"
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- base_src_prepare
+
+ epatch "${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.patch" \
+ "${FILESDIR}/${PN}-2.4.9-libav10.patch" \
+ "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
# remove bundled stuff
rm -rf 3rdparty
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-19 17:49 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-01-19 17:49 UTC (permalink / raw
To: gentoo-commits
commit: bb0737f40a18a319513a81b8af7208894774625d
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:14:44 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:48:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0737f4
media-libs/opencv: 2.4.10 base migration
Package-Manager: portage-2.2.24
media-libs/opencv/opencv-2.4.10.ebuild | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.10.ebuild b/media-libs/opencv/opencv-2.4.10.ebuild
index ce86d91..04799f0 100644
--- a/media-libs/opencv/opencv-2.4.10.ebuild
+++ b/media-libs/opencv/opencv-2.4.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+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.willowgarage.com"
@@ -73,23 +73,19 @@ DEPEND="${RDEPEND}
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-libav10.patch"
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
- "${FILESDIR}/${PN}-2.4.10-pic-x86.patch"
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- base_src_prepare
+ epatch "${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-libav10.patch" \
+ "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
+ "${FILESDIR}/${PN}-2.4.10-pic-x86.patch"
# remove bundled stuff
rm -rf 3rdparty
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-19 17:49 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-01-19 17:49 UTC (permalink / raw
To: gentoo-commits
commit: 0480aacf22c3c4d969b88a2a73ec98bd8eb38a1b
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:47:00 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:48:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0480aacf
media-libs/opencv: 3.0.0 base migration, use contrib repaired
Package-Manager: portage-2.2.24
media-libs/opencv/opencv-3.0.0.ebuild | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 8ff2fd3..98ea0df 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+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"
@@ -84,17 +84,13 @@ DEPEND="${RDEPEND}
java? ( >=virtual/jdk-1.6 )
"
-PATCHES=(
- "${FILESDIR}/${P}-gles.patch"
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- base_src_prepare
+ epatch "${FILESDIR}/${P}-gles.patch"
# remove bundled stuff
rm -rf 3rdparty
@@ -103,7 +99,9 @@ src_prepare() {
CMakeLists.txt cmake/*cmake || die
#removing broken sample bug #558104
- rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+ if use contrib; then
+ rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+ fi
java-pkg-opt-2_src_prepare
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-19 21:47 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-01-19 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 9713cf335381d7717ea87dd535d933aea3c5a90d
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 21:46:16 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 21:46:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9713cf33
media-libs/opencv: missing die added. Thanks gokturk.
Package-Manager: portage-2.2.24
media-libs/opencv/opencv-3.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 98ea0df..5e435a0 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -100,7 +100,7 @@ src_prepare() {
#removing broken sample bug #558104
if use contrib; then
- rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+ rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp || die
fi
java-pkg-opt-2_src_prepare
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-31 14:56 Andreas Hüttel
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Hüttel @ 2016-01-31 14:56 UTC (permalink / raw
To: gentoo-commits
commit: ee1a5faa5eac9c0236992bd9211a3cb46caa30f0
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 30 17:00:52 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 17:00:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1a5faa
media-libs/opencv: Drop old
Package-Manager: portage-2.2.27
media-libs/opencv/opencv-3.1.0.ebuild | 252 ----------------------------------
1 file changed, 252 deletions(-)
diff --git a/media-libs/opencv/opencv-3.1.0.ebuild b/media-libs/opencv/opencv-3.1.0.ebuild
deleted file mode 100644
index 1477ef3..0000000
--- a/media-libs/opencv/opencv-3.1.0.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-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="
- mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
- https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${PN}_contrib.zip )"
-
-LICENSE="BSD"
-SLOT="0/3.0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
- )
- gdal? ( sci-libs/gdal )
- 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 )
- )
- 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] )
- webp? ( media-libs/libwebp )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
- epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(.*3rdparty.*)/ d' \
- CMakeLists.txt cmake/*cmake || die
-
- if use contrib; then
-
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-3.1.0-fix-hal-headers.patch" \
- "${FILESDIR}/${PN}-3.1.0-fix-ocl-declaration.patch" \
- "${FILESDIR}/${PN}-3.1.0-invalid-string-usage.patch"
- fi
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_CARBON=OFF # APPLE
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- -DWITH_VFW=OFF # video windows support
- $(cmake-utils_use_with gstreamer)
- -DWITH_GSTREAMER_0_10=OFF
- $(cmake-utils_use_with gtk)
- -DWITH_GTK_2_X=OFF
- $(cmake-utils_use_with ipp)
- $(cmake-utils_use_with java)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with webp)
- $(cmake-utils_use_with opencl)
- $(cmake-utils_use_with gphoto2)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with opengl)
- $(cmake-utils_use_with openmp)
- -DWITH_OPENNI=OFF #not packaged
- -DWITH_OPENNI2=OFF #not packaged
- $(cmake-utils_use_with png)
- $(cmake-utils_use_build python opencv_python)
- -DWITH_PVAPI=OFF # not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QUICKTIME=OFF
- -DWITH_WIN32UI=OFF
- $(cmake-utils_use_with threads TBB)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- $(cmake-utils_use_with tiff)
- -DWITH_UNICAP=OFF # not packaged
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with vtk VTK)
- -DWITH_LIBV4L=ON
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_VIDEOINPUT=OFF # windows only
- -DWITH_XIMEA=OFF # windows only
- $(cmake-utils_use_with xine)
- -DWITH_CLP=OFF
- $(cmake-utils_use_with opencl)
- -DWITH_OPENCL_SVM=OFF
- $(cmake-utils_use_with opencl OPENCLAMDFFT)
- $(cmake-utils_use_with opencl OPENCLAMDBLAS)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=ON #default
- $(cmake-utils_use_with vaapi VA)
- $(cmake-utils_use_with vaapi VA_INTEL)
- $(cmake-utils_use_with gdal gdal)
- #
- # OpenCV build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- $(cmake-utils_use_build doc DOCS)
- $(cmake-utils_use_build examples)
- $(cmake-utils_use_build java opencv_java) #for -java bug #555650
- -DBUILD_PERF_TESTS=OFF
- $(cmake-utils_use_build testprograms TESTS)
- # install examples, tests etc
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use testprograms INSTALL_TESTS)
- # build options
- $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
- -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 contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
- fi
-
- if use cuda; then
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- mycmakeargs+=( "-DWITH_CUBLAS=ON" )
- mycmakeargs+=( "-DWITH_CUFFT=ON" )
- mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
- mycmakeargs+=( "-DWITH_CUFFT=OFF" )
- mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- # workaround for bug 413429
- tc-export CC CXX
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-01-31 14:56 Andreas Hüttel
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Hüttel @ 2016-01-31 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 9957827bccf02bbff7542e3276bd8b84307d4bd0
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 30 14:59:29 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 14:59:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9957827b
media-libs/opencv: Bump subslot to 3.1, builds with python-3.5
media-libs/opencv/opencv-3.1.0-r1.ebuild | 252 +++++++++++++++++++++++++++++++
1 file changed, 252 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild
new file mode 100644
index 0000000..bbbcde9
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4,3_5} )
+
+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="
+ mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+ https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+ contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${PN}_contrib.zip )"
+
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
+ )
+ gdal? ( sci-libs/gdal )
+ 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 )
+ )
+ 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] )
+ webp? ( media-libs/libwebp )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ eigen? ( dev-cpp/eigen:3 )
+ java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ CMakeLists.txt cmake/*cmake || die
+
+ if use contrib; then
+
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}/${PN}-3.1.0-fix-hal-headers.patch" \
+ "${FILESDIR}/${PN}-3.1.0-fix-ocl-declaration.patch" \
+ "${FILESDIR}/${PN}-3.1.0-invalid-string-usage.patch"
+ fi
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ 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
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_CARBON=OFF # APPLE
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ -DWITH_VFW=OFF # video windows support
+ $(cmake-utils_use_with gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF
+ $(cmake-utils_use_with gtk)
+ -DWITH_GTK_2_X=OFF
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with webp)
+ $(cmake-utils_use_with opencl)
+ $(cmake-utils_use_with gphoto2)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF #not packaged
+ -DWITH_OPENNI2=OFF #not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QUICKTIME=OFF
+ -DWITH_WIN32UI=OFF
+ $(cmake-utils_use_with threads TBB)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ -DWITH_CLP=OFF
+ $(cmake-utils_use_with opencl)
+ -DWITH_OPENCL_SVM=OFF
+ $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=ON #default
+ $(cmake-utils_use_with vaapi VA)
+ $(cmake-utils_use_with vaapi VA_INTEL)
+ $(cmake-utils_use_with gdal gdal)
+ #
+ # OpenCV build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build java opencv_java) #for -java bug #555650
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -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 contrib; then
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
+ fi
+
+ if use cuda; then
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
+ mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-02-23 12:19 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-02-23 12:19 UTC (permalink / raw
To: gentoo-commits
commit: d5e7efdf9cb9b675c805d372bfb92ef90f5a0728
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 21 21:50:34 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 12:16:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e7efdf
media-libs/opencv: Fix contrib tarball name (PN -> P)
Dropped patches that are part of the now correct 3.1.0-contrib tarball.
Package-Manager: portage-2.2.27
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-3.1.0-r2.ebuild | 244 +++++++++++++++++++++++++++++++
2 files changed, 245 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 86ee2a5..5804eb0 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,4 +3,5 @@ DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956f
DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
+DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-3.1.0-r2.ebuild b/media-libs/opencv/opencv-3.1.0-r2.ebuild
new file mode 100644
index 0000000..310b4dc
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r2.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+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="
+ mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+ https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+ contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${P}_contrib.zip )"
+
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
+ )
+ gdal? ( sci-libs/gdal )
+ 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 )
+ )
+ 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] )
+ webp? ( media-libs/libwebp )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ eigen? ( dev-cpp/eigen:3 )
+ java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ CMakeLists.txt cmake/*cmake || die
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ 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
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_CARBON=OFF # APPLE
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ -DWITH_VFW=OFF # video windows support
+ $(cmake-utils_use_with gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF
+ $(cmake-utils_use_with gtk)
+ -DWITH_GTK_2_X=OFF
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with webp)
+ $(cmake-utils_use_with opencl)
+ $(cmake-utils_use_with gphoto2)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF #not packaged
+ -DWITH_OPENNI2=OFF #not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QUICKTIME=OFF
+ -DWITH_WIN32UI=OFF
+ $(cmake-utils_use_with threads TBB)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ -DWITH_CLP=OFF
+ $(cmake-utils_use_with opencl)
+ -DWITH_OPENCL_SVM=OFF
+ $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=ON #default
+ $(cmake-utils_use_with vaapi VA)
+ $(cmake-utils_use_with vaapi VA_INTEL)
+ $(cmake-utils_use_with gdal gdal)
+ #
+ # OpenCV build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build java opencv_java) #for -java bug #555650
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -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 contrib; then
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
+ fi
+
+ if use cuda; then
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
+ mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-03-13 19:06 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-03-13 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 2a235e84d974d237765b18cfcf4987c3b6e9acdb
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 19:02:56 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 19:04:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a235e84
media-libs/opencv: metadata reorder
Package-Manager: portage-2.2.26
media-libs/opencv/metadata.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index f99d8f8..dd74a86 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -2,14 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
+ <email>amynka@gentoo.org</email>
+ <name>Amy Winston</name>
+ <description>Assign bugs on me.</description>
+ </maintainer>
+ <maintainer type="person">
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
</maintainer>
- <maintainer type="person">
- <email>amynka@gentoo.org</email>
- <name>Amy Winston</name>
- <description>Assign bugs on me.</description>
- </maintainer>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-03-13 19:06 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-03-13 19:06 UTC (permalink / raw
To: gentoo-commits
commit: cc8b8ca0dd214aad2706d17453dda6c1f9899e84
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 19:00:18 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 19:03:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8b8ca0
media-libs/opencv: version bump 2.4.12 bug #576588
Package-Manager: portage-2.2.26
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-2.4.12.ebuild | 216 +++++++++++++++++++++++++++++++++
2 files changed, 217 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5804eb0..800ac58 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,6 @@
DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0 WHIRLPOOL 1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
+DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
diff --git a/media-libs/opencv/opencv-2.4.12.ebuild b/media-libs/opencv/opencv-2.4.12.ebuild
new file mode 100644
index 0000000..e6096e5
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.12.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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.willowgarage.com"
+
+SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# 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 )
+ )
+ 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 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${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"
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ 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
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF
+ -DWITH_CARBON=OFF
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with opencl)
+ # $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ # $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF # not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_QUICKTIME=OFF
+ $(cmake-utils_use_with threads TBB)
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ # the build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -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" )
+ else
+ mycmakeargs+=( "-DWITH_QT=OFF" )
+ fi
+
+ if use cuda; then
+ if [[ "$(gcc-version)" > "4.7" ]]; then
+ ewarn "CUDA and >=sys-devel/gcc-4.8 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" )
+ 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_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-05-14 13:52 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-05-14 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 0edcd4a4d2d3045e75e4368e5943d743466438a7
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 13:48:15 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat May 14 13:48:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edcd4a4
media-libs/opencv: correct contrib url
Package-Manager: portage-2.2.26
media-libs/opencv/opencv-3.1.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild
index 5df52b0..c6a524c 100644
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
SRC_URI="
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${PN}_contrib.zip )"
+ contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
LICENSE="BSD"
SLOT="0/3.1" # subslot = libopencv* soname version
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-05-15 13:16 Mikle Kolyada
0 siblings, 0 replies; 208+ messages in thread
From: Mikle Kolyada @ 2016-05-15 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 04f1598a0e427f86b10a5a5e84508b7332ef4f30
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 13:13:33 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 15 13:13:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f1598a
: ppc/x86 stable wrt bug #580128
Package-Manager: portage-2.2.26
media-libs/opencv/opencv-2.4.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-2.4.12.ebuild b/media-libs/opencv/opencv-2.4.12.ebuild
index 181268d..d05c6ea 100644
--- a/media-libs/opencv/opencv-2.4.12.ebuild
+++ b/media-libs/opencv/opencv-2.4.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
LICENSE="BSD"
SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux"
IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-05-24 15:08 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-05-24 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 139b6cac1385c17cd87ecc63712f3841043dcdc4
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 15:05:48 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue May 24 15:05:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139b6cac
media-libs/opencv: drop 3_2 python
Package-Manager: portage-2.2.26
media-libs/opencv/opencv-3.1.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild
index c6a524c..5ad4655 100644
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-05-24 15:08 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-05-24 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 5b307ca2dca8644cd35bbb6b922c44c359adf0e1
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 15:07:09 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue May 24 15:07:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b307ca2
media-libs/opencv: remove new buggy contrib
Package-Manager: portage-2.2.26
media-libs/opencv/Manifest | 1 -
media-libs/opencv/opencv-3.1.0-r2.ebuild | 245 -------------------------------
2 files changed, 246 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 485d82b..8a27716 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,5 +2,4 @@ DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956f
DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
-DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-3.1.0-r2.ebuild b/media-libs/opencv/opencv-3.1.0-r2.ebuild
deleted file mode 100644
index 66d7de4..0000000
--- a/media-libs/opencv/opencv-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-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="
- mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
- https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${P}_contrib.zip )"
-
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
- )
- gdal? ( sci-libs/gdal )
- 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 )
- )
- 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] )
- webp? ( media-libs/libwebp )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
- epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
- "${FILESDIR}/${P}-git-autodetect.patch"
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(.*3rdparty.*)/ d' \
- CMakeLists.txt cmake/*cmake || die
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_CARBON=OFF # APPLE
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- -DWITH_VFW=OFF # video windows support
- $(cmake-utils_use_with gstreamer)
- -DWITH_GSTREAMER_0_10=OFF
- $(cmake-utils_use_with gtk)
- -DWITH_GTK_2_X=OFF
- $(cmake-utils_use_with ipp)
- $(cmake-utils_use_with java)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with webp)
- $(cmake-utils_use_with opencl)
- $(cmake-utils_use_with gphoto2)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with opengl)
- $(cmake-utils_use_with openmp)
- -DWITH_OPENNI=OFF #not packaged
- -DWITH_OPENNI2=OFF #not packaged
- $(cmake-utils_use_with png)
- $(cmake-utils_use_build python opencv_python)
- -DWITH_PVAPI=OFF # not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QUICKTIME=OFF
- -DWITH_WIN32UI=OFF
- $(cmake-utils_use_with threads TBB)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- $(cmake-utils_use_with tiff)
- -DWITH_UNICAP=OFF # not packaged
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with vtk VTK)
- -DWITH_LIBV4L=ON
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_VIDEOINPUT=OFF # windows only
- -DWITH_XIMEA=OFF # windows only
- $(cmake-utils_use_with xine)
- -DWITH_CLP=OFF
- $(cmake-utils_use_with opencl)
- -DWITH_OPENCL_SVM=OFF
- $(cmake-utils_use_with opencl OPENCLAMDFFT)
- $(cmake-utils_use_with opencl OPENCLAMDBLAS)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=ON #default
- $(cmake-utils_use_with vaapi VA)
- $(cmake-utils_use_with vaapi VA_INTEL)
- $(cmake-utils_use_with gdal gdal)
- #
- # OpenCV build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- $(cmake-utils_use_build doc DOCS)
- $(cmake-utils_use_build examples)
- $(cmake-utils_use_build java opencv_java) #for -java bug #555650
- -DBUILD_PERF_TESTS=OFF
- $(cmake-utils_use_build testprograms TESTS)
- # install examples, tests etc
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use testprograms INSTALL_TESTS)
- # build options
- $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
- -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 contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
- fi
-
- if use cuda; then
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- mycmakeargs+=( "-DWITH_CUBLAS=ON" )
- mycmakeargs+=( "-DWITH_CUFFT=ON" )
- mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
- mycmakeargs+=( "-DWITH_CUFFT=OFF" )
- mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- # workaround for bug 413429
- tc-export CC CXX
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-06-04 19:06 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-06-04 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 5cd9c5f7781b961b15edb0532d7255676242460f
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 19:05:05 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 19:05:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd9c5f7
media-libs/opencv: update contrib to newest
Package-Manager: portage-2.2.28
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-3.1.0-r3.ebuild | 245 +++++++++++++++++++++++++++++++
2 files changed, 246 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 8a27716..485d82b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,4 +2,5 @@ DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956f
DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
+DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-3.1.0-r3.ebuild b/media-libs/opencv/opencv-3.1.0-r3.ebuild
new file mode 100644
index 0000000..2cdd13b
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r3.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+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="
+ mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+ https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+ contrib? ( https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
+
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
+ )
+ gdal? ( sci-libs/gdal )
+ 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 )
+ )
+ 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] )
+ webp? ( media-libs/libwebp )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ eigen? ( dev-cpp/eigen:3 )
+ java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ CMakeLists.txt cmake/*cmake || die
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ 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
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_CARBON=OFF # APPLE
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ -DWITH_VFW=OFF # video windows support
+ $(cmake-utils_use_with gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF
+ $(cmake-utils_use_with gtk)
+ -DWITH_GTK_2_X=OFF
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with webp)
+ $(cmake-utils_use_with opencl)
+ $(cmake-utils_use_with gphoto2)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF #not packaged
+ -DWITH_OPENNI2=OFF #not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QUICKTIME=OFF
+ -DWITH_WIN32UI=OFF
+ $(cmake-utils_use_with threads TBB)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ -DWITH_CLP=OFF
+ $(cmake-utils_use_with opencl)
+ -DWITH_OPENCL_SVM=OFF
+ $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=ON #default
+ $(cmake-utils_use_with vaapi VA)
+ $(cmake-utils_use_with vaapi VA_INTEL)
+ $(cmake-utils_use_with gdal gdal)
+ #
+ # OpenCV build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build java opencv_java) #for -java bug #555650
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -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 contrib; then
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
+ fi
+
+ if use cuda; then
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
+ mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-06-09 13:54 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-06-09 13:54 UTC (permalink / raw
To: gentoo-commits
commit: b5d157c48c80d81f1273eadbba43443d837c740c
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 13:51:31 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 13:52:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d157c4
media-libs/opencv: remove trailing spaces from patch
Package-Manager: portage-2.2.28
media-libs/opencv/opencv-3.1.0-r4.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r4.ebuild b/media-libs/opencv/opencv-3.1.0-r4.ebuild
index d83ba38..0032bd6 100644
--- a/media-libs/opencv/opencv-3.1.0-r4.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r4.ebuild
@@ -14,9 +14,8 @@ HOMEPAGE="http://opencv.org"
SRC_URI="
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? (
- https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip
- -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
+ contrib? (
+ https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
LICENSE="BSD"
SLOT="0/3.1" # subslot = libopencv* soname version
@@ -229,7 +228,7 @@ src_configure() {
mycmakeargs+=( -DWITH_CUFFT=OFF )
fi
- use contrib && mycmakeargs+=(
+ use contrib && mycmakeargs+=(
-DOPENCV_EXTRA_MODULES_PATH="${WORKDIR}/opencv_contrib-${PV}/modules"
)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-08-06 16:51 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2016-08-06 16:51 UTC (permalink / raw
To: gentoo-commits
commit: d98cdf641e030e5033042c08c0a3b879e030cdb6
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Fri Aug 5 16:19:03 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 16:46:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98cdf64
media-libs/opencv: whitespace
media-libs/opencv/opencv-2.4.11.ebuild | 8 ++++----
media-libs/opencv/opencv-2.4.12-r1.ebuild | 2 +-
media-libs/opencv/opencv-2.4.12.ebuild | 8 ++++----
media-libs/opencv/opencv-3.1.0-r1.ebuild | 2 +-
media-libs/opencv/opencv-3.1.0-r4.ebuild | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild
index 225533b..262d90f 100644
--- a/media-libs/opencv/opencv-2.4.11.ebuild
+++ b/media-libs/opencv/opencv-2.4.11.ebuild
@@ -80,10 +80,10 @@ pkg_setup() {
src_prepare() {
epatch "${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}-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}/${P}-git-autodetect.patch"
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
index 16b48f7..916ef26 100644
--- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -197,7 +197,7 @@ src_configure() {
if use cuda; then
if [[ "$(gcc-version)" > "4.8" ]]; then
- # bug 577410
+ # 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 )
diff --git a/media-libs/opencv/opencv-2.4.12.ebuild b/media-libs/opencv/opencv-2.4.12.ebuild
index d05c6ea..71bfde0 100644
--- a/media-libs/opencv/opencv-2.4.12.ebuild
+++ b/media-libs/opencv/opencv-2.4.12.ebuild
@@ -80,10 +80,10 @@ pkg_setup() {
src_prepare() {
epatch "${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}-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}/${P}-git-autodetect.patch"
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild
index 5ad4655..4ed36c8 100644
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild
@@ -94,7 +94,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
"${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-3.1.0-r4.ebuild b/media-libs/opencv/opencv-3.1.0-r4.ebuild
index 0032bd6..5355966 100644
--- a/media-libs/opencv/opencv-3.1.0-r4.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r4.ebuild
@@ -209,7 +209,7 @@ src_configure() {
if use cuda; then
if [[ "$(gcc-version)" > "4.8" ]]; then
- # bug 577410
+ # 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 )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-08-20 19:01 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-08-20 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 54a9336fdc365eb41512e0bc17e35867e6713b8a
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 18:59:47 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 18:59:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a9336f
media-libs/opencv: remove old. thanks genstorm
Package-Manager: portage-2.2.28
media-libs/opencv/Manifest | 1 -
media-libs/opencv/opencv-2.4.11.ebuild | 217 --------------------------
media-libs/opencv/opencv-3.1.0-r1.ebuild | 253 -------------------------------
media-libs/opencv/opencv-3.1.0-r3.ebuild | 245 ------------------------------
4 files changed, 716 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 485d82b..82a9d48 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,3 @@
-DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0 WHIRLPOOL 1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild
deleted file mode 100644
index 262d90f..0000000
--- a/media-libs/opencv/opencv-2.4.11.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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.willowgarage.com"
-
-SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# 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 )
- )
- 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 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${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}/${P}-git-autodetect.patch"
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(3rdparty)/ d' \
- CMakeLists.txt || die
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_AVFOUNDATION=OFF
- -DWITH_CARBON=OFF
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- $(cmake-utils_use_with gstreamer)
- $(cmake-utils_use_with gtk)
- $(cmake-utils_use_with ipp)
- $(cmake-utils_use_with java)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with opencl)
- # $(cmake-utils_use_with opencl OPENCLAMDFFT)
- # $(cmake-utils_use_with opencl OPENCLAMDBLAS)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with opengl)
- $(cmake-utils_use_with openmp)
- -DWITH_OPENNI=OFF # not packaged
- $(cmake-utils_use_with png)
- $(cmake-utils_use_build python opencv_python)
- -DWITH_PVAPI=OFF # not packaged
- -DWITH_QUICKTIME=OFF
- $(cmake-utils_use_with threads TBB)
- $(cmake-utils_use_with tiff)
- -DWITH_UNICAP=OFF # not packaged
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with vtk VTK)
- -DWITH_LIBV4L=ON
- -DWITH_VIDEOINPUT=OFF # windows only
- -DWITH_XIMEA=OFF # windows only
- $(cmake-utils_use_with xine)
- # the build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- $(cmake-utils_use_build doc DOCS)
- $(cmake-utils_use_build examples)
- -DBUILD_PERF_TESTS=OFF
- $(cmake-utils_use_build testprograms TESTS)
- # install examples, tests etc
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use testprograms INSTALL_TESTS)
- # build options
- $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
- -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" )
- else
- mycmakeargs+=( "-DWITH_QT=OFF" )
- fi
-
- if use cuda; then
- if [[ "$(gcc-version)" > "4.7" ]]; then
- ewarn "CUDA and >=sys-devel/gcc-4.8 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" )
- 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_LATEX_DOCS=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- # workaround for bug 413429
- tc-export CC CXX
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild
deleted file mode 100644
index 4ed36c8..0000000
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-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="
- mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
- https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
-
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
- )
- gdal? ( sci-libs/gdal )
- 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 )
- )
- 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] )
- webp? ( media-libs/libwebp )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
- epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
- "${FILESDIR}/${P}-git-autodetect.patch"
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(.*3rdparty.*)/ d' \
- CMakeLists.txt cmake/*cmake || die
-
- if use contrib; then
-
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-3.1.0-fix-hal-headers.patch" \
- "${FILESDIR}/${PN}-3.1.0-fix-ocl-declaration.patch" \
- "${FILESDIR}/${PN}-3.1.0-invalid-string-usage.patch"
- fi
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_CARBON=OFF # APPLE
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- -DWITH_VFW=OFF # video windows support
- $(cmake-utils_use_with gstreamer)
- -DWITH_GSTREAMER_0_10=OFF
- $(cmake-utils_use_with gtk)
- -DWITH_GTK_2_X=OFF
- $(cmake-utils_use_with ipp)
- $(cmake-utils_use_with java)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with webp)
- $(cmake-utils_use_with opencl)
- $(cmake-utils_use_with gphoto2)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with opengl)
- $(cmake-utils_use_with openmp)
- -DWITH_OPENNI=OFF #not packaged
- -DWITH_OPENNI2=OFF #not packaged
- $(cmake-utils_use_with png)
- $(cmake-utils_use_build python opencv_python)
- -DWITH_PVAPI=OFF # not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QUICKTIME=OFF
- -DWITH_WIN32UI=OFF
- $(cmake-utils_use_with threads TBB)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- $(cmake-utils_use_with tiff)
- -DWITH_UNICAP=OFF # not packaged
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with vtk VTK)
- -DWITH_LIBV4L=ON
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_VIDEOINPUT=OFF # windows only
- -DWITH_XIMEA=OFF # windows only
- $(cmake-utils_use_with xine)
- -DWITH_CLP=OFF
- $(cmake-utils_use_with opencl)
- -DWITH_OPENCL_SVM=OFF
- $(cmake-utils_use_with opencl OPENCLAMDFFT)
- $(cmake-utils_use_with opencl OPENCLAMDBLAS)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=ON #default
- $(cmake-utils_use_with vaapi VA)
- $(cmake-utils_use_with vaapi VA_INTEL)
- $(cmake-utils_use_with gdal gdal)
- #
- # OpenCV build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- $(cmake-utils_use_build doc DOCS)
- $(cmake-utils_use_build examples)
- $(cmake-utils_use_build java opencv_java) #for -java bug #555650
- -DBUILD_PERF_TESTS=OFF
- $(cmake-utils_use_build testprograms TESTS)
- # install examples, tests etc
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use testprograms INSTALL_TESTS)
- # build options
- $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
- -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 contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
- fi
-
- if use cuda; then
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- mycmakeargs+=( "-DWITH_CUBLAS=ON" )
- mycmakeargs+=( "-DWITH_CUFFT=ON" )
- mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
- mycmakeargs+=( "-DWITH_CUFFT=OFF" )
- mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- # workaround for bug 413429
- tc-export CC CXX
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-3.1.0-r3.ebuild b/media-libs/opencv/opencv-3.1.0-r3.ebuild
deleted file mode 100644
index 2cdd13b..0000000
--- a/media-libs/opencv/opencv-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-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="
- mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
- https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
- contrib? ( https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
-
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp 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= )
- )
- gdal? ( sci-libs/gdal )
- 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 )
- )
- 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] )
- webp? ( media-libs/libwebp )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
- epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
- "${FILESDIR}/${P}-git-autodetect.patch"
-
- # remove bundled stuff
- rm -rf 3rdparty
- sed -i \
- -e '/add_subdirectory(.*3rdparty.*)/ d' \
- CMakeLists.txt cmake/*cmake || die
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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
- $(cmake-utils_use_with ieee1394 1394)
- -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_CARBON=OFF # APPLE
- $(cmake-utils_use_with eigen)
- $(cmake-utils_use_with ffmpeg)
- -DWITH_VFW=OFF # video windows support
- $(cmake-utils_use_with gstreamer)
- -DWITH_GSTREAMER_0_10=OFF
- $(cmake-utils_use_with gtk)
- -DWITH_GTK_2_X=OFF
- $(cmake-utils_use_with ipp)
- $(cmake-utils_use_with java)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with webp)
- $(cmake-utils_use_with opencl)
- $(cmake-utils_use_with gphoto2)
- $(cmake-utils_use_with openexr)
- $(cmake-utils_use_with opengl)
- $(cmake-utils_use_with openmp)
- -DWITH_OPENNI=OFF #not packaged
- -DWITH_OPENNI2=OFF #not packaged
- $(cmake-utils_use_with png)
- $(cmake-utils_use_build python opencv_python)
- -DWITH_PVAPI=OFF # not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QUICKTIME=OFF
- -DWITH_WIN32UI=OFF
- $(cmake-utils_use_with threads TBB)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- $(cmake-utils_use_with tiff)
- -DWITH_UNICAP=OFF # not packaged
- $(cmake-utils_use_with v4l V4L)
- $(cmake-utils_use_with vtk VTK)
- -DWITH_LIBV4L=ON
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_VIDEOINPUT=OFF # windows only
- -DWITH_XIMEA=OFF # windows only
- $(cmake-utils_use_with xine)
- -DWITH_CLP=OFF
- $(cmake-utils_use_with opencl)
- -DWITH_OPENCL_SVM=OFF
- $(cmake-utils_use_with opencl OPENCLAMDFFT)
- $(cmake-utils_use_with opencl OPENCLAMDBLAS)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=ON #default
- $(cmake-utils_use_with vaapi VA)
- $(cmake-utils_use_with vaapi VA_INTEL)
- $(cmake-utils_use_with gdal gdal)
- #
- # OpenCV build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- $(cmake-utils_use_build doc DOCS)
- $(cmake-utils_use_build examples)
- $(cmake-utils_use_build java opencv_java) #for -java bug #555650
- -DBUILD_PERF_TESTS=OFF
- $(cmake-utils_use_build testprograms TESTS)
- # install examples, tests etc
- $(cmake-utils_use examples INSTALL_C_EXAMPLES)
- $(cmake-utils_use testprograms INSTALL_TESTS)
- # build options
- $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
- -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 contrib; then
- mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
- fi
-
- if use cuda; then
- mycmakeargs+=( "-DWITH_CUDA=ON" )
- mycmakeargs+=( "-DWITH_CUBLAS=ON" )
- mycmakeargs+=( "-DWITH_CUFFT=ON" )
- mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
- else
- mycmakeargs+=( "-DWITH_CUDA=OFF" )
- mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
- mycmakeargs+=( "-DWITH_CUFFT=OFF" )
- mycmakeargs+=( "-DWITH_NVCUVID=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_LATEX_DOCS=OFF"
- "-DBUILD_PACKAGE=OFF"
- "-DENABLE_PROFILING=OFF"
- )
-
- # things we want to be hard enabled not worth useflag
- mycmakeargs+=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- # hardcode cuda paths
- mycmakeargs+=(
- "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
- )
-
- # workaround for bug 413429
- tc-export CC CXX
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-10-02 17:41 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-10-02 17:41 UTC (permalink / raw
To: gentoo-commits
commit: ec9c78f324958774c32fd2ef4e9595bf0b9531bf
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 17:40:30 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 17:40:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9c78f3
media-libs/opencv: add gles patch bug #554478
Package-Manager: portage-2.2.28
media-libs/opencv/opencv-2.4.12-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
index c18d7de..16ab06a 100644
--- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
"${FILESDIR}/${P}-git-autodetect.patch"
+ "${FILESDIR}/${PN}-3.0.0-gles.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-10-06 6:11 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-10-06 6:11 UTC (permalink / raw
To: gentoo-commits
commit: 8d1e32fb4e43f159997bd163f2747b6f45ea24ae
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 06:08:34 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 06:11:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1e32fb
media-libs/opencv: update metadata
Package-Manager: portage-2.2.28
media-libs/opencv/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index dd74a86..fe2e2d9 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -20,7 +20,7 @@ Example applications of the OpenCV library are Human-Computer Interaction (HCI);
Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
</longdescription>
<use>
- <flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
+ <flag name="contrib">Install user contributed scripts from opencv_contrib (Experimental!)</flag>
<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
<flag name="gdal">Enable support for sci-libs/gdal library</flag>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-10-20 21:23 Michael Palimaka
0 siblings, 0 replies; 208+ messages in thread
From: Michael Palimaka @ 2016-10-20 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 44be616bb24ce18edc24cc9593d067a3ff8c5457
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 21:19:25 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 21:23:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44be616b
media-libs/opencv: x86 stable
Gentoo-bug: 588170
Package-Manager: portage-2.3.2
media-libs/opencv/opencv-2.4.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
index 16ab06a..945956e 100644
--- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
LICENSE="BSD"
SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+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} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-10-21 16:06 Michael Palimaka
0 siblings, 0 replies; 208+ messages in thread
From: Michael Palimaka @ 2016-10-21 16:06 UTC (permalink / raw
To: gentoo-commits
commit: cfc28e8b0cca5822a661723d4500961a25de8e18
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 09:55:18 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 16:05:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc28e8b
media-libs/opencv: drop ppc to testing
Package-Manager: portage-2.3.2
media-libs/opencv/opencv-2.4.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-2.4.12.ebuild b/media-libs/opencv/opencv-2.4.12.ebuild
index 71bfde0..fdc0f17 100644
--- a/media-libs/opencv/opencv-2.4.12.ebuild
+++ b/media-libs/opencv/opencv-2.4.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
LICENSE="BSD"
SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-11-12 23:37 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2016-11-12 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 424af4c683bba5e630379b5608261671cd3918f3
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 22:43:52 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 23:36:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424af4c6
media-libs/opencv: Add subslot operator on media-libs/jasper
Package-Manager: portage-2.3.2
media-libs/opencv/opencv-2.4.12-r1.ebuild | 2 +-
media-libs/opencv/opencv-3.1.0-r6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
index 945956e..9eeddfd 100644
--- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
+ jpeg2k? ( media-libs/jasper:= )
ieee1394? (
media-libs/libdc1394
sys-libs/libraw1394
diff --git a/media-libs/opencv/opencv-3.1.0-r6.ebuild b/media-libs/opencv/opencv-3.1.0-r6.ebuild
index a6adf6f..5c5c284 100644
--- a/media-libs/opencv/opencv-3.1.0-r6.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r6.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
+ jpeg2k? ( media-libs/jasper:= )
ieee1394? (
media-libs/libdc1394
sys-libs/libraw1394
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-12-10 21:25 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2016-12-10 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 203575101ce6db10db3d28fd21cbb899dd7e864a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 16:05:59 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 21:25:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20357510
media-libs/opencv: Kill unnecessary Gentoo hack-patch for Python
Kill the unnecessary, outdated custom Gentoo CMake module used to force
specific version of Python in favor of hacking the upstream module
appropriately. Rely on the standard CMake -DPYTHON_INTERPRETER to
(indirectly) disable Python for the base build, and on python-r1 +
upstream -DPYTHON3_INTERPRETER to control the implementation used for
Python module build.
This removes a lot of unnecessary hackery from the ebuild, such as
passing all the Python implementation specifics (include paths, library
names) in favor of using the CMake autodetection code. It also restores
some missing bits that were omitted because of the Gentoo module
deficiency.
To keep things simple, all versions of Python are treated as 'python2'
upstream since the code used to build both python2 & python3 modules is
identical (i.e. works for all versions).
media-libs/opencv/opencv-3.1.0-r7.ebuild | 291 +++++++++++++++++++++++++++++++
1 file changed, 291 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
new file mode 100644
index 00000000..f8747c5
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r7.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+BASE_URI="https://github.com/${PN}/${PN}"
+#commit from Thu, 02 Jun 2016
+CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
+CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
+
+SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
+ ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
+ +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
+ contrib_cvv contrib_hdf contrib_sfm"
+
+# 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= )
+ 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 )
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ ieee1394? (
+ media-libs/libdc1394
+ sys-libs/libraw1394
+ )
+ ipp? ( sci-libs/ipp )
+ contrib_hdf? ( sci-libs/hdf5 )
+ 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}"/${P}-cmake-no-opengl.patch
+ "${FILESDIR}"/${P}-git-autodetect.patch
+ "${FILESDIR}"/${P}-java-magic.patch
+ "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
+ "${FILESDIR}"/${P}-find-libraries-fix.patch
+)
+
+GLOBALCMAKEARGS=()
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # remove bundled stuff
+ rm -rf 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || 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
+ 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=OFF
+ -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_OPENNI=OFF # Not packaged
+ -DWITH_OPENNI2=OFF # Not packaged
+ -DWITH_PNG=$(usex png)
+ -DWITH_PVAPI=OFF # Not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QT=$(usex qt5 5 OFF)
+ -DWITH_WIN32UI=OFF # Windows only
+ -DWITH_QUICKTIME=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)
+ # ===================================================
+ # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+ # ===================================================
+ -DWITH_CUDA=$(usex cuda)
+ -DWITH_CUBLAS=$(usex cuda)
+ -DWITH_CUFFT=$(usex cuda)
+ -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+ # ===================================================
+ # OpenCV build components
+ # ===================================================
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ -DBUILD_DOCS=OFF # Doesn't install anyways.
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DBUILD_PERF_TESTS=OFF
+ -DBUILD_TESTS=$(usex testprograms)
+ -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
+ # ===================================================
+ # OpenCV installation options
+ # ===================================================
+ -DINSTALL_C_EXAMPLES=$(usex examples)
+ -DINSTALL_TESTS=$(usex testprograms)
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+ -DHAVE_opencv_java=$(usex java YES NO)
+ # ===================================================
+ # 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_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+=(
+ # upstream doesn't really care about 2/3, and if we don't
+ # disable this, it builds python2 + python3 module for the same
+ # version of Python 3 (i.e. two identical modules)...
+ -DPYTHON3_EXECUTABLE=/bin/false
+ -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.
+ emake -C modules/python2 clean
+ 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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-12-10 21:25 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2016-12-10 21:25 UTC (permalink / raw
To: gentoo-commits
commit: b11a2969d70e10f2d44c6d6f264a6d8df19fcb9c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 16:34:09 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 21:25:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11a2969
media-libs/opencv: Kill redundant 'emake clean' - fix ninja, #602232
Kill the call to 'emake clean' for Python build directory which
obviously does not work when Ninja is used instead of Makefiles. It is
completely redundant since it is followed by 'rm -rf' of the whole
directory (tested with Makefiles and Ninja).
media-libs/opencv/opencv-3.1.0-r7.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
index f8747c5..26371e1 100644
--- a/media-libs/opencv/opencv-3.1.0-r7.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r7.ebuild
@@ -279,7 +279,6 @@ python_module_compile() {
# Remove compiled binary so new version compiles
# Avoid conflicts with new module builds as build system doesn't
# really support it.
- emake -C modules/python2 clean
rm -rf modules/python2 || die "rm failed"
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-12-10 21:47 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2016-12-10 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 596bf1589b40e4bb0c35811a2a6ead82e7157cc8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 21:47:15 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 21:47:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596bf158
media-libs/opencv: [QA] Minor fixes
Package-Manager: portage-2.3.3
media-libs/opencv/opencv-3.1.0-r7.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
index 26371e1..879e7e2 100644
--- a/media-libs/opencv/opencv-3.1.0-r7.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r7.ebuild
@@ -115,11 +115,12 @@ pkg_pretend() {
}
pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- default
+ cmake-utils_src_prepare
# remove bundled stuff
rm -rf 3rdparty || die "Removing 3rd party components failed"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2016-12-14 23:31 Amy Winston
0 siblings, 0 replies; 208+ messages in thread
From: Amy Winston @ 2016-12-14 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 9988ee34ddbe72fc1aad5982ba8b6f7c6423a666
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 23:30:11 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 23:30:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9988ee34
media-libs/opencv: version bump 2.4.13 bug #601810
Package-Manager: portage-2.3.0
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-2.4.13.ebuild | 241 +++++++++++++++++++++++++++++++++
2 files changed, 242 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 9838733..985f9f1 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
+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/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
new file mode 100644
index 00000000..2f594ee
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.13.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}.zip -> ${P}.zip"
+
+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}-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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-01-20 14:37 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-01-20 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 24f777d08cddf2fe05031d1c8c63232d6e025724
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 14:35:05 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 14:35:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f777d0
media-libs/opencv: fix gtk bug #605740
Package-Manager: portage-2.3.0
media-libs/opencv/opencv-3.1.0-r6.ebuild | 4 ++--
media-libs/opencv/opencv-3.1.0-r7.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r6.ebuild b/media-libs/opencv/opencv-3.1.0-r6.ebuild
index 5c5c284..fd9d870 100644
--- a/media-libs/opencv/opencv-3.1.0-r6.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -149,7 +149,7 @@ src_configure() {
-DWITH_GSTREAMER=$(usex gstreamer)
-DWITH_GSTREAMER_0_10=OFF # Don't want this
-DWITH_GTK=$(usex gtk)
- -DWITH_GTK_2_X=OFF
+ -DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=$(usex ipp)
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
index 879e7e2..9c60178 100644
--- a/media-libs/opencv/opencv-3.1.0-r7.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -149,7 +149,7 @@ src_configure() {
-DWITH_GSTREAMER=$(usex gstreamer)
-DWITH_GSTREAMER_0_10=OFF # Don't want this
-DWITH_GTK=$(usex gtk)
- -DWITH_GTK_2_X=OFF
+ -DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=$(usex ipp)
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-01-23 13:51 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2017-01-23 13:51 UTC (permalink / raw
To: gentoo-commits
commit: f8425666a8d8843aebfaa25235e016974af010a2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 13:50:37 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 13:51:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8425666
media-libs/opencv: amd64 stable wrt bug #606810
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
index 2f594ee..824c5db 100644
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ b/media-libs/opencv/opencv-2.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
LICENSE="BSD"
SLOT="0/2.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+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} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-01-23 15:46 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2017-01-23 15:46 UTC (permalink / raw
To: gentoo-commits
commit: c75b07b9928a7295bc18122e4e51eed688b17308
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 15:45:58 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 15:45:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75b07b9
media-libs/opencv: x86 stable wrt bug #606810
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
index 824c5db..e94ef39 100644
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ b/media-libs/opencv/opencv-2.4.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
LICENSE="BSD"
SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+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} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-02-07 18:51 Johannes Huber
0 siblings, 0 replies; 208+ messages in thread
From: Johannes Huber @ 2017-02-07 18:51 UTC (permalink / raw
To: gentoo-commits
commit: 93c7614392cc4f49c2623032159f9348703305c9
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 18:51:17 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 18:51:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c76143
media-libs/opencv: Drop kde from maintainers
As discussed with amynka and dilfridge at Delirium Cafe.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/opencv/metadata.xml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index bc331e3..d136656 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -2,18 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>amynka@gentoo.org</email>
- <name>Amy Winston</name>
- <description>Assign bugs on me.</description>
- </maintainer>
+ <email>amynka@gentoo.org</email>
+ <name>Amy Winston</name>
+ <description>Assign bugs on me.</description>
+ </maintainer>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
</maintainer>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-02-09 20:04 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-02-09 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 0d7cbaf881eceb24fd9485cd5ed4646e7d39c82f
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 20:04:00 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 20:04:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7cbaf8
media-libs/opencv: remove old
Package-Manager: portage-2.3.0
media-libs/opencv/Manifest | 1 -
media-libs/opencv/opencv-2.4.12-r1.ebuild | 242 ------------------------------
2 files changed, 243 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 985f9f18f7..4b12e50eae 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,3 @@
-DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
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/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
deleted file mode 100644
index 9eeddfd411..0000000000
--- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}.zip -> ${P}.zip"
-
-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}/${P}-git-autodetect.patch"
- "${FILESDIR}/${PN}-3.0.0-gles.patch"
- )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # 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() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- 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 ON OFF)
- -DWITH_AVFOUNDATION=OFF
- -DWITH_VTK=$(usex vtk ON OFF)
- -DWITH_EIGEN=$(usex eigen ON OFF)
- -DWITH_VFW=OFF
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER=$(usex gstreamer ON OFF)
- -DWITH_GSTREAMER_0_10=OFF
- -DWITH_GTK=$(usex gtk ON OFF)
- -DWITH_IMAGEIO=OFF
- -DWITH_IPP=$(usex ipp ON OFF)
- -DWITH_JASPER=$(usex jpeg2k ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_OPENEXR=$(usex openexr ON OFF)
- -DWITH_OPENGL=$(usex opengl ON OFF)
- -DWITH_OPENCL=$(usex opencl ON OFF)
- -DWITH_OPENNI=OFF
- -DWITH_PNG=$(usex png ON OFF)
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_WIN32UI=OFF
- -DWITH_QUICKTIME=OFF
- -DWITH_TBB=$(usex threads ON OFF)
- -DWITH_OPENMP=$(usex openmp ON OFF)
- -DWITH_CSTRIPES=OFF
- -DWITH_TIFF=$(usex tiff ON OFF)
- -DWITH_UNICAP=OFF
- -DWITH_V4L=$(usex v4l ON OFF)
- -DWITH_LIBV4L=$(usex v4l ON OFF)
- -DWITH_DSHOW=ON
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF
- -DWITH_XINE=$(usex xine ON OFF)
- -DWITH_OPENCL=$(usex opencl ON OFF)
- -DWITH_OPENCLAMDFFT=$(usex opencl ON OFF)
- -DWITH_OPENCLAMDBLAS=$(usex opencl ON OFF)
- -DWITH_INTELPERC=OFF
- -DWITH_JAVA=$(usex java ON OFF)
-
- # the build components
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_DOCS=OFF #too much dark magic in cmakelists
- -DBUILD_EXAMPLES=$(usex examples ON OFF)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(usex testprograms ON OFF)
-
- # install examples
- -DINSTALL_C_EXAMPLES=$(usex examples ON OFF)
- -DINSTALL_TESTS=$(usex testprograms ON OFF)
-
- # build options
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch ON OFF)
- -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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-07-09 9:48 Alexis Ballier
0 siblings, 0 replies; 208+ messages in thread
From: Alexis Ballier @ 2017-07-09 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 862c87f93a3f78243af1e091836f6382647be091
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 09:48:20 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 09:48:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862c87f9
media-libs/opencv: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/opencv/opencv-3.2.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.2.0-r1.ebuild b/media-libs/opencv/opencv-3.2.0-r1.ebuild
index 6e33ecd87af..fc5c7aeb029 100644
--- a/media-libs/opencv/opencv-3.2.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.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"
+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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-08-11 13:21 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-08-11 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 18ba8e8a0e09ab901aba054af8f8d2743227febf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 09:54:33 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 13:20:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ba8e8a
media-libs/opencv: Fix automagic dep on tesseract
media-libs/opencv/opencv-3.1.0-r8.ebuild | 10 ++++++++++
media-libs/opencv/opencv-3.2.0-r3.ebuild | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index a4f6ffd7f96..75af0b42c87 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -244,6 +244,16 @@ multilib_src_configure() {
-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
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index ea277d363e9..57e9db2784e 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -286,6 +286,16 @@ multilib_src_configure() {
-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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-08-11 13:21 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-08-11 13:21 UTC (permalink / raw
To: gentoo-commits
commit: d93b7bbbe54791dcca57ace7779d2eb4c101467f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 20:55:36 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 13:20:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93b7bbb
media-libs/opencv: Enable multilib builds for 3.1.0 & 3.2.0
media-libs/opencv/opencv-3.1.0-r8.ebuild | 294 +++++++++++++++++++++++++++
media-libs/opencv/opencv-3.2.0-r3.ebuild | 336 +++++++++++++++++++++++++++++++
2 files changed, 630 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
new file mode 100644
index 00000000000..a4f6ffd7f96
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -0,0 +1,294 @@
+# 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="http://opencv.org"
+
+BASE_URI="https://github.com/${PN}/${PN}"
+#commit from Thu, 02 Jun 2016
+CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
+CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
+
+SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
+ ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
+ +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
+ contrib_cvv contrib_hdf contrib_sfm"
+
+# 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[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ 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}] )
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ ieee1394? (
+ media-libs/libdc1394[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ ipp? ( sci-libs/ipp )
+ contrib_hdf? ( sci-libs/hdf5 )
+ 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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.0-gles.patch
+ "${FILESDIR}"/${P}-cmake-no-opengl.patch
+ "${FILESDIR}"/${P}-git-autodetect.patch
+ "${FILESDIR}"/${P}-java-magic.patch
+ "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
+ "${FILESDIR}"/${P}-find-libraries-fix.patch
+)
+
+GLOBALCMAKEARGS=()
+
+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
+
+ 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_OPENNI=OFF # Not packaged
+ -DWITH_OPENNI2=OFF # Not packaged
+ -DWITH_PNG=$(usex png)
+ -DWITH_PVAPI=OFF # Not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+ -DWITH_WIN32UI=OFF # Windows only
+ -DWITH_QUICKTIME=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)
+ # ===================================================
+ # 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)
+ -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+ # ===================================================
+ # OpenCV build components
+ # ===================================================
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ -DBUILD_DOCS=OFF # Doesn't install anyways.
+ -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+ -DBUILD_PERF_TESTS=OFF
+ -DBUILD_TESTS=$(multilib_native_usex testprograms)
+ -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
+ # ===================================================
+ # OpenCV installation options
+ # ===================================================
+ -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+ -DINSTALL_TESTS=$(multilib_native_usex testprograms)
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+ -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+ # ===================================================
+ # 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_cvv=$(usex contrib_cvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_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 BUILD_DIR=${orig_BUILD_DIR}
+ local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+ # Set all python variables to load the correct Gentoo paths
+ mycmakeargs+=(
+ # upstream doesn't really care about 2/3, and if we don't
+ # disable this, it builds python2 + python3 module for the same
+ # version of Python 3 (i.e. two identical modules)...
+ -DPYTHON3_EXECUTABLE=/bin/false
+ -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.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
new file mode 100644
index 00000000000..ea277d363e9
--- /dev/null
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -0,0 +1,336 @@
+# 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="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 ~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[${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 )"
+
+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
+
+ # 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)
+ # ===================================================
+ # 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
+ -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=$(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
+ -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=$(multilib_native_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 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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-08-14 19:49 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-08-14 19:49 UTC (permalink / raw
To: gentoo-commits
commit: c91d969f8b4cc948ea714cdeac75ef892811807b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 19:45:41 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 19:49:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91d969f
media-libs/opencv: Fix wrapping cvconfig.h, #627730
media-libs/opencv/opencv-3.1.0-r8.ebuild | 4 ++++
media-libs/opencv/opencv-3.2.0-r3.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index 75af0b42c87..490b97bce35 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -102,6 +102,10 @@ DEPEND="${RDEPEND}
eigen? ( dev-cpp/eigen:3 )
java? ( >=virtual/jdk-1.6 )"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/opencv2/cvconfig.h
+)
+
PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-gles.patch
"${FILESDIR}"/${P}-cmake-no-opengl.patch
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 57e9db2784e..d086af8ee6b 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -95,6 +95,10 @@ DEPEND="${RDEPEND}
eigen? ( dev-cpp/eigen:3 )
java? ( >=virtual/jdk-1.6 )"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/opencv2/cvconfig.h
+)
+
PATCHES=(
"${FILESDIR}/${PN}-3.0.0-gles.patch"
"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-08-21 22:30 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-08-21 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 0b5fbd1002290d0b09e0c99f1364ed05104f914f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 22:30:09 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 22:30:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5fbd10
media-libs/opencv: Fix header wrapping w/[vtk], #627730
media-libs/opencv/opencv-3.2.0-r3.ebuild | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index d086af8ee6b..cd80fac68b7 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -97,6 +97,14 @@ DEPEND="${RDEPEND}
MULTILIB_WRAPPED_HEADERS=(
/usr/include/opencv2/cvconfig.h
+ /usr/include/opencv2/opencv_modules.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=(
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-08-26 20:02 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-08-26 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 70b46f65dbbe9770a1774dd6ac7b025341823996
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 19:11:45 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 20:02:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b46f65
media-libs/opencv: Fix header wrapping for [contrib_cvv]
media-libs/opencv/opencv-3.2.0-r3.ebuild | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index cd80fac68b7..88d6e19eb55 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -98,6 +98,15 @@ DEPEND="${RDEPEND}
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
# [vtk]
/usr/include/opencv2/viz.hpp
/usr/include/opencv2/viz/types.hpp
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-09-01 11:39 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-09-01 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 02d7a8a902caf91a4b7a7aa460beb87ff826c28f
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 11:31:54 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 11:37:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d7a8a9
media-libs/opencv: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-libs/opencv/opencv-3.1.0-r6.ebuild | 295 ---------------------------
media-libs/opencv/opencv-3.1.0-r7.ebuild | 290 ---------------------------
media-libs/opencv/opencv-3.2.0.ebuild | 329 -------------------------------
3 files changed, 914 deletions(-)
diff --git a/media-libs/opencv/opencv-3.1.0-r6.ebuild b/media-libs/opencv/opencv-3.1.0-r6.ebuild
deleted file mode 100644
index 06daae20513..00000000000
--- a/media-libs/opencv/opencv-3.1.0-r6.ebuild
+++ /dev/null
@@ -1,295 +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="http://opencv.org"
-
-BASE_URI="https://github.com/${PN}/${PN}"
-#commit from Thu, 02 Jun 2016
-CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
-CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
-
-SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
- contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
- ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
- +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
- contrib_cvv contrib_hdf contrib_sfm"
-
-# 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= )
- 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 )
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- ieee1394? (
- media-libs/libdc1394
- sys-libs/libraw1394
- )
- ipp? ( sci-libs/ipp )
- contrib_hdf? ( sci-libs/hdf5 )
- 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}"/${P}-cmake-no-opengl.patch
- "${FILESDIR}"/${P}-git-autodetect.patch
- "${FILESDIR}"/${P}-java-magic.patch
- "${FILESDIR}"/${P}-gentooify-python.patch
- "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
- "${FILESDIR}"/${P}-find-libraries-fix.patch
-)
-
-GLOBALCMAKEARGS=()
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # remove bundled stuff
- rm -rf 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || 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
- 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_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_PVAPI=OFF # Not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QT=$(usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- -DWITH_QUICKTIME=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)
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(usex cuda)
- -DWITH_CUBLAS=$(usex cuda)
- -DWITH_CUFFT=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(usex testprograms)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_C_EXAMPLES=$(usex examples)
- -DINSTALL_TESTS=$(usex testprograms)
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DHAVE_opencv_java=$(usex java YES NO)
- # ===================================================
- # 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_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[@]}
- -DWITH_PYTHON=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+=(
- -DWITH_PYTHON=ON
- -DGENTOO_PYTHON_EXECUTABLE=${EPYTHON}
- -DGENTOO_PYTHON_INCLUDE_PATH="$(python_get_includedir)"
- -DGENTOO_PYTHON_LIBRARIES="$(python_get_library_path)"
- -DGENTOO_PYTHON_PACKAGES_PATH="$(python_get_sitedir)"
- -DGENTOO_PYTHON_MAJOR=${EPYTHON:6:1}
- -DGENTOO_PYTHON_MINOR=${EPYTHON:8:1}
- -DGENTOO_PYTHON_DEBUG_LIBRARIES=""
- -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.
- emake -C modules/${EPYTHON:0:7} clean
- rm -rf modules/${EPYTHON:0:7} || 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.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild
deleted file mode 100644
index 41aa05a2ab7..00000000000
--- a/media-libs/opencv/opencv-3.1.0-r7.ebuild
+++ /dev/null
@@ -1,290 +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="http://opencv.org"
-
-BASE_URI="https://github.com/${PN}/${PN}"
-#commit from Thu, 02 Jun 2016
-CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
-CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
-
-SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
- contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
- ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
- +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
- contrib_cvv contrib_hdf contrib_sfm"
-
-# 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= )
- 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 )
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- ieee1394? (
- media-libs/libdc1394
- sys-libs/libraw1394
- )
- ipp? ( sci-libs/ipp )
- contrib_hdf? ( sci-libs/hdf5 )
- 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}"/${P}-cmake-no-opengl.patch
- "${FILESDIR}"/${P}-git-autodetect.patch
- "${FILESDIR}"/${P}-java-magic.patch
- "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
- "${FILESDIR}"/${P}-find-libraries-fix.patch
-)
-
-GLOBALCMAKEARGS=()
-
-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
-
- 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_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_PVAPI=OFF # Not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QT=$(usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- -DWITH_QUICKTIME=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)
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(usex cuda)
- -DWITH_CUBLAS=$(usex cuda)
- -DWITH_CUFFT=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(usex testprograms)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_C_EXAMPLES=$(usex examples)
- -DINSTALL_TESTS=$(usex testprograms)
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DHAVE_opencv_java=$(usex java YES NO)
- # ===================================================
- # 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_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+=(
- # upstream doesn't really care about 2/3, and if we don't
- # disable this, it builds python2 + python3 module for the same
- # version of Python 3 (i.e. two identical modules)...
- -DPYTHON3_EXECUTABLE=/bin/false
- -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.ebuild b/media-libs/opencv/opencv-3.2.0.ebuild
deleted file mode 100644
index 4f91336a398..00000000000
--- a/media-libs/opencv/opencv-3.2.0.ebuild
+++ /dev/null
@@ -1,329 +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="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"
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-09-06 21:00 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-09-06 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 2f33a65a0544bc28d18e5e98eb6c93e3b3faf710
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Sep 3 16:19:13 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 20:58:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f33a65a
media-libs/opencv: use HTTPS for links to dev.gentoo.org
media-libs/opencv/opencv-3.2.0-r2.ebuild | 2 +-
media-libs/opencv/opencv-3.2.0-r3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-3.2.0-r2.ebuild b/media-libs/opencv/opencv-3.2.0-r2.ebuild
index 6793803ee3b..7d0aeabcf7f 100644
--- a/media-libs/opencv/opencv-3.2.0-r2.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r2.ebuild
@@ -11,7 +11,7 @@ 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 ) )"
+ 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"
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 88d6e19eb55..6ca89918bc5 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -12,7 +12,7 @@ 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 ) )"
+ 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"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-09-11 14:32 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-09-11 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 2f0e1b275057b87166fb1f11a3849ee2a4c14f75
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 14:02:16 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 14:31:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0e1b27
media-libs/opencv: Backport multilib header fixes to 3.1.0-r8
Closes: https://bugs.gentoo.org/630604
media-libs/opencv/opencv-3.1.0-r8.ebuild | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index 490b97bce35..58487f70f7b 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -104,6 +104,23 @@ DEPEND="${RDEPEND}
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
+ # [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=(
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-09-11 20:43 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2017-09-11 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 8d93eec00a5d7ed495f31c6d5b9fa06ee0a87fbf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 20:39:38 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 20:43:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d93eec0
media-libs/opencv: Multilib [contrib_hdf] headers
Closes: https://bugs.gentoo.org/630604
media-libs/opencv/opencv-3.1.0-r8.ebuild | 3 +++
media-libs/opencv/opencv-3.2.0-r3.ebuild | 3 +++
2 files changed, 6 insertions(+)
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index 58487f70f7b..d98e0e09ffd 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -114,6 +114,9 @@ MULTILIB_WRAPPED_HEADERS=(
/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
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 6ca89918bc5..94e5af0f524 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -107,6 +107,9 @@ MULTILIB_WRAPPED_HEADERS=(
/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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-10-09 14:54 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-10-09 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 57e183e7915fe6ee5cefb822b6daf06baf5dc790
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 14:41:45 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 14:54:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e183e7
media-libs/opencv: fix protobuf dnn module bug #631418
Suggested-by: Hanno Meyer-Thurow (geki) <h.mth <AT> web.de>
Suggested-by: Dennis Schridde <devurandom <AT> gmx.net>
Suggested-by: Magnus Kessler <Magnus.Kessler <AT> gmx.net>
Suggested-by: zappel <AT> simple-co.de
Closes: https://bugs.gentoo.org/631418
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../opencv/{opencv-3.3.0-r1.ebuild => opencv-3.3.0-r2.ebuild} | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/media-libs/opencv/opencv-3.3.0-r1.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-3.3.0-r1.ebuild
rename to media-libs/opencv/opencv-3.3.0-r2.ebuild
index eaa25d8ec26..a6a2298e02c 100644
--- a/media-libs/opencv/opencv-3.3.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r2.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="
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 )
@@ -277,6 +278,11 @@ multilib_src_configure() {
# ===================================================
-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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-10-31 17:09 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-10-31 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 6d1936a3ab5020aff5327928067b67e0dd31026d
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 17:07:39 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 17:08:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1936a3
media-libs/opencv: few cuda fixes
- Remove cuda from required_use for xfeatures2d
- fix header files have changed between ABIs
Suggested-by: malcolm.mielle <AT> protonmail.com
Submitted-by: Serge Gavrilov <serge <AT> pdmi.ras.ru>
Closes: https://bugs.gentoo.org/636030
Closes: https://bugs.gentoo.org/636008
Package-Manager: Portage-2.3.8, Repoman-2.3.1
media-libs/opencv/opencv-3.3.0-r3.ebuild | 454 +++++++++++++++++++++++++++++++
1 file changed, 454 insertions(+)
diff --git a/media-libs/opencv/opencv-3.3.0-r3.ebuild b/media-libs/opencv/opencv-3.3.0-r3.ebuild
new file mode 100644
index 00000000000..40b1dee93bc
--- /dev/null
+++ b/media-libs/opencv/opencv-3.3.0-r3.ebuild
@@ -0,0 +1,454 @@
+# 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="http://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 )
+ 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
+ # [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.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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-01 17:25 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-11-01 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 14bf51349b362e324b258fe530913f5e6070e7b3
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 1 17:17:17 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Nov 1 17:23:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bf5134
media-libs/opencv: add back cuda require_use features2d
Package-Manager: Portage-2.3.8, Repoman-2.3.1
media-libs/opencv/{opencv-3.3.0-r3.ebuild => opencv-3.3.0-r4.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.3.0-r3.ebuild b/media-libs/opencv/opencv-3.3.0-r4.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-3.3.0-r3.ebuild
rename to media-libs/opencv/opencv-3.3.0-r4.ebuild
index 40b1dee93bc..d1dae1bd401 100644
--- a/media-libs/opencv/opencv-3.3.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r4.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
contrib_cvv? ( contrib qt5 )
contrib_hdf? ( contrib )
contrib_sfm? ( contrib eigen gflags glog )
- contrib_xfeatures2d? ( contrib )
+ contrib_xfeatures2d? ( contrib cuda )
java? ( python )
opengl? ( || ( gtk qt5 ) )
python? ( ${PYTHON_REQUIRED_USE} )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-20 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2017-11-20 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 632532397455bec4cc6d0a89f1759de4f81dfd00
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 17:44:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 18:50:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63253239
media-libs/opencv: Switch to https
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/opencv/opencv-2.4.13-r3.ebuild | 2 +-
media-libs/opencv/opencv-2.4.13.ebuild | 2 +-
media-libs/opencv/opencv-3.1.0-r8.ebuild | 2 +-
media-libs/opencv/opencv-3.2.0-r2.ebuild | 2 +-
media-libs/opencv/opencv-3.2.0-r3.ebuild | 2 +-
media-libs/opencv/opencv-3.3.0-r2.ebuild | 2 +-
media-libs/opencv/opencv-3.3.0-r4.ebuild | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index f2f5fa1b00f..432be71ee8c 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://opencv.org"
SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
index c43b5842200..b267fe7783b 100644
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ b/media-libs/opencv/opencv-2.4.13.ebuild
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://opencv.org"
SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index d98e0e09ffd..e794ca1e080 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs 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"
+HOMEPAGE="https://opencv.org"
BASE_URI="https://github.com/${PN}/${PN}"
#commit from Thu, 02 Jun 2016
diff --git a/media-libs/opencv/opencv-3.2.0-r2.ebuild b/media-libs/opencv/opencv-3.2.0-r2.ebuild
index 7d0aeabcf7f..f12619bdadb 100644
--- a/media-libs/opencv/opencv-3.2.0-r2.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r2.ebuild
@@ -7,7 +7,7 @@ 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"
+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
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 94e5af0f524..4046f42d260 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -8,7 +8,7 @@ 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="http://opencv.org"
+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
diff --git a/media-libs/opencv/opencv-3.3.0-r2.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
index a6a2298e02c..d37063d4ff3 100644
--- a/media-libs/opencv/opencv-3.3.0-r2.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r2.ebuild
@@ -7,7 +7,7 @@ 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="http://opencv.org"
+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
diff --git a/media-libs/opencv/opencv-3.3.0-r4.ebuild b/media-libs/opencv/opencv-3.3.0-r4.ebuild
index d1dae1bd401..5910a643bae 100644
--- a/media-libs/opencv/opencv-3.3.0-r4.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r4.ebuild
@@ -7,7 +7,7 @@ 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="http://opencv.org"
+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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-20 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2017-11-20 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 7b2a0b49504cb33f9e21c74bd771476c3ec71cda
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 17:42:25 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 18:50:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2a0b49
media-libs/opencv: Drop 2.4.13-r2
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/opencv/opencv-2.4.13-r2.ebuild | 240 ------------------------------
1 file changed, 240 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r2.ebuild b/media-libs/opencv/opencv-2.4.13-r2.ebuild
deleted file mode 100644
index 4158e701ea4..00000000000
--- a/media-libs/opencv/opencv-2.4.13-r2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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}-imgcodecs-refactoring.patch" #bug 627958
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-20 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2017-11-20 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 91df30d9986062579ba0e9d6c2e97f4440b3136a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 17:39:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 18:50:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91df30d9
media-libs/opencv: Drop USE=qt4
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/opencv/opencv-2.4.13-r3.ebuild | 227 ++++++++++++++++++++++++++++++
1 file changed, 227 insertions(+)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
new file mode 100644
index 00000000000..f2f5fa1b00f
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -0,0 +1,227 @@
+# 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 qt5 testprograms threads tiff v4l vtk xine"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 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}] )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qttest: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}-imgcodecs-refactoring.patch" #bug 627958
+)
+
+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_QT=$(usex qt5 5 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 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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-24 13:23 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2017-11-24 13:23 UTC (permalink / raw
To: gentoo-commits
commit: b33e8014440a1a1d4db849568046acaa2084fafc
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 13:23:47 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 13:23:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33e8014
media-libs/opencv: amd64 stable wrt bug #627230
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +-
media-libs/opencv/opencv-2.4.13-r3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index feb1a990ef8..0e8ded1a6aa 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 WHIRLPOOL fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d
-DIST opencv-2.4.13.tar.gz 91669572 SHA256 94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6 WHIRLPOOL 9fdbf2e47edeb8c177cb03ed5dc129475dd704c022975bc875d444a6e6c3df630f1151e738cf07fbe48343d0eb87723091131063fe776c63a386c46c0153f1d5
+DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
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/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 432be71ee8c..34a5fe5bd58 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -13,7 +13,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"
+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"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-27 0:20 Thomas Deutschmann
0 siblings, 0 replies; 208+ messages in thread
From: Thomas Deutschmann @ 2017-11-27 0:20 UTC (permalink / raw
To: gentoo-commits
commit: 0cb654a168cecfe0ccde8a17824b53c63d12a852
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 23:15:13 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 00:19:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb654a1
media-libs/opencv: x86 stable (bug #627230)
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-libs/opencv/opencv-2.4.13-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 34a5fe5bd58..9ff99bb067e 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -13,7 +13,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"
+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"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2017-11-27 7:33 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2017-11-27 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 84fde63799f57375e4dc9d9f6ecb07e5aaf55c8a
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 07:32:18 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 07:32:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fde637
media-libs/opencv: drop old vulnerable version
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-libs/opencv/Manifest | 7 +-
media-libs/opencv/opencv-2.4.13.ebuild | 240 ---------------------------------
2 files changed, 3 insertions(+), 244 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 0e8ded1a6aa..f6394c76737 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,9 @@
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 WHIRLPOOL fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d
+DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-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
DIST opencv-3.2.0.tar.gz 78861546 SHA256 b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d WHIRLPOOL 092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a WHIRLPOOL eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
-DIST opencv-3.3.0.tar.gz 81238534 SHA256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb WHIRLPOOL 211496e559fa3a78b662329a5e21613fdc39b616155584311f82f3d7c733676bcb58d8e04ffda2d73658933240e16122212413fa1c2e6dfe764439c9460d7c41
-DIST opencv-3.3.0_contrib.tar.gz 54848519 SHA256 e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444 SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e WHIRLPOOL b186f673e276c4b8c4c5253fd17181f0e1b7bd4a0e0c74f15ab55ea5f2ee54a72fc295247c7bfcbfbedba1fc01b4c5e2a53a2a4eff79ab0480977a6eefc90c58
+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 vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 WHIRLPOOL 5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild
deleted file mode 100644
index b267fe7783b..00000000000
--- a/media-libs/opencv/opencv-2.4.13.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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="https://opencv.org"
-
-SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
-
-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}-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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-05-25 19:34 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-05-25 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 87c7f56621506120ca81cb7098b836d922280d7d
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 19:33:22 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:33:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c7f566
media-libs/opencv: drop old 3.1.0
Closes: https://bugs.gentoo.org/557328
Closes: https://bugs.gentoo.org/600658
Closes: https://bugs.gentoo.org/607830
Closes: https://bugs.gentoo.org/611964
Closes: https://bugs.gentoo.org/639896
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/opencv/Manifest | 2 -
media-libs/opencv/opencv-3.1.0-r8.ebuild | 328 -------------------------------
2 files changed, 330 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 26353736e85..9b52583151c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,7 +1,5 @@
DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-3.1.0.tar.gz 76135587 BLAKE2B 59d0facba6573ae7b6ec8b4d8097693181244988c8c460a738004b975a65442230f387eef172920cd56682a4fa19f28368262ad85b7c79f243e2063c56275755 SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
-DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 BLAKE2B 0e73381acea4cc8552579208ac438239f52c6ebafd1cc533c658b237bfd010754bf19a2645db766dffe1e7613470f1dee99eb867eed95f627182a101defd788b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
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
diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
deleted file mode 100644
index e794ca1e080..00000000000
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ /dev/null
@@ -1,328 +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"
-
-BASE_URI="https://github.com/${PN}/${PN}"
-#commit from Thu, 02 Jun 2016
-CONTRIB_URI="75b3ea9f72fdb083140fc63855b7677d67748376"
-CONTRIB_P="${P}_contrib-${CONTRIB_URI:0:7}"
-
-SRC_URI="${BASE_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz
- contrib? ( ${BASE_URI}_contrib/archive/${CONTRIB_URI}.tar.gz -> ${CONTRIB_P}.tar.gz )"
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk \
- ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
- +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine \
- contrib_cvv contrib_hdf contrib_sfm"
-
-# 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[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- 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}] )
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- ieee1394? (
- media-libs/libdc1394[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- ipp? ( sci-libs/ipp )
- contrib_hdf? ( sci-libs/hdf5 )
- 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}"/${P}-cmake-no-opengl.patch
- "${FILESDIR}"/${P}-git-autodetect.patch
- "${FILESDIR}"/${P}-java-magic.patch
- "${FILESDIR}"/${P}-remove-graphcut-for-cuda-8.patch
- "${FILESDIR}"/${P}-find-libraries-fix.patch
-)
-
-GLOBALCMAKEARGS=()
-
-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
-
- 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_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_PVAPI=OFF # Not packaged
- -DWITH_GIGEAPI=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- -DWITH_QUICKTIME=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)
- # ===================================================
- # 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)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${CONTRIB_URI}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- # ===================================================
- # 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_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+=(
- # upstream doesn't really care about 2/3, and if we don't
- # disable this, it builds python2 + python3 module for the same
- # version of Python 3 (i.e. two identical modules)...
- -DPYTHON3_EXECUTABLE=/bin/false
- -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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-05-25 20:28 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-05-25 20:28 UTC (permalink / raw
To: gentoo-commits
commit: ce65f89314c7512169830ae6a76ef0c23494b4b9
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 20:26:34 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri May 25 20:27:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce65f893
media-libs/opencv: remove not required cpu flags
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/opencv/opencv-3.4.1.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-libs/opencv/opencv-3.4.1.ebuild b/media-libs/opencv/opencv-3.4.1.ebuild
index 0f07d45bf9b..93975a066b1 100644
--- a/media-libs/opencv/opencv-3.4.1.ebuild
+++ b/media-libs/opencv/opencv-3.4.1.ebuild
@@ -27,8 +27,6 @@ IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2
# 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 )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-05-28 12:56 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-05-28 12:56 UTC (permalink / raw
To: gentoo-commits
commit: 2b6c94485e1ce52cb73370702d845a4326f4f97a
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 12:53:49 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon May 28 12:55:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6c9448
media-libs/opencv: add missing cpu_flags_x86_ssse3
Subitted-by: Michael Uleysky <uleysky <AT> gmail.com>
Closes: https://bugs.gentoo.org/656726
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/opencv/{opencv-3.4.1.ebuild => opencv-3.4.1-r1.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.4.1.ebuild b/media-libs/opencv/opencv-3.4.1-r1.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-3.4.1.ebuild
rename to media-libs/opencv/opencv-3.4.1-r1.ebuild
index 93975a066b1..578d147619a 100644
--- a/media-libs/opencv/opencv-3.4.1.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r1.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_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 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.
@@ -404,6 +404,7 @@ multilib_src_configure() {
-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)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-08-16 15:09 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-08-16 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 9135e0d86e3841b5153acaf11310a47817d5c7ab
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 08:11:55 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 15:09:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9135e0d8
media-libs/opencv: add required use for cpu_flags
- Add required_use for cpu_flag
Submitted-by: Hector Martin <marcan <AT> marcan.st>
- Add ninja as default
Closes: https://bugs.gentoo.org/656638
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/opencv/opencv-3.4.1-r3.ebuild | 508 +++++++++++++++++++++++++++++++
1 file changed, 508 insertions(+)
diff --git a/media-libs/opencv/opencv-3.4.1-r3.ebuild b/media-libs/opencv/opencv-3.4.1-r3.ebuild
new file mode 100644
index 00000000000..89dc5ebc819
--- /dev/null
+++ b/media-libs/opencv/opencv-3.4.1-r3.ebuild
@@ -0,0 +1,508 @@
+# 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} )
+
+: ${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
+ 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_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.
+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 )
+ java? ( python )
+ opengl? ( || ( gtk qt5 ) )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tesseract? ( contrib )
+ cpu_flags_x86_avx2? ( cpu_flags_x86_avx cpu_flags_x86_fma3 )
+ cpu_flags_x86_fma3? ( cpu_flags_x86_avx2 )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 cpu_flags_x86_popcnt )
+ cpu_flags_x86_popcnt? ( cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_sse3 cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_sse2? ( cpu_flags_x86_sse )"
+
+# 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}]
+ )
+ 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"
+ "${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() {
+ [[ ${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=OFF
+ -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=
+ -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)
+ )
+
+ # ===================================================
+ # 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)
+ -DLIBPY_SUFFIX=64
+ )
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-08-16 15:09 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-08-16 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 676eaaf60bb9f5ea1dffaae93f56aff379ab6878
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 14:24:24 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 15:09:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676eaaf6
media-libs/opencv: remove non existing dep sci-libs/ipp
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/opencv/metadata.xml | 1 -
media-libs/opencv/opencv-2.4.13-r3.ebuild | 5 ++---
media-libs/opencv/opencv-3.2.0-r3.ebuild | 7 +++----
media-libs/opencv/opencv-3.3.0-r5.ebuild | 5 ++---
media-libs/opencv/opencv-3.4.1-r2.ebuild | 5 ++---
5 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index f87770fadaf..edc61febd4c 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 9ff99bb067e..37b41c40568 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-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 4046f42d260..ed0aa785e85 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-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r5.ebuild
index 8b76d791041..b9fbce050f1 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 34085a8db24..2b315c3dae2 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)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-08-16 15:09 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-08-16 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 11550cd87ddbbe31ff0e9c28daf59e822c2787f8
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 14:15:02 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 15:09:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11550cd8
media-libs/opencv: remove old revisions
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/opencv/opencv-3.2.0-r2.ebuild | 332 ----------------------
media-libs/opencv/opencv-3.3.0-r2.ebuild | 361 ------------------------
media-libs/opencv/opencv-3.3.0-r4.ebuild | 454 -------------------------------
3 files changed, 1147 deletions(-)
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 f12619bdadb..00000000000
--- 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.3.0-r2.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
deleted file mode 100644
index d37063d4ff3..00000000000
--- 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-r4.ebuild b/media-libs/opencv/opencv-3.3.0-r4.ebuild
deleted file mode 100644
index 5910a643bae..00000000000
--- a/media-libs/opencv/opencv-3.3.0-r4.ebuild
+++ /dev/null
@@ -1,454 +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
- # [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.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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-08-18 6:13 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-08-18 6:13 UTC (permalink / raw
To: gentoo-commits
commit: b396186669ec607562148b9f5303565a5d01aa2b
Author: Ștefan Talpalaru <stefantalpalaru <AT> yahoo <DOT> com>
AuthorDate: Fri Aug 17 15:29:18 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 06:10:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3961866
media-libs/opencv: disable implied CPU flags
The OpenCV build system tries to be helpful by enabling unrequested CPU
flags based on requested ones. Unfortunately, this breaks the build on
AMD Piledriver because FMA3 implies AVX2 which is not available on this
architecture.
Further more, these CPU flags should only be handled by the
corresponding Portage flags, instead of CMake's hard-coded automagic.
This commit fixes that by disabling the whole "implication" mechanism
for CPU flags, while also undoing the previous attempt at solving the
problem by translating those broken "implications" into REQUIRED_USE.
Authored-by: Ștefan Talpalaru <stefantalpalaru <AT> yahoo.com>
Bug: https://bugs.gentoo.org/656638
.../{opencv-3.4.1-r3.ebuild => opencv-3.4.1-r4.ebuild} | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r3.ebuild b/media-libs/opencv/opencv-3.4.1-r4.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-3.4.1-r3.ebuild
rename to media-libs/opencv/opencv-3.4.1-r4.ebuild
index 89dc5ebc819..e2aeffdea2c 100644
--- a/media-libs/opencv/opencv-3.4.1-r3.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r4.ebuild
@@ -41,16 +41,7 @@ REQUIRED_USE="
java? ( python )
opengl? ( || ( gtk qt5 ) )
python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- cpu_flags_x86_avx2? ( cpu_flags_x86_avx cpu_flags_x86_fma3 )
- cpu_flags_x86_fma3? ( cpu_flags_x86_avx2 )
- cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 cpu_flags_x86_popcnt )
- cpu_flags_x86_popcnt? ( cpu_flags_x86_sse4_1 )
- cpu_flags_x86_sse4_1? ( cpu_flags_x86_sse3 cpu_flags_x86_ssse3 )
- cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
- cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
- cpu_flags_x86_sse2? ( cpu_flags_x86_sse )"
+ 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:
@@ -413,6 +404,7 @@ multilib_src_configure() {
# ==================================================
# 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)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-10-19 8:51 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2018-10-19 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 4b053b0ffbb480111e81896ba41983c46bcaac65
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Mon Oct 15 18:49:27 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 08:50:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b053b0f
media-libs/opencv: remove local webp use flag
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index edc61febd4c..8414631c16b 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -31,7 +31,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<flag restrict=">=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>
<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
- <flag name="webp">Enable support for webp image format</flag>
</use>
<upstream>
<remote-id type="sourceforge">opencvlibrary</remote-id>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-11-27 18:29 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2018-11-27 18:29 UTC (permalink / raw
To: gentoo-commits
commit: c531c7dfae4bd7f4677e6cc3043b5de6deaa146f
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 18:24:46 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 18:28:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c531c7df
media-libs/opencv: fix typo
Closes: https://bugs.gentoo.org/669990
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
media-libs/opencv/{opencv-3.2.0-r3.ebuild => opencv-3.2.0-r4.ebuild} | 2 +-
media-libs/opencv/{opencv-3.3.0-r5.ebuild => opencv-3.3.0-r6.ebuild} | 2 +-
media-libs/opencv/opencv-3.4.1-r2.ebuild | 2 +-
media-libs/opencv/{opencv-3.4.1-r4.ebuild => opencv-3.4.1-r5.ebuild} | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r4.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-3.2.0-r3.ebuild
rename to media-libs/opencv/opencv-3.2.0-r4.ebuild
index ed0aa785e85..31102b464ab 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r4.ebuild
@@ -234,7 +234,7 @@ multilib_src_configure() {
# ===================================================
-DBUILD_SHARED_LIBS=ON
-DBUILD_ANDROID_EXAMPLES=OFF
- -BUILD_opencv_apps=
+ -DBUILD_opencv_apps=
-DBUILD_DOCS=OFF # Doesn't install anyways.
-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-DBUILD_PERF_TESTS=OFF
diff --git a/media-libs/opencv/opencv-3.3.0-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r6.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-3.3.0-r5.ebuild
rename to media-libs/opencv/opencv-3.3.0-r6.ebuild
index b9fbce050f1..f911f83e57e 100644
--- a/media-libs/opencv/opencv-3.3.0-r5.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r6.ebuild
@@ -339,7 +339,7 @@ multilib_src_configure() {
# ===================================================
-DBUILD_SHARED_LIBS=ON
-DBUILD_ANDROID_EXAMPLES=OFF
- -BUILD_opencv_apps=
+ -DBUILD_opencv_apps=
-DBUILD_DOCS=OFF # Doesn't install anyways.
-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-DBUILD_PERF_TESTS=OFF
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild
index 2b315c3dae2..5da1df041fd 100644
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r2.ebuild
@@ -345,7 +345,7 @@ multilib_src_configure() {
-DBUILD_SHARED_LIBS=ON
-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-DBUILD_ANDROID_EXAMPLES=OFF
- -BUILD_opencv_apps=
+ -DBUILD_opencv_apps=
-DBUILD_DOCS=OFF # Doesn't install anyways.
-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-DBUILD_PERF_TESTS=OFF
diff --git a/media-libs/opencv/opencv-3.4.1-r4.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-3.4.1-r4.ebuild
rename to media-libs/opencv/opencv-3.4.1-r5.ebuild
index e2aeffdea2c..b03f24a8491 100644
--- a/media-libs/opencv/opencv-3.4.1-r4.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -347,7 +347,7 @@ multilib_src_configure() {
-DBUILD_SHARED_LIBS=ON
-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-DBUILD_ANDROID_EXAMPLES=OFF
- -BUILD_opencv_apps=
+ -DBUILD_opencv_apps=
-DBUILD_DOCS=OFF # Doesn't install anyways.
-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-DBUILD_PERF_TESTS=OFF
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2018-12-02 22:30 Andreas K. Hüttel
0 siblings, 0 replies; 208+ messages in thread
From: Andreas K. Hüttel @ 2018-12-02 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 5c5cb27df9bb999605869e8d233dbc4f761035d4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 22:29:55 2018 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 22:30:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5cb27d
media-libs/opencv: Drop myself as maintainer
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-libs/opencv/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 8414631c16b..ec3913cbbdd 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -5,10 +5,6 @@
<email>amynka@gentoo.org</email>
<name>Amy Liffey</name>
</maintainer>
- <maintainer type="person">
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Huettel</name>
- </maintainer>
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-03-26 20:47 Georgy Yakovlev
0 siblings, 0 replies; 208+ messages in thread
From: Georgy Yakovlev @ 2019-03-26 20:47 UTC (permalink / raw
To: gentoo-commits
commit: a232a9da5922f62dfb73eba78b360bc5eb2e8a19
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 18:49:25 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:46:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a232a9da
media-libs/opencv: fix python build with cmake 3.14
Closes: https://bugs.gentoo.org/680824
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Acked-by: Amy Liffey <amynka <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r5.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index c8bf140695b..092e2a0d7eb 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -472,10 +472,9 @@ python_module_compile() {
# 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)
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=python
-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-DLIBPY_SUFFIX=64
)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-05-16 5:54 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2019-05-16 5:54 UTC (permalink / raw
To: gentoo-commits
commit: 23988a53250d230f2d1c922ee2a77292f247d207
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 05:53:22 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 16 05:54:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23988a53
media-libs/opencv: Revert "arm64 stable"
The package has been stabilize without meeting dependencies.
Reverts: 02ac88a4639f31caae3372e87975b2f48fd23489
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d096c1963ff..d6b5e9464d1 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -23,7 +23,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"
+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
# will silently disable it Wwithout the user knowing, which defeats the
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-05-16 19:30 Aaron Bauman
0 siblings, 0 replies; 208+ messages in thread
From: Aaron Bauman @ 2019-05-16 19:30 UTC (permalink / raw
To: gentoo-commits
commit: d16c28c0731178363937e071fa3bfd617c78f683
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 19:29:40 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu May 16 19:29:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16c28c0
media-libs/opencv: arm64 stable
* deps are fixed now
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d6b5e9464d1..d096c1963ff 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -23,7 +23,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"
+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
# will silently disable it Wwithout the user knowing, which defeats the
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-08-04 13:58 Alexey Shvetsov
0 siblings, 0 replies; 208+ messages in thread
From: Alexey Shvetsov @ 2019-08-04 13:58 UTC (permalink / raw
To: gentoo-commits
commit: ac064acc48d43d7bfbf12c0985c5b0667454600b
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 13:57:55 2019 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 13:57:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac064acc
media-libs/opencv: Works with py3.7
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r6.ebuild | 505 +++++++++++++++++++++++++++++++
1 file changed, 505 insertions(+)
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
new file mode 100644
index 00000000000..2fdf2cd1f98
--- /dev/null
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -0,0 +1,505 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+: ${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
+ 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_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.
+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 )
+ 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}]
+ )
+ 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 )
+ vaapi? ( x11-libs/libva )"
+
+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"
+ "${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
+ "${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
+)
+
+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=OFF
+ -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
+ -DBUILD_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
+ #===================================================
+ -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)
+ )
+
+ # ===================================================
+ # 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=python
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ -DLIBPY_SUFFIX=64
+ )
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-08-28 8:19 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2019-08-28 8:19 UTC (permalink / raw
To: gentoo-commits
commit: e781bc0af848df21f259929a7aae7cf8b30c9588
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 08:19:17 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 08:19:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e781bc0a
media-libs/opencv: [QA] Remove media-libs/jasper dep
Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13-r3.ebuild | 7 +++----
media-libs/opencv/opencv-3.4.1-r5.ebuild | 5 ++---
media-libs/opencv/opencv-3.4.1-r6.ebuild | 5 ++---
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 37b41c40568..d4379a93e73 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 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 libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -43,7 +43,6 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
ieee1394? (
media-libs/libdc1394
sys-libs/libraw1394
@@ -122,7 +121,7 @@ src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_IMAGEIO=OFF
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_OPENEXR=$(usex openexr)
-DWITH_OPENGL=$(usex opengl)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d096c1963ff..662a0e1a266 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -24,7 +24,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 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 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.
@@ -77,7 +77,6 @@ RDEPEND="
)
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}] )
@@ -293,7 +292,7 @@ multilib_src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
index 1f5783f9621..92376a497c4 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -25,7 +25,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 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 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.
@@ -78,7 +78,6 @@ RDEPEND="
)
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}] )
@@ -295,7 +294,7 @@ multilib_src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
-DWITH_OPENEXR=$(usex openexr)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-28 10:00 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-28 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 165c752d53b6d8ba6a9cd23daf79958c27d4c1c1
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 09:57:09 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 09:59:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165c752d
media-libs/opencv: Remove _ from useflags
Closes: https://bugs.gentoo.org/695076
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/metadata.xml | 12 +-
media-libs/opencv/opencv-3.4.1-r5.ebuild | 503 ---------------------
...encv-3.4.1-r6.ebuild => opencv-3.4.1-r7.ebuild} | 39 +-
3 files changed, 25 insertions(+), 529 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index e9ef881716d..a1403df457f 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -17,12 +17,12 @@ 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 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>
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
- <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag>
- <flag restrict=">=media-libs/opencv-3.4.0" name="dnn_samples">Download dnn caffeemodel samples</flag>
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribxfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribcvv">CVV module requires Qt5</flag>
+ <flag restrict=">=media-libs/opencv-3.3.0" name="contribdnn">DNN module contrib requires tiny dnn</flag>
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribhdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
+ <flag restrict=">=media-libs/opencv-3.1.0" name="contribsfm">SFM module requires eigen, gflags, and glog</flag>
+ <flag restrict=">=media-libs/opencv-3.4.0" name="dnnsamples">Download dnn caffeemodel samples</flag>
<flag name="opencl">Add support for OpenCL</flag>
<flag restrict=">=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-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
deleted file mode 100644
index 662a0e1a266..00000000000
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,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
- 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_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 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="
- 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}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${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 )
- vaapi? ( x11-libs/libva )"
-
-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"
- "${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
- "${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
-)
-
-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=OFF
- -DWITH_JASPER=OFF
- -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
- -DBUILD_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
- #===================================================
- -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)
- )
-
- # ===================================================
- # 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=python
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- -DLIBPY_SUFFIX=64
- )
-
- # 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.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
similarity index 92%
rename from media-libs/opencv/opencv-3.4.1-r6.ebuild
rename to media-libs/opencv/opencv-3.4.1-r7.ebuild
index 92376a497c4..3d7cf83a36e 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -12,33 +12,33 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis
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 )
+ dnnsamples? ( 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? (
+ contribdnn? (
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 )
+ contribxfeatures2d? ( 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_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 lapack libav opencl openexr opengl openmp 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 +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg 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="
cuda? ( tesseract? ( opencl ) )
- dnn_samples? ( examples )
+ dnnsamples? ( 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 )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribhdf? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib cuda )
java? ( python )
opengl? ( || ( gtk qt5 ) )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -54,7 +54,7 @@ RDEPEND="
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contrib_hdf? ( sci-libs/hdf5 )
+ contribhdf? ( sci-libs/hdf5 )
ffmpeg? (
libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
@@ -103,7 +103,6 @@ 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 )
vaapi? ( x11-libs/libva )"
@@ -255,7 +254,7 @@ src_prepare() {
sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-i CMakeLists.txt cmake/*cmake || die
- if use dnn_samples; then
+ if use dnnsamples; then
mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
fi
@@ -263,7 +262,7 @@ src_prepare() {
cd "${WORKDIR}/${PN}_contrib-${PV}" || die
eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
- if use contrib_xfeatures2d; then
+ if use contribxfeatures2d; then
mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
fi
fi
@@ -429,13 +428,13 @@ multilib_src_configure() {
# ===================================================
if use contrib; then
GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
+ -DBUILD_opencv_dnn=$(usex contribdnn 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)
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
)
if multilib_is_native_abi; then
@@ -461,7 +460,7 @@ multilib_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
+ if use contribdnn; 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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-28 16:56 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-28 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 2bb83a3237876597e597b7afcabd15e817ed717e
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 16:44:07 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 16:55:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb83a32
media-libs/opencv: version bump 4.1.2
Closes: https://bugs.gentoo.org/685106
Closes: https://bugs.gentoo.org/678460
Closes: https://bugs.gentoo.org/663730
Closes: https://bugs.gentoo.org/689840
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/metadata.xml | 2 +
media-libs/opencv/opencv-4.1.2.ebuild | 494 ++++++++++++++++++++++++++++++++++
3 files changed, 498 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4cfab222a0a..f7ec8ef1be8 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,5 +3,7 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b
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 opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
+DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
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/metadata.xml b/media-libs/opencv/metadata.xml
index a1403df457f..fa1de56873e 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -13,8 +13,10 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<use>
<flag name="contrib">Install user contributed scripts from opencv_contrib (Experimental!)</flag>
<flag name="cuda">Enable NVIDIA Cuda computations support (Experimental!)</flag>
+ <flag restrict=">=media-libs/opencv-4.1.2" name="download">Enable download during cmake configure</flag>
<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
<flag name="gdal">Enable support for sci-libs/gdal library</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>
<flag restrict=">=media-libs/opencv-3.1.0" name="contribxfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
diff --git a/media-libs/opencv/opencv-4.1.2.ebuild b/media-libs/opencv/opencv-4.1.2.ebuild
new file mode 100644
index 00000000000..cdd688f4b44
--- /dev/null
+++ b/media-libs/opencv/opencv-4.1.2.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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
+ dnnsamples? ( 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
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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 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"
+# 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="
+ cuda? ( tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribhdf? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ 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= )
+ contribhdf? ( 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}]
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0[${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 )
+ vaapi? ( x11-libs/libva )"
+
+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
+ # [opencv4]
+ /usr/include/opencv4/opencv2/core/cvdef.h
+ /usr/include/opencv4/opencv2/dnn.hpp
+ /usr/include/opencv4/opencv2/core/cuda/transform.hpp
+ /usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
+ /usr/include/opencv4/opencv2/video/tracking.hpp
+ /usr/include/opencv4/opencv2/objdetect.hpp
+)
+
+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"
+)
+
+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 dnnsamples; 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
+ if use contribxfeatures2d; 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=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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=OFF
+ -DWITH_JASPER=OFF
+ -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=$(usex java OFF ON)
+ -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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
+ #===================================================
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
+ -DCPU_DISPATCH=
+ -DBUILD_opencv_features2d=$(usex contribxfeatures2d)
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=python
+ -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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-28 20:02 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-28 20:02 UTC (permalink / raw
To: gentoo-commits
commit: d07f659d56f0cab2f38a4f2683e39243d75ff9e0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 18:16:48 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 20:02:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07f659d
media-libs/opencv: Restore stable keywords
Dropping them for py37 was not necessary in the first place.
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 3d7cf83a36e..12cd224b400 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -24,7 +24,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"
+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 +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg 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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-30 19:48 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-30 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 64b65f04d10f6b889c925a891dc122c6475c22f0
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 03:50:37 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 19:47:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b65f04
media-libs/opencv: add cv_cpu_dispatch.h to MULTILIB_WRAPPED_HEADERS
Closes: https://bugs.gentoo.org/701482
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/{opencv-4.1.2.ebuild => opencv-4.1.2-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-4.1.2.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.1.2.ebuild
rename to media-libs/opencv/opencv-4.1.2-r1.ebuild
index cdd688f4b44..9b2a7e66419 100644
--- a/media-libs/opencv/opencv-4.1.2.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -219,6 +219,7 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/opencv2/cudev/warp/shuffle.hpp
/usr/include/opencv2/cudev/warp/warp.hpp
# [opencv4]
+ /usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
/usr/include/opencv4/opencv2/core/cvdef.h
/usr/include/opencv4/opencv2/dnn.hpp
/usr/include/opencv4/opencv2/core/cuda/transform.hpp
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-30 19:48 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-30 19:48 UTC (permalink / raw
To: gentoo-commits
commit: adbab194ec585cd8ba24a715f422a36007972f62
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 19:39:07 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 19:47:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbab194
media-libs/opencv: install pkg config
Submitted-by: Helmut Jarausch <jarausch <AT> igpm.rwth-aachen.de>
Closes: https://bugs.gentoo.org/701472
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index b897cdd744a..02fb2d8d734 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -371,6 +371,7 @@ multilib_src_configure() {
-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
# -DINSTALL_ANDROID_EXAMPLES=OFF
-DINSTALL_TO_MANGLED_PATHS=OFF
+ -DOPENCV_GENERATE_PKGCONFIG=ON
# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
# to set its destination libdir
-DLIB_SUFFIX=
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-11-30 19:48 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2019-11-30 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 2dfae79d6eb34ffd11bd31342e340d92d47ec6a8
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 04:01:15 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 19:47:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfae79d
media-libs/opencv: add USE=+features2d
USE=contribxfeatures2d should not control building features2d module.
Add USE=+features2d instead.
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 +
media-libs/opencv/opencv-4.1.2-r1.ebuild | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index fa1de56873e..f7bccfa408e 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -15,6 +15,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<flag name="cuda">Enable NVIDIA Cuda computations support (Experimental!)</flag>
<flag restrict=">=media-libs/opencv-4.1.2" name="download">Enable download during cmake configure</flag>
<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 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>
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index 9b2a7e66419..b897cdd744a 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.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 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 gtk 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.
@@ -410,7 +410,7 @@ multilib_src_configure() {
-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
-DCPU_DISPATCH=
- -DBUILD_opencv_features2d=$(usex contribxfeatures2d)
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
)
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-12-25 16:57 Pacho Ramos
0 siblings, 0 replies; 208+ messages in thread
From: Pacho Ramos @ 2019-12-25 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 2dbf3b3c61635735ec32d0f47d45003968a277e5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 16:20:16 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 16:57:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbf3b3c
media-libs/opencv: Needs python_optimize, add python 3.8 support
Also needs to support numpy-python2 until reverse deps are handled
Bug: https://bugs.gentoo.org/703760
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r3.ebuild | 502 +++++++++++++++++++++++++++++++
1 file changed, 502 insertions(+)
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
new file mode 100644
index 00000000000..67f9c2497bf
--- /dev/null
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+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
+ dnnsamples? ( 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
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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"
+# 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="
+ cuda? ( tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribhdf? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ 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= )
+ contribhdf? ( 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}]
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0[${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_gen_cond_dep 'dev-python/numpy-python2:0[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/numpy:0[${PYTHON_USEDEP}]' 'python3*')
+ )
+ 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 )
+ vaapi? ( x11-libs/libva )"
+
+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
+ # [opencv4]
+ /usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
+ /usr/include/opencv4/opencv2/core/cvdef.h
+ /usr/include/opencv4/opencv2/dnn.hpp
+ /usr/include/opencv4/opencv2/core/cuda/transform.hpp
+ /usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
+ /usr/include/opencv4/opencv2/video/tracking.hpp
+ /usr/include/opencv4/opencv2/objdetect.hpp
+)
+
+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"
+)
+
+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 dnnsamples; 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
+ if use contribxfeatures2d; 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=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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=OFF
+ -DWITH_JASPER=OFF
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # 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
+ #===================================================
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
+ -DCPU_DISPATCH=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=python
+ -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
+ python_foreach_impl python_optimize
+ fi
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-12-25 17:32 Pacho Ramos
0 siblings, 0 replies; 208+ messages in thread
From: Pacho Ramos @ 2019-12-25 17:32 UTC (permalink / raw
To: gentoo-commits
commit: cb043686350eb443f4f90ecd5951b0897af81ed0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 17:32:05 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 17:32:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb043686
media-libs/opencv: Fix missing PYTHON_DEPS
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 67f9c2497bf..484cde71ad4 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -83,6 +83,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
python? (
+ ${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-python/numpy-python2:0[${PYTHON_USEDEP}]' 'python2*')
$(python_gen_cond_dep 'dev-python/numpy:0[${PYTHON_USEDEP}]' 'python3*')
)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2019-12-26 14:42 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2019-12-26 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 9658bbc6ca13834811125bcbd477033d09ab27c8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 14:42:19 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 14:42:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9658bbc6
media-libs/opencv: [QA] Revert "Needs python_optimize, add python 3.8 support"
* We need to bifurcate the py2/py3 depgraph of numpy atomically,
in order to avoid misleading and weird blocker warnings.
This reverts commit 2dbf3b3c61635735ec32d0f47d45003968a277e5.
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r3.ebuild | 503 -------------------------------
1 file changed, 503 deletions(-)
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
deleted file mode 100644
index 484cde71ad4..00000000000
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
-
-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
- dnnsamples? ( 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
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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"
-# 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="
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribhdf? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- 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= )
- contribhdf? ( 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}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${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}
- $(python_gen_cond_dep 'dev-python/numpy-python2:0[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/numpy:0[${PYTHON_USEDEP}]' 'python3*')
- )
- 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 )
- vaapi? ( x11-libs/libva )"
-
-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
- # [opencv4]
- /usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
- /usr/include/opencv4/opencv2/core/cvdef.h
- /usr/include/opencv4/opencv2/dnn.hpp
- /usr/include/opencv4/opencv2/core/cuda/transform.hpp
- /usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
- /usr/include/opencv4/opencv2/video/tracking.hpp
- /usr/include/opencv4/opencv2/objdetect.hpp
-)
-
-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"
-)
-
-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 dnnsamples; 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
- if use contribxfeatures2d; 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=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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=OFF
- -DWITH_JASPER=OFF
- -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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # 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
- #===================================================
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
- -DCPU_DISPATCH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=python
- -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
- python_foreach_impl python_optimize
- fi
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-01-30 21:26 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2020-01-30 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 9ab827a4b2e88a36696e436a063fc052701fb6a9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 21:16:19 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 21:26:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab827a4
media-libs/opencv: Remove py2 where possible
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/opencv-3.4.1-r7.ebuild | 2 +-
media-libs/opencv/opencv-4.1.2-r1.ebuild | 2 +-
media-libs/opencv/opencv-4.1.2-r2.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 8800d1d31bf..d91ffc890ea 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index a3e0bc94089..888c589b1c0 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild b/media-libs/opencv/opencv-4.1.2-r2.ebuild
index c803c7aadfd..6597c3fdc4a 100644
--- a/media-libs/opencv/opencv-4.1.2-r2.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-01-30 21:26 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2020-01-30 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 1bd6dd295318d207480428a27a2a14d2146fc017
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 21:16:55 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 21:26:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd6dd29
media-libs/opencv: Permit numpy-python2 in 2*
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13-r3.ebuild | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index d4379a93e73..caceec0fd66 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,7 +51,13 @@ RDEPEND="
openexr? ( media-libs/openexr )
opengl? ( virtual/opengl virtual/glu )
png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ )
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-02-09 16:29 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2020-02-09 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 69de0da4f7f7b8a11e731acc4744585d5e74a9bb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 16:41:56 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:27:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69de0da4
media-libs/opencv: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{opencv-2.4.13-r3.ebuild => opencv-2.4.13-r4.ebuild} | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-2.4.13-r3.ebuild
rename to media-libs/opencv/opencv-2.4.13-r4.ebuild
index caceec0fd66..e678316f625 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild
@@ -53,10 +53,12 @@ RDEPEND="
png? ( media-libs/libpng:0= )
python? (
${PYTHON_DEPS}
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
+ $(python_gen_cond_dep '
+ || (
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
)
qt5? (
dev-qt/qtconcurrent:5
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-03-09 13:00 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2020-03-09 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 1676af9b3103d681f9335b89bd19016494cb18eb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 12:59:59 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 12:59:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1676af9b
media-libs/opencv: Use only GTK3
* OpenCV currently does not support OpenGL contexts
in GTK3, so we disable USE="opengl gtk3" for the
time being.
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14866
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 +
...encv-4.1.2-r2.ebuild => opencv-4.1.2-r3.ebuild} | 41 ++++++++++++----------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index f7bccfa408e..98984a7467b 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
similarity index 95%
rename from media-libs/opencv/opencv-4.1.2-r2.ebuild
rename to media-libs/opencv/opencv-4.1.2-r3.ebuild
index 6597c3fdc4a..4b4180760a3 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() {
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-04-25 18:45 Mikle Kolyada
0 siblings, 0 replies; 208+ messages in thread
From: Mikle Kolyada @ 2020-04-25 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 221778ddc640df71449fa8b0b695d9d105d4dd8c
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 18:44:52 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 18:45:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221778dd
media-libs/opencv: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13-r4.ebuild | 7 ++-----
media-libs/opencv/opencv-3.4.1-r7.ebuild | 7 ++-----
media-libs/opencv/opencv-4.1.2-r1.ebuild | 7 ++-----
media-libs/opencv/opencv-4.1.2-r3.ebuild | 7 ++-----
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r4.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
index e678316f625..1e5584759aa 100644
--- a/media-libs/opencv/opencv-2.4.13-r4.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r4.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 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,10 +28,7 @@ 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= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index d91ffc890ea..683c36a1493 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -25,7 +25,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 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 +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp 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 +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack 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.
@@ -55,10 +55,7 @@ RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5 )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index 888c589b1c0..ba6201ddc53 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.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 gtk ieee1394 jpeg jpeg2k lapack 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.
@@ -51,10 +51,7 @@ RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 4b4180760a3..0265b343131 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.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 gtk3 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 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.
@@ -51,10 +51,7 @@ RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-06-20 15:45 Thomas Deutschmann
0 siblings, 0 replies; 208+ messages in thread
From: Thomas Deutschmann @ 2020-06-20 15:45 UTC (permalink / raw
To: gentoo-commits
commit: afc78eca2e47c2ff2958ab379d4a089435f041cb
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 15:32:56 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 15:45:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc78eca
media-libs/opencv: x86 stable (bug #711284)
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 87648f6a429..3fec493f57f 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20,7 +20,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"
+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 gtk3 ieee1394 jpeg jpeg2k lapack 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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-06-22 6:57 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2020-06-22 6:57 UTC (permalink / raw
To: gentoo-commits
commit: f0103b8e4e2a3c466b83f9af1e7f929f10a89c74
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 06:55:23 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 06:56:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0103b8e
media-libs/opencv: amd64 stable wrt bug #711284
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 3fec493f57f..109c1d36162 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20,7 +20,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"
+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 gtk3 ieee1394 jpeg jpeg2k lapack 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
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-06-25 17:08 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2020-06-25 17:08 UTC (permalink / raw
To: gentoo-commits
commit: a704638d74d36519bc4ceb846aa50a784c6ab98f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 07:57:28 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 17:07:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a704638d
media-libs/opencv: Drop 4.1.2-r1
Closes: https://bugs.gentoo.org/729504
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/opencv/opencv-4.1.2-r1.ebuild | 493 -------------------------------
1 file changed, 493 deletions(-)
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
deleted file mode 100644
index 19a98b7fe06..00000000000
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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
- dnnsamples? ( 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
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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 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.
-REQUIRED_USE="
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribhdf? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- 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= )
- contribhdf? ( sci-libs/hdf5:= )
- ffmpeg? ( 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}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${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
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
- vaapi? ( x11-libs/libva )"
-
-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
- # [opencv4]
- /usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
- /usr/include/opencv4/opencv2/core/cvdef.h
- /usr/include/opencv4/opencv2/dnn.hpp
- /usr/include/opencv4/opencv2/core/cuda/transform.hpp
- /usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
- /usr/include/opencv4/opencv2/video/tracking.hpp
- /usr/include/opencv4/opencv2/objdetect.hpp
-)
-
-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"
-)
-
-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 dnnsamples; 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
- if use contribxfeatures2d; 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=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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=OFF
- -DWITH_JASPER=OFF
- -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=$(usex java OFF ON)
- -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # 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
- #===================================================
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
- -DCPU_DISPATCH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=python
- -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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-11 19:16 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-10-11 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 78bcdb12864a1e60ef79d66d1aabf732704450ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 18:39:01 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 19:16:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bcdb12
media-libs/opencv: fix automagic dep on openjpeg
USE=jpeg2k was a no-op until now.
Bug: https://bugs.gentoo.org/747427
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.4.0.ebuild => opencv-4.4.0-r1.ebuild} | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-4.4.0.ebuild
rename to media-libs/opencv/opencv-4.4.0-r1.ebuild
index 5e6c41a3d97..259f25ce1f0 100644
--- a/media-libs/opencv/opencv-4.4.0.ebuild
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
ARM_CPU_FEATURES=(
@@ -110,6 +110,7 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
lapack? ( virtual/lapack )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
@@ -328,8 +329,12 @@ multilib_src_configure() {
-DWITH_GTK=$(usex gtk3)
-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
-DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
-DWITH_WEBP=$(usex webp)
-DWITH_OPENEXR=$(usex openexr)
-DWITH_OPENGL=$(usex opengl)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-11 19:16 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-10-11 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 990ef023d106b220f1f52945440509f0af2db0e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 18:35:46 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 19:16:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990ef023
media-libs/opencv: drop pch support (fixes eigen build)
PCH support is broken when using CMake and apparently
opencv is no exception.
Closes: https://bugs.gentoo.org/733796
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.4.0.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0.ebuild
index 783f97e3a22..5e6c41a3d97 100644
--- a/media-libs/opencv/opencv-4.4.0.ebuild
+++ b/media-libs/opencv/opencv-4.4.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
ARM_CPU_FEATURES=(
@@ -416,7 +416,8 @@ multilib_src_configure() {
# OpenCV build options
# ===================================================
-DENABLE_CCACHE=OFF
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
-DENABLE_SOLUTION_FOLDERS=OFF
-DENABLE_PROFILING=OFF
-DENABLE_COVERAGE=OFF
@@ -453,6 +454,7 @@ multilib_src_configure() {
for i in "${CPU_FEATURES_MAP[@]}" ; do
use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
done
+
GLOBALCMAKEARGS+=(
-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-DCPU_BASELINE=${CPU_BASELINE}
@@ -509,7 +511,7 @@ multilib_src_configure() {
}
python_module_compile() {
- local BUILD_DIR=${orig_BUILD_DIR}
+ local BUILD_DIR="${orig_BUILD_DIR}"
local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
# Set all python variables to load the correct Gentoo paths
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-12 16:11 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-10-12 16:11 UTC (permalink / raw
To: gentoo-commits
commit: ec0fa8e9928460b1cc10dec718ba5ad1db5b9b9e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 16:11:25 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 16:11:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0fa8e9
media-libs/opencv: require <dev-cpp/eigen-3.3.8 for now
Eigen 3.3.8 introduced a bug (bugs?) it seems, so we'll
workaround that for now with a < restriction.
Bug: https://bugs.gentoo.org/747949
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.4.0-r1.ebuild => opencv-4.4.0-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.4.0-r1.ebuild
rename to media-libs/opencv/opencv-4.4.0-r2.ebuild
index 259f25ce1f0..d4f7abc4869 100644
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.4.0-r2.ebuild
@@ -138,8 +138,9 @@ RDEPEND="
vtk? ( sci-libs/vtk[rendering] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen restriction
DEPEND="${RDEPEND}
- eigen? ( dev-cpp/eigen:3 )
+ eigen? ( <dev-cpp/eigen-3.3.8:3 )
java? ( >=virtual/jdk-1.6 )"
BDEPEND="virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-12 16:15 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2020-10-12 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 0c6803070cc0949b36b41c8739de46ae0dff9ea0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 16:13:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 16:15:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c680307
media-libs/opencv: Revert "require <dev-cpp/eigen-3.3.8 for now"
Please don't introduce lower-than dependencies lightly,
when there's a supposed fix around the corner.
This reverts commit ec0fa8e9928460b1cc10dec718ba5ad1db5b9b9e.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/opencv/{opencv-4.4.0-r2.ebuild => opencv-4.4.0-r1.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.4.0-r2.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.4.0-r2.ebuild
rename to media-libs/opencv/opencv-4.4.0-r1.ebuild
index d4f7abc4869..259f25ce1f0 100644
--- a/media-libs/opencv/opencv-4.4.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild
@@ -138,9 +138,8 @@ RDEPEND="
vtk? ( sci-libs/vtk[rendering] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen restriction
DEPEND="${RDEPEND}
- eigen? ( <dev-cpp/eigen-3.3.8:3 )
+ eigen? ( dev-cpp/eigen:3 )
java? ( >=virtual/jdk-1.6 )"
BDEPEND="virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-16 21:48 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-10-16 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 5c21b91ad2464439514aae406a0c0d5f310aca1d
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Wed Oct 14 02:17:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 21:47:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c21b91a
media-libs/opencv: version bump to 4.5.0
Bug: https://bugs.gentoo.org/701790
Bug: https://bugs.gentoo.org/700176
Bug: https://bugs.gentoo.org/717812
Bug: https://bugs.gentoo.org/703658
Bug: https://bugs.gentoo.org/689838
Closes: https://bugs.gentoo.org/666716
Closes: https://bugs.gentoo.org/747163
Closes: https://bugs.gentoo.org/729190
Closes: https://bugs.gentoo.org/699730
Closes: https://bugs.gentoo.org/672840
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17899
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.5.0.ebuild | 555 ++++++++++++++++++++++++++++++++++
2 files changed, 557 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3d877b29106..0e480d0b4bd 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -5,4 +5,6 @@ DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611d
DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb
DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
+DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
+DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
new file mode 100644
index 00000000000..b449ad07ad6
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -0,0 +1,555 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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="
+ cuda? ( tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( dev-cpp/eigen:3 )
+ java? ( >=virtual/jdk-1.6 )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-10-18 14:49 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-10-18 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 3b0b4c6efa56748cae3f7de69798c4c9adb628ec
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 14:23:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 14:49:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0b4c6e
media-libs/opencv: don't allow =dev-cpp/eigen-3.3.8
dev-cpp/eigen-3.3.8 was broken upstream and -r1
introduces a backported fix.
While 3.3.8 was removed from tree, it is possible
that 3.3.8 is still installed and satisfies the
dependency on a user's machine, in the case
of the latter bug referenced here.
Bug: https://bugs.gentoo.org/747949
Closes: https://bugs.gentoo.org/749804
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.4.0-r1.ebuild | 8 +++++++-
media-libs/opencv/opencv-4.5.0.ebuild | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild
index 259f25ce1f0..df2a210f927 100644
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild
@@ -138,8 +138,14 @@ RDEPEND="
vtk? ( sci-libs/vtk[rendering] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
DEPEND="${RDEPEND}
- eigen? ( dev-cpp/eigen:3 )
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
java? ( >=virtual/jdk-1.6 )"
BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index b449ad07ad6..54bb9292356 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -138,8 +138,14 @@ RDEPEND="
vtk? ( sci-libs/vtk[rendering] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
DEPEND="${RDEPEND}
- eigen? ( dev-cpp/eigen:3 )
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
java? ( >=virtual/jdk-1.6 )"
BDEPEND="virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-11-11 4:31 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-11-11 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 23de912c63a7e8bf81aec767a6a08076a45eb74c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 04:30:36 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 04:30:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23de912c
media-libs/opencv: Stabilize 4.5.0 arm64, #746596
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index 21f4784aa91..9a9fa8ca995 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-11-11 15:38 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-11-11 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 6022d3ecedee6a289a31f00ea659d78ee8f5830d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 15:37:38 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 15:37:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6022d3ec
media-libs/opencv: Stabilize 4.5.0 amd64, #746596
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index 9a9fa8ca995..64ab47acb68 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-11-12 15:27 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-11-12 15:27 UTC (permalink / raw
To: gentoo-commits
commit: b0be782bf88db134f1e33fb471ac3bbce7fdc185
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 15:26:33 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 15:27:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0be782b
media-libs/opencv: Stabilize 4.5.0 x86, #746596
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index 64ab47acb68..c9bf0e90784 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2020-12-27 4:34 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2020-12-27 4:34 UTC (permalink / raw
To: gentoo-commits
commit: e402fc2e336e59a514557c6c1bdb014cb590fad1
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Thu Dec 24 06:05:46 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 04:34:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e402fc2e
media-libs/opencv: version bump, remove old
- Added constraint on CPU flags on x86
- Also closed out bugs that wasn't reported reproducible on newer versions
Closes: https://bugs.gentoo.org/751781
Closes: https://bugs.gentoo.org/703658
Closes: https://bugs.gentoo.org/706040
Closes: https://bugs.gentoo.org/721706
Closes: https://bugs.gentoo.org/689838
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18801
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 4 ++--
...{opencv-4.4.0-r1.ebuild => opencv-4.5.1.ebuild} | 26 +++++++++++++++-------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 0e480d0b4bd..4943bff54f2 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,9 +2,9 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b
DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
-DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb
-DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
+DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
+DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
similarity index 96%
rename from media-libs/opencv/opencv-4.4.0-r1.ebuild
rename to media-libs/opencv/opencv-4.5.1.ebuild
index df2a210f927..311c9925d59 100644
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -12,14 +12,14 @@ HOMEPAGE="https://opencv.org"
TINY_DNN_PV="1.0.0a3"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
contrib? (
https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
)"
-LICENSE="BSD"
+LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
@@ -59,6 +59,8 @@ IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
# will silently disable it Wwithout the user knowing, which defeats the
# purpose of the opengl use flag.
REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
cuda? ( tesseract? ( opencl ) )
dnnsamples? ( examples )
gflags? ( contrib )
@@ -70,6 +72,7 @@ REQUIRED_USE="
contribovis? ( contrib )
contribsfm? ( contrib eigen gflags glog )
contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
java? ( python )
opengl? ( qt5 )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -111,7 +114,11 @@ RDEPEND="
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? ( virtual/lapack )
+ lapack? (
+ virtual/cblas
+ virtual/lapack
+ virtual/lapacke
+ )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
opengl? (
@@ -274,6 +281,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
)
pkg_pretend() {
@@ -289,7 +297,7 @@ src_prepare() {
cmake_src_prepare
# remove bundled stuff
- rm -rf 3rdparty || die "Removing 3rd party components failed"
+ rm -r 3rdparty || die "Removing 3rd party components failed"
sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-i CMakeLists.txt cmake/*cmake || die
@@ -305,7 +313,7 @@ src_prepare() {
fi
if use download; then
- mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
fi
java-pkg-opt-2_src_prepare
@@ -463,7 +471,9 @@ multilib_src_configure() {
#===================================================
local CPU_BASELINE=""
for i in "${CPU_FEATURES_MAP[@]}" ; do
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
done
GLOBALCMAKEARGS+=(
@@ -535,7 +545,7 @@ python_module_compile() {
# Regenerate cache file. Can't use rebuild_cache as it won't
# have the Gentoo specific options.
- rm -rf CMakeCache.txt || die "rm failed"
+ rm CMakeCache.txt || die "rm failed"
cmake_src_configure
cmake_src_compile
cmake_src_install
@@ -543,7 +553,7 @@ python_module_compile() {
# 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"
+ rm -r modules/python3 || die "rm failed"
python_optimize "${ED}"/$(python_get_sitedir)
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-01-22 21:11 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-01-22 21:11 UTC (permalink / raw
To: gentoo-commits
commit: c7a99c62fe76e7b8ea6f8c06602ae82d222bee2d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 21:10:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 21:11:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a99c62
media-libs/opencv: add github remote-id
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index ad1fde1b865..ffa19555b47 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -37,6 +37,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
</use>
<upstream>
<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
+ <remote-id type="github">opencv/opencv</remote-id>
<remote-id type="sourceforge">opencvlibrary</remote-id>
<remote-id type="github">Itseez/opencv_contrib</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-01-22 21:11 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-01-22 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 6d5d8fe3ad7cf4d07d968ffcd5401137258cf8c0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 21:11:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 21:11:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5d8fe3
media-libs/opencv: sort remote-id
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index ffa19555b47..7c92aae379f 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -38,7 +38,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<upstream>
<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
<remote-id type="github">opencv/opencv</remote-id>
- <remote-id type="sourceforge">opencvlibrary</remote-id>
<remote-id type="github">Itseez/opencv_contrib</remote-id>
+ <remote-id type="sourceforge">opencvlibrary</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-05-17 22:30 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-05-17 22:30 UTC (permalink / raw
To: gentoo-commits
commit: de5c0d7b596a13d9b4fdc14a0e9160f0da797092
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Feb 19 20:05:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 22:30:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de5c0d7b
media-libs/opencv: drop dependency on virtual/lapacke
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19566
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.0.ebuild | 3 +--
media-libs/opencv/opencv-4.5.1.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index fa89f6dd862..afbb574ddd3 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -115,7 +115,6 @@ RDEPEND="
lapack? (
virtual/cblas
virtual/lapack
- virtual/lapacke
)
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 3804ebcf9ae..c2dc01d988a 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -117,7 +117,6 @@ RDEPEND="
lapack? (
virtual/cblas
virtual/lapack
- virtual/lapacke
)
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-05-23 13:05 Stefan Strogin
0 siblings, 0 replies; 208+ messages in thread
From: Stefan Strogin @ 2021-05-23 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 35b0b8256de907bbdb3416f18f60af2217e5a606
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Mon May 10 22:40:16 2021 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun May 23 13:04:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b0b825
media-libs/opencv: version bump to 4.5.2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
Closes: https://bugs.gentoo.org/791550
Closes: https://github.com/gentoo/gentoo/pull/20762
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.5.2.ebuild | 568 ++++++++++++++++++++++++++++++++++
2 files changed, 570 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4943bff54f2..20748a1ff12 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,4 +7,6 @@ DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527
DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
+DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
+DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.2.ebuild b/media-libs/opencv/opencv-4.5.2.ebuild
new file mode 100644
index 00000000000..1fee51d33a5
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-05-26 9:13 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2021-05-26 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 055795657c15dd4d1417f9a2c0e2beb8e2f257a7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 09:12:57 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 26 09:12:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05579565
media-libs/opencv: x86 stable wrt bug #791457
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.5.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 0d535d47f10..077c5378028 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-06-03 0:43 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-06-03 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 56cea19ef177563a73fcfbfa8624f6d132558fb6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 3 00:41:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 00:41:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cea19e
media-libs/opencv: Stabilize 4.5.1 arm64, #791457
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 077c5378028..05513b4f174 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-07-21 21:57 Marek Szuba
0 siblings, 0 replies; 208+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 7af2ac719014955cf1191b6a6bfacb46eecf5365
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jul 20 20:57:48 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 21:57:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af2ac71
media-libs/opencv: add slot operator for openexr
- restrict to <openexr-3
- commit straight to stable, only slot operator has been added
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.0.ebuild => opencv-4.5.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.0.ebuild
rename to media-libs/opencv/opencv-4.5.0-r1.ebuild
index afbb574ddd3..80cfca7c7c3 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0-r1.ebuild
@@ -117,7 +117,7 @@ RDEPEND="
virtual/lapack
)
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
opengl? (
virtual/opengl[${MULTILIB_USEDEP}]
virtual/glu[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-07-21 21:57 Marek Szuba
0 siblings, 0 replies; 208+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 59ab435255a3bf454fd59c3e7a6b476241562539
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jul 20 21:32:40 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 21:57:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ab4352
media-libs/opencv: add slot operator for openexr
restrict to <openexr-3
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.2.ebuild => opencv-4.5.2-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.2.ebuild
rename to media-libs/opencv/opencv-4.5.2-r1.ebuild
index 1fee51d33a5..d978b342149 100644
--- a/media-libs/opencv/opencv-4.5.2.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="
virtual/lapack
)
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
opengl? (
virtual/opengl[${MULTILIB_USEDEP}]
virtual/glu[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-07-21 21:57 Marek Szuba
0 siblings, 0 replies; 208+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 4aae495e9f51194cbc802b18a777957103c9770a
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Jul 20 21:05:04 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 21:57:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aae495e
media-libs/opencv: add slot operator for openexr
- restrict to <openexr-3
- commit straight to stable, only slot operator has been added
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.1.ebuild => opencv-4.5.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.1.ebuild
rename to media-libs/opencv/opencv-4.5.1-r1.ebuild
index 05513b4f174..8e273550454 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="
virtual/lapack
)
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
opengl? (
virtual/opengl[${MULTILIB_USEDEP}]
virtual/glu[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-08-25 10:16 Pacho Ramos
0 siblings, 0 replies; 208+ messages in thread
From: Pacho Ramos @ 2021-08-25 10:16 UTC (permalink / raw
To: gentoo-commits
commit: b10795b1b7a807863d8d5a750e751d263b008c0c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 09:42:07 2021 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 10:16:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10795b1
media-libs/opencv: CUDA support needs 'contrib' USE enabled
Closes: https://bugs.gentoo.org/701712
Closes: https://bugs.gentoo.org/792282
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
index 3c0b554b7cf..05330abd096 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -58,10 +58,12 @@ IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
# 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.
+# cuda needs contrib, bug #701712
REQUIRED_USE="
cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? ( tesseract? ( opencl ) )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
dnnsamples? ( examples )
gflags? ( contrib )
glog? ( contrib )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-09-07 11:55 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2021-09-07 11:55 UTC (permalink / raw
To: gentoo-commits
commit: d43f086cce48e90f877fda8cfdca755a52624900
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 11:55:00 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 11:55:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43f086c
media-libs/opencv: amd64 stable wrt bug #811855
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
index 05330abd096..9af944583c1 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-09-08 0:42 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-09-08 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 8f1f06e67483772f8ad8f70a9ac9acb449c35101
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 00:42:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 00:42:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1f06e6
media-libs/opencv: Stabilize 4.5.2-r1 arm64, #811855
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
index 9af944583c1..ca93df0626c 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-09-09 7:39 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2021-09-09 7:39 UTC (permalink / raw
To: gentoo-commits
commit: 5ade39c4a6ef1f8ff82b7bcec0c4f614d5ece895
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 9 07:38:40 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 9 07:38:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ade39c4
media-libs/opencv: x86 stable wrt bug #811855
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild
index ca93df0626c..c3c644f988c 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-10-26 18:40 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2021-10-26 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 25b92d1f17a154a6d9de198f259b70d8e51ad85b
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 09:33:19 2021 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 18:38:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b92d1f
media-libs/opencv: add support python 3.10
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r2.ebuild | 570 +++++++++++++++++++++++++++++++
1 file changed, 570 insertions(+)
diff --git a/media-libs/opencv/opencv-4.5.2-r2.ebuild b/media-libs/opencv/opencv-4.5.2-r2.ebuild
new file mode 100644
index 00000000000..1ed22e7ebad
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2-r2.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ virtual/lapack
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-10-29 22:23 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-10-29 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 9382f63760b8774bd877aa7bd008143c5428eba3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:15:07 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:22:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9382f637
media-libs/opencv: add tbb subslot operator
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.0-r1.ebuild => opencv-4.5.0-r2.ebuild} | 2 +-
media-libs/opencv/{opencv-4.5.1-r1.ebuild => opencv-4.5.1-r2.ebuild} | 2 +-
media-libs/opencv/{opencv-4.5.2-r1.ebuild => opencv-4.5.2-r3.ebuild} | 2 +-
media-libs/opencv/{opencv-4.5.2-r2.ebuild => opencv-4.5.2-r4.ebuild} | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.5.0-r1.ebuild b/media-libs/opencv/opencv-4.5.0-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.0-r1.ebuild
rename to media-libs/opencv/opencv-4.5.0-r2.ebuild
index 80cfca7c7c3..26579f9220b 100644
--- a/media-libs/opencv/opencv-4.5.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.0-r2.ebuild
@@ -135,7 +135,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.1-r1.ebuild b/media-libs/opencv/opencv-4.5.1-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.1-r1.ebuild
rename to media-libs/opencv/opencv-4.5.1-r2.ebuild
index 8e273550454..27d56396c72 100644
--- a/media-libs/opencv/opencv-4.5.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1-r2.ebuild
@@ -137,7 +137,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.2-r1.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.2-r1.ebuild
rename to media-libs/opencv/opencv-4.5.2-r3.ebuild
index c3c644f988c..e362085f0d1 100644
--- a/media-libs/opencv/opencv-4.5.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r3.ebuild
@@ -139,7 +139,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.2-r2.ebuild b/media-libs/opencv/opencv-4.5.2-r4.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.2-r2.ebuild
rename to media-libs/opencv/opencv-4.5.2-r4.ebuild
index 1ed22e7ebad..5d5bdafed8c 100644
--- a/media-libs/opencv/opencv-4.5.2-r2.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r4.ebuild
@@ -139,7 +139,7 @@ RDEPEND="
opengl? ( dev-qt/qtopengl:5= )
)
tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-11-09 12:05 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2021-11-09 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 7a70a93b9f9e32b2960ab4552de97faae879d354
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 12:04:34 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 12:05:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a70a93b
media-libs/opencv: add cap for <dev-libs/protobuf-3.19
Reported-by: Miezhiko <Miezhiko <AT> gmail.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.0-r2.ebuild => opencv-4.5.0-r3.ebuild} | 2 +-
media-libs/opencv/{opencv-4.5.1-r2.ebuild => opencv-4.5.1-r3.ebuild} | 2 +-
media-libs/opencv/opencv-4.5.2-r3.ebuild | 2 +-
media-libs/opencv/{opencv-4.5.2-r4.ebuild => opencv-4.5.2-r5.ebuild} | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.5.0-r2.ebuild b/media-libs/opencv/opencv-4.5.0-r3.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.0-r2.ebuild
rename to media-libs/opencv/opencv-4.5.0-r3.ebuild
index 26579f9220b..60d93595119 100644
--- a/media-libs/opencv/opencv-4.5.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.5.0-r3.ebuild
@@ -83,7 +83,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
diff --git a/media-libs/opencv/opencv-4.5.1-r2.ebuild b/media-libs/opencv/opencv-4.5.1-r3.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.1-r2.ebuild
rename to media-libs/opencv/opencv-4.5.1-r3.ebuild
index 27d56396c72..4c0223aebb8 100644
--- a/media-libs/opencv/opencv-4.5.1-r2.ebuild
+++ b/media-libs/opencv/opencv-4.5.1-r3.ebuild
@@ -85,7 +85,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
diff --git a/media-libs/opencv/opencv-4.5.2-r3.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild
index e362085f0d1..9b1bb3c11c7 100644
--- a/media-libs/opencv/opencv-4.5.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r3.ebuild
@@ -87,7 +87,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
diff --git a/media-libs/opencv/opencv-4.5.2-r4.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.2-r4.ebuild
rename to media-libs/opencv/opencv-4.5.2-r5.ebuild
index 5d5bdafed8c..773e61c6fb4 100644
--- a/media-libs/opencv/opencv-4.5.2-r4.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild
@@ -87,7 +87,7 @@ REQUIRED_USE="
RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
cuda? ( dev-util/nvidia-cuda-toolkit:0= )
contribhdf? ( sci-libs/hdf5:= )
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-11-22 9:07 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-11-22 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 013100beb70eb50ecd989b44903b2db5036ce882
Author: Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Tue Nov 9 10:12:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 09:07:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013100be
media-libs/opencv: add new version 4.5.4
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miezhiko <Miezhiko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22875
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.5.4.ebuild | 570 ++++++++++++++++++++++++++++++++++
2 files changed, 572 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d09b3e97e0c8..7778d4d286ab 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,4 +7,6 @@ DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85
DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
+DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
+DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
new file mode 100644
index 000000000000..c4bd53d72d71
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ virtual/lapack
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? ( <media-libs/openexr-3.0.0:0=[${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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+ eigen? (
+ || (
+ >=dev-cpp/eigen-3.3.8-r1:3
+ <dev-cpp/eigen-3.3.8:3
+ )
+ )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-03 0:54 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-12-03 0:54 UTC (permalink / raw
To: gentoo-commits
commit: dc6ded08e616477ef8cf4dd2a281a9b39a5d1bf1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 3 00:53:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 00:53:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6ded08
media-libs/opencv: stabilize 4.5.2-r5 for amd64, arm64, x86
Just added Python 3.10.
Bug: https://bugs.gentoo.org/800539
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
index 12f8c7f34e77..21f9624b9049 100644
--- a/media-libs/opencv/opencv-4.5.2-r5.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-04 19:09 David Seifert
0 siblings, 0 replies; 208+ messages in thread
From: David Seifert @ 2021-12-04 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 41392ff39110c7b29a954737c0050d008e12fbaf
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 4 19:09:28 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 19:09:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41392ff3
media-libs/opencv: fix USE=contribsfm multilib header clash
Closes: https://bugs.gentoo.org/828132
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/opencv/opencv-4.5.4.ebuild | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
index ca4d84d5a815..55c89688fe82 100644
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -268,6 +268,17 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/opencv4/opencv2/hdf.hpp
# [contrib_ovis]
/usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
# [vtk]
/usr/include/opencv4/opencv2/viz.hpp
/usr/include/opencv4/opencv2/viz/types.hpp
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-12 23:48 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-12-12 23:48 UTC (permalink / raw
To: gentoo-commits
commit: 277ba96e5698b2d4bbc3191cdafa6dfa44b358b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 23:48:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 23:48:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277ba96e
media-libs/opencv: Stabilize 4.5.4 amd64, #829008
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
index 55c89688fe82..7366ecac0ef7 100644
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-12 23:49 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-12-12 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 0ab19fef6ad3b99591e734b8e108102be512b0b5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 23:49:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 23:49:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab19fef
media-libs/opencv: Stabilize 4.5.4 x86, #829008
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
index 7366ecac0ef7..9114294ada3a 100644
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-13 2:07 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-12-13 2:07 UTC (permalink / raw
To: gentoo-commits
commit: c833559bb2c9e901e848fe0e40b667d523cd16ae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 02:07:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 02:07:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c833559b
media-libs/opencv: Stabilize 4.5.4 arm64, #829008
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
index 9114294ada3a..d294809c1d6a 100644
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2021-12-28 6:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2021-12-28 6:58 UTC (permalink / raw
To: gentoo-commits
commit: c264ee93aea110ec70f18fe825de90b8d4783118
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 06:44:29 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 06:58:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c264ee93
media-libs/opencv: add 4.5.5
Includes some upstream fixes re OpenEXR detection.
Also forces OpenEXR 2, hopefully (OpenEXR_ROOT CMake parameter).
Closes: https://bugs.gentoo.org/830124
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.5.5.ebuild | 580 ++++++++++++++++++++++++++++++++++
2 files changed, 582 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 7778d4d286ab..9431ccc6a8d1 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -9,4 +9,6 @@ DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
+DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
+DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.5.ebuild b/media-libs/opencv/opencv-4.5.5.ebuild
new file mode 100644
index 000000000000..cc9da840a605
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.5.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}]
+ media-libs/ilmbase:=[${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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(usex openexr)
+ # Try to force OpenEXR 2 for now. bug #830124
+ -DOPENEXR_ROOT="${ESYSROOT}"/usr
+ -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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-01-25 19:01 Amy Liffey
0 siblings, 0 replies; 208+ messages in thread
From: Amy Liffey @ 2022-01-25 19:01 UTC (permalink / raw
To: gentoo-commits
commit: d70bcc7bd205ae30c56324302c0dab3315235090
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 22 20:20:10 2022 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 19:01:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70bcc7b
media-libs/opencv: Drop 4.5.0-r3 and 4.5.1-r3
Versions depending on >=virtual/jdk-1.6 will never compile with jdk-17
Closes: https://github.com/gentoo/gentoo/pull/23920
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
media-libs/opencv/Manifest | 4 -
media-libs/opencv/opencv-4.5.0-r3.ebuild | 566 ------------------------------
media-libs/opencv/opencv-4.5.1-r3.ebuild | 568 -------------------------------
3 files changed, 1138 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 9431ccc6a8d1..4d32599e1140 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,6 @@
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-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
-DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
-DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
-DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
-DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
diff --git a/media-libs/opencv/opencv-4.5.0-r3.ebuild b/media-libs/opencv/opencv-4.5.0-r3.ebuild
deleted file mode 100644
index 60d935951196..000000000000
--- a/media-libs/opencv/opencv-4.5.0-r3.ebuild
+++ /dev/null
@@ -1,566 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-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
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# 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="
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- 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:
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- virtual/lapack
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( <media-libs/openexr-3.0.0:0=[${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=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
- eigen? (
- || (
- >=dev-cpp/eigen-3.3.8-r1:3
- <dev-cpp/eigen-3.3.8:3
- )
- )
- java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; 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
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -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
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # 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=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_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-4.5.1-r3.ebuild b/media-libs/opencv/opencv-4.5.1-r3.ebuild
deleted file mode 100644
index 4c0223aebb80..000000000000
--- a/media-libs/opencv/opencv-4.5.1-r3.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-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
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# 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_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? ( tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- 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:
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- <dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- virtual/lapack
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( <media-libs/openexr-3.0.0:0=[${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=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
- eigen? (
- || (
- >=dev-cpp/eigen-3.3.8-r1:3
- <dev-cpp/eigen-3.3.8:3
- )
- )
- java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; 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
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -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
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # 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=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-02-15 19:51 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 36ed0f3919ac0fbe012d2ad328919c41d26d83cf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 21:23:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:50:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ed0f39
media-libs/opencv: support OpenEXR 3 / imath
We drop multilib for OpenEXR bits for now. Not clear that anything
actually needs this and we don't have multilib support in imath
right now (nor did it succeed when I tried to add it there).
Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/830124
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 578 +++++++++++++++++++++++++++++++
1 file changed, 578 insertions(+)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
new file mode 100644
index 000000000000..fda543f7a76a
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-02-28 5:21 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-02-28 5:21 UTC (permalink / raw
To: gentoo-commits
commit: 05045661b5339aa080df34a8d6304284e2c0a240
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 05:19:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 05:19:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05045661
media-libs/opencv: Stabilize 4.5.5-r1 amd64, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index fda543f7a76a..c284572ea9a3 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-02-28 23:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-02-28 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 2f018306b4ce74ec76d58d3169341bb74faf1e2e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:56:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:56:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f018306
media-libs/opencv: Stabilize 4.5.5-r1 x86, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index c284572ea9a3..cbeb4b4b04a4 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-03-01 0:02 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-03-01 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 27b0995be9ab270838b8b3ef56132ac4c3924404
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 00:01:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 00:01:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b0995b
media-libs/opencv: Stabilize 4.5.5-r1 arm64, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index cbeb4b4b04a4..98288510a586 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-04-13 15:02 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-04-13 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 8c4eb7d6334fe67041f490cbf2534f859e88a574
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 15:01:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 15:02:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4eb7d6
media-libs/opencv: drop to maintainer-needed
Long-inactive maintainer and this package needs a lot of love
anyway.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 1626a4e4bc45..2837852f1792 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>amynka@gentoo.org</email>
- <name>Amy Liffey</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-04-14 6:55 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-04-14 6:55 UTC (permalink / raw
To: gentoo-commits
commit: f3a125d5b010c8fbdfb49061f75c3fd1fa821cae
Author: Randall Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Thu Apr 14 01:40:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 06:50:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a125d5
media-libs/opencv: filter -O3 flags back down to -O2
Closes: https://bugs.gentoo.org/838274
Signed-off-by: Randall Vasquez <ran.dall <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/25021
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.2-r3.ebuild | 7 +++++--
media-libs/opencv/opencv-4.5.2-r5.ebuild | 7 +++++--
media-libs/opencv/opencv-4.5.4.ebuild | 7 +++++--
media-libs/opencv/opencv-4.5.5-r1.ebuild | 5 ++++-
media-libs/opencv/opencv-4.5.5.ebuild | 7 +++++--
5 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/media-libs/opencv/opencv-4.5.2-r3.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild
index 9b1bb3c11c7c..9b3f36c342d0 100644
--- a/media-libs/opencv/opencv-4.5.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -295,6 +295,9 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
cmake_src_prepare
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-4.5.2-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
index 21f9624b9049..2b66d2c57956 100644
--- a/media-libs/opencv/opencv-4.5.2-r5.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9,10} )
CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -296,6 +296,9 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
cmake_src_prepare
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
index d294809c1d6a..24070fe0c2e4 100644
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -307,6 +307,9 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
cmake_src_prepare
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index 98288510a586..e3d2e5a3efbe 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -303,6 +303,9 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
cmake_src_prepare
# remove bundled stuff
diff --git a/media-libs/opencv/opencv-4.5.5.ebuild b/media-libs/opencv/opencv-4.5.5.ebuild
index cc9da840a605..7eddbcd042ce 100644
--- a/media-libs/opencv/opencv-4.5.5.ebuild
+++ b/media-libs/opencv/opencv-4.5.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -303,6 +303,9 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
cmake_src_prepare
# remove bundled stuff
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-04-19 5:50 Matt Turner
0 siblings, 0 replies; 208+ messages in thread
From: Matt Turner @ 2022-04-19 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 4610dead81f9749649b0f5f0ddb8c412c9b4b7ea
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 05:44:02 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 05:46:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4610dead
media-libs/opencv: Allow USE="gtk3 opengl"
Inexplicably removed in commit 83780dade6b ("media-libs/opencv: version
bump to 4.4.0").
Closes: https://bugs.gentoo.org/836788
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index e3d2e5a3efbe..65583955c5a9 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -76,7 +76,7 @@ REQUIRED_USE="
contribxfeatures2d? ( contrib download )
examples? ( contribdnn )
java? ( python )
- opengl? ( qt5 )
+ opengl? ( || ( gtk3 qt5 ) )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt5 )"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-04-21 20:49 Matt Turner
0 siblings, 0 replies; 208+ messages in thread
From: Matt Turner @ 2022-04-21 20:49 UTC (permalink / raw
To: gentoo-commits
commit: e902c7ec3c0362ab4c240c20b5a4818dfb304b62
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 20:48:32 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 20:48:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e902c7ec
Revert "media-libs/opencv: Allow USE="gtk3 opengl""
This reverts commit 4610dead81f9749649b0f5f0ddb8c412c9b4b7ea.
Closes: https://bugs.gentoo.org/836788
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index 65583955c5a9..e3d2e5a3efbe 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -76,7 +76,7 @@ REQUIRED_USE="
contribxfeatures2d? ( contrib download )
examples? ( contribdnn )
java? ( python )
- opengl? ( || ( gtk3 qt5 ) )
+ opengl? ( qt5 )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt5 )"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-05-22 20:47 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-05-22 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 0d64bbacf95adb79fc62ac4f52e2fedfbd594d07
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Tue May 17 22:58:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 20:46:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d64bbac
media-libs/opencv: add upstream patch to support ffmpeg-5
Tested with both ffmpeg-4.4.2 and ffmpeg-5.0.1
Closes: https://bugs.gentoo.org/831485
Thanks-to: cyrillic <cyrilmaley <AT> hotmail.com>
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/25543
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 1 +
media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 ++
2 files changed, 3 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index cf43ea8cfd9e..7bb0c71f3335 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,6 +1,7 @@
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-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
+DIST opencv-4.5.5-fix-build-with-ffmpeg5.patch 39562 BLAKE2B ede6cb0c8f96af1d91696bc8cd011b449100ab7eccd45ae7dfe209ffc55b773cd219e82ba7afbac95239624475041d4cf87861c0d8c9f7f99999a74acf001bc2 SHA512 597c45615434411e9148c6cd88da5017cee6dff858a01f9706ae76a910e27144b67aa3033465a8f1f768a4096db7016b3f6d3b248a7c21c00af757302ba2e3a5
DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild
index e3d2e5a3efbe..c91d39563697 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis
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://github.com/opencv/opencv/commit/5440fd6cb43ea65a056c46b691fcdab1a425e92d.patch -> ${PN}-4.5.5-fix-build-with-ffmpeg5.patch
dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
contrib? (
@@ -291,6 +292,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${DISTDIR}"/${PN}-4.5.5-fix-build-with-ffmpeg5.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-06-07 4:37 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-06-07 4:37 UTC (permalink / raw
To: gentoo-commits
commit: 2d5e4062df38b6faa35d2d2c1f785bc2f138a548
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 04:34:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 04:36:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5e4062
media-libs/opencv: add 4.6.0
Bug: https://bugs.gentoo.org/834092
Closes: https://bugs.gentoo.org/830185
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.6.0.ebuild | 580 ++++++++++++++++++++++++++++++++++
2 files changed, 582 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 7bb0c71f3335..6d0cb6746005 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,4 +4,6 @@ DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff
DIST opencv-4.5.5-fix-build-with-ffmpeg5.patch 39562 BLAKE2B ede6cb0c8f96af1d91696bc8cd011b449100ab7eccd45ae7dfe209ffc55b773cd219e82ba7afbac95239624475041d4cf87861c0d8c9f7f99999a74acf001bc2 SHA512 597c45615434411e9148c6cd88da5017cee6dff858a01f9706ae76a910e27144b67aa3033465a8f1f768a4096db7016b3f6d3b248a7c21c00af757302ba2e3a5
DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
+DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
+DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.6.0.ebuild b/media-libs/opencv/opencv-4.6.0.ebuild
new file mode 100644
index 000000000000..2e23f70dbc01
--- /dev/null
+++ b/media-libs/opencv/opencv-4.6.0.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-06-07 6:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-06-07 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 26fc7b7d7c7ec1c8a0bea65de3ac4c8654b8aa4a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 06:58:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 06:58:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26fc7b7d
media-libs/opencv: enable py3.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0.ebuild b/media-libs/opencv/opencv-4.6.0.ebuild
index 2e23f70dbc01..bd837e847ead 100644
--- a/media-libs/opencv/opencv-4.6.0.ebuild
+++ b/media-libs/opencv/opencv-4.6.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-06-07 6:59 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-06-07 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 5d5bd05261d5cb2131d2d702194b55f41649c9f8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 06:59:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 06:59:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d5bd052
media-libs/opencv: libjpeg-turboify
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.6.0.ebuild => opencv-4.6.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0.ebuild b/media-libs/opencv/opencv-4.6.0-r1.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.6.0.ebuild
rename to media-libs/opencv/opencv-4.6.0-r1.ebuild
index bd837e847ead..56eae7b76fa1 100644
--- a/media-libs/opencv/opencv-4.6.0.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r1.ebuild
@@ -113,7 +113,7 @@ RDEPEND="
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
lapack? (
virtual/cblas
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-07-08 0:57 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-07-08 0:57 UTC (permalink / raw
To: gentoo-commits
commit: bb40b419b4806cd2ddbb2f72f2518abd9b8d23c9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 21:39:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 00:56:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb40b419
media-libs/opencv: add dev-cpp/glog subslot dep
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.5.5-r1.ebuild => opencv-4.5.5-r2.ebuild} | 4 ++--
media-libs/opencv/{opencv-4.6.0-r1.ebuild => opencv-4.6.0-r2.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.5.5-r1.ebuild
rename to media-libs/opencv/opencv-4.5.5-r2.ebuild
index c91d39563697..ba8b80694058 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r2.ebuild
@@ -99,8 +99,8 @@ RDEPEND="
contribovis? ( dev-games/ogre:0/1.12 )
ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+ 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}]
diff --git a/media-libs/opencv/opencv-4.6.0-r1.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.6.0-r1.ebuild
rename to media-libs/opencv/opencv-4.6.0-r2.ebuild
index 56eae7b76fa1..49f04357d294 100644
--- a/media-libs/opencv/opencv-4.6.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -97,8 +97,8 @@ RDEPEND="
contribovis? ( dev-games/ogre:0/1.12 )
ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+ 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}]
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-07-08 7:41 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2022-07-08 7:41 UTC (permalink / raw
To: gentoo-commits
commit: d73319bebcf63c2c067304688a680d35b6f15f53
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 07:41:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 07:41:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73319be
media-libs/opencv: use libjpeg-turbo for older too
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.5.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.5.5-r2.ebuild b/media-libs/opencv/opencv-4.5.5-r2.ebuild
index ba8b80694058..3685fb5fc3c5 100644
--- a/media-libs/opencv/opencv-4.5.5-r2.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r2.ebuild
@@ -115,7 +115,7 @@ RDEPEND="
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
lapack? (
virtual/cblas
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-09-15 6:44 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2022-09-15 6:44 UTC (permalink / raw
To: gentoo-commits
commit: afd3be490b6a9a26144191b28495cab34b22ed3e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 06:43:28 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 06:43:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd3be49
media-libs/opencv: Stabilize 4.6.0-r2 x86, #865239
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index 8cca419b41eb..e53ddc08263c 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-09-15 6:48 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2022-09-15 6:48 UTC (permalink / raw
To: gentoo-commits
commit: 260bb22c432bbbad4384ce50c518e6e3889d55a9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 06:47:56 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 06:47:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260bb22c
media-libs/opencv: Stabilize 4.6.0-r2 arm64, #865239
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index e53ddc08263c..a4b9764e16b9 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-09-15 15:11 Agostino Sarubbo
0 siblings, 0 replies; 208+ messages in thread
From: Agostino Sarubbo @ 2022-09-15 15:11 UTC (permalink / raw
To: gentoo-commits
commit: f3b1b5186fbf530428c385072f2a55edb376be63
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 15:11:21 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 15:11:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b1b518
media-libs/opencv: Stabilize 4.6.0-r2 amd64, #865239
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index a4b9764e16b9..a02ff7760364 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-09-15 16:43 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2022-09-15 16:43 UTC (permalink / raw
To: gentoo-commits
commit: d5d3a67a810e8e04a9d260ac62cc1610a943298e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 15:17:29 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 16:41:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d3a67a
media-libs/opencv: drop 4.5.5-r2
Closes: https://bugs.gentoo.org/865239
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/opencv/Manifest | 3 -
media-libs/opencv/opencv-4.5.5-r2.ebuild | 582 -------------------------------
2 files changed, 585 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 6d0cb6746005..c3c88e4d707c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,6 @@
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-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
-DIST opencv-4.5.5-fix-build-with-ffmpeg5.patch 39562 BLAKE2B ede6cb0c8f96af1d91696bc8cd011b449100ab7eccd45ae7dfe209ffc55b773cd219e82ba7afbac95239624475041d4cf87861c0d8c9f7f99999a74acf001bc2 SHA512 597c45615434411e9148c6cd88da5017cee6dff858a01f9706ae76a910e27144b67aa3033465a8f1f768a4096db7016b3f6d3b248a7c21c00af757302ba2e3a5
-DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
-DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.5.5-r2.ebuild b/media-libs/opencv/opencv-4.5.5-r2.ebuild
deleted file mode 100644
index beebe9a9313f..000000000000
--- a/media-libs/opencv/opencv-4.5.5-r2.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-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://github.com/opencv/opencv/commit/5440fd6cb43ea65a056c46b691fcdab1a425e92d.patch -> ${PN}-4.5.5-fix-build-with-ffmpeg5.patch
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# 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.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? ( contrib
- tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- 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:
-# 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= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- >=virtual/lapack-3.10
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- 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=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
- java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [contrib_sfm]
- /usr/include/opencv4/opencv2/sfm.hpp
- /usr/include/opencv4/opencv2/sfm/conditioning.hpp
- /usr/include/opencv4/opencv2/sfm/fundamental.hpp
- /usr/include/opencv4/opencv2/sfm/io.hpp
- /usr/include/opencv4/opencv2/sfm/numeric.hpp
- /usr/include/opencv4/opencv2/sfm/projection.hpp
- /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
- /usr/include/opencv4/opencv2/sfm/robust.hpp
- /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
- /usr/include/opencv4/opencv2/sfm/triangulation.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
- "${DISTDIR}"/${PN}-4.5.5-fix-build-with-ffmpeg5.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() {
- # https://bugs.gentoo.org/838274
- replace-flags -O3 -O2
-
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; 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
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(multilib_native_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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -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
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # 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=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2022-12-03 4:47 WANG Xuerui
0 siblings, 0 replies; 208+ messages in thread
From: WANG Xuerui @ 2022-12-03 4:47 UTC (permalink / raw
To: gentoo-commits
commit: c22bc5247189de17d45d3e3e1f2b08edfb37e305
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 18:31:28 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 04:46:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22bc524
media-libs/opencv: keyword 4.6.0-r2 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index d37405c6f7c1..19e1de876abb 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-02-21 20:00 Alfredo Tupone
0 siblings, 0 replies; 208+ messages in thread
From: Alfredo Tupone @ 2023-02-21 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 168ea43eb307bd47e56b0b5c916c54bdfa17e396
Author: Siddhanth Rathod <xsiddhanthrathod <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 18:28:59 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 20:00:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168ea43e
media-libs/opencv: add 4.7.0
Closes: https://bugs.gentoo.org/895682
Signed-off-by: Siddhanth Rathod <xsiddhanthrathod <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29708
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.7.0.ebuild | 581 ++++++++++++++++++++++++++++++++++
2 files changed, 583 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c3c88e4d707c..afd4918173cb 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,4 +3,6 @@ DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
+DIST opencv-4.7.0.tar.gz 91027497 BLAKE2B c76ae37a79e48f818b83383f35b4fe518d959e4e34651dc16346438eeba31cbfd5c970c27e30cad359c8ad91435e9bdb61cad147f08e671d4c844cb8c5b525f9 SHA512 f799e1eb4ef1eb81212319cf908d0a64d2d5179c8da86b919b06e96a6870a9f3ed33251223a841b71711349018ea6782c174179fa59958a1573e22d11cc9347d
+DIST opencv-4.7.0_contrib.tar.gz 59421940 BLAKE2B d427743c45d7430f3a6dd5712ad46bb7c2b9e88a48a3e924fb32c6a10cdb1f4205941453cc3e1340f02cd53ba5a13061f0da9a7e413072a6bd4a6529507b0939 SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild
new file mode 100644
index 000000000000..02e55d7aaac2
--- /dev/null
+++ b/media-libs/opencv/opencv-4.7.0.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${FILESDIR}"/${PN}-4.6.0-fix-build-examples.patch # bug 830163, pending upstream PR #22245
+)
+
+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() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-03-04 7:18 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-03-04 7:18 UTC (permalink / raw
To: gentoo-commits
commit: d234bfecea67d0fc9e422e342836a90eaffe2043
Author: Martin Kemp <me <AT> martinke <DOT> mp>
AuthorDate: Mon Feb 27 12:37:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 07:18:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d234bfec
media-lib/opencv: Fix cuda lib compatibility
OpenCV 4.6.x is incompatible with CUDA 12
Signed-off-by: Martin Kemp <me <AT> martinke.mp>
Closes: https://github.com/gentoo/gentoo/pull/29830
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.6.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.6.0-r4.ebuild b/media-libs/opencv/opencv-4.6.0-r4.ebuild
index 41297926757d..11596eede91e 100644
--- a/media-libs/opencv/opencv-4.6.0-r4.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r4.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ cuda? ( <dev-util/nvidia-cuda-toolkit-12:= )
contribhdf? ( sci-libs/hdf5:= )
contribfreetype? (
media-libs/freetype:2[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-05-17 8:16 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2023-05-17 8:16 UTC (permalink / raw
To: gentoo-commits
commit: d0d4f0bb93791255b87454fc247175526aa96b72
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 08:15:38 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 17 08:16:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d4f0bb
media-libs/opencv: Stabilize 4.7.0 x86, #906588
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild
index 02e55d7aaac2..0ec33d67b52a 100644
--- a/media-libs/opencv/opencv-4.7.0.ebuild
+++ b/media-libs/opencv/opencv-4.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-05-17 11:36 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2023-05-17 11:36 UTC (permalink / raw
To: gentoo-commits
commit: ea8299df804018b185230c9f4ded50ba553734fe
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 11:35:42 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 17 11:35:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8299df
media-libs/opencv: Stabilize 4.7.0 amd64, #906588
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild
index 0ec33d67b52a..c3ec87262b13 100644
--- a/media-libs/opencv/opencv-4.7.0.ebuild
+++ b/media-libs/opencv/opencv-4.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-07-15 6:08 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-07-15 6:08 UTC (permalink / raw
To: gentoo-commits
commit: 91ceeb8243ddb6e7d4c8c15de3f59c46c26187c6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 06:07:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 06:07:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ceeb82
media-libs/opencv: Stabilize 4.7.0 arm64, #906588
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild
index c3ec87262b13..15fd917278e6 100644
--- a/media-libs/opencv/opencv-4.7.0.ebuild
+++ b/media-libs/opencv/opencv-4.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-08-21 19:57 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-08-21 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 88efb7a6fd5512afb027eb0416b4d35c9be47ea8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 19:53:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 19:53:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88efb7a6
media-libs/opencv: fix build w/ new protobuf
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.7.0-r1.ebuild | 584 +++++++++++++++++++++++++++++++
1 file changed, 584 insertions(+)
diff --git a/media-libs/opencv/opencv-4.7.0-r1.ebuild b/media-libs/opencv/opencv-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..ddf36bc7442e
--- /dev/null
+++ b/media-libs/opencv/opencv-4.7.0-r1.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# 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= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${FILESDIR}"/${PN}-4.6.0-fix-build-examples.patch # bug 830163, pending upstream PR #22245
+)
+
+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() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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=(
+ # for protobuf
+ -DCMAKE_CXX_STANDARD=14
+
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-08-22 13:12 Andrew Ammerlaan
0 siblings, 0 replies; 208+ messages in thread
From: Andrew Ammerlaan @ 2023-08-22 13:12 UTC (permalink / raw
To: gentoo-commits
commit: fff547871e9a63f12b3e82b284029b7991fe0de3
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 12:51:09 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 13:11:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff54787
media-libs/opencv: add 4.8.0
This unfortunatly does not fix the incompatibility
with protobuf-23.
Bug: https://bugs.gentoo.org/912788
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.8.0.ebuild | 584 ++++++++++++++++++++++++++++++++++
2 files changed, 586 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index afd4918173cb..101f4de3c816 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -5,4 +5,6 @@ DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d2
DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
DIST opencv-4.7.0.tar.gz 91027497 BLAKE2B c76ae37a79e48f818b83383f35b4fe518d959e4e34651dc16346438eeba31cbfd5c970c27e30cad359c8ad91435e9bdb61cad147f08e671d4c844cb8c5b525f9 SHA512 f799e1eb4ef1eb81212319cf908d0a64d2d5179c8da86b919b06e96a6870a9f3ed33251223a841b71711349018ea6782c174179fa59958a1573e22d11cc9347d
DIST opencv-4.7.0_contrib.tar.gz 59421940 BLAKE2B d427743c45d7430f3a6dd5712ad46bb7c2b9e88a48a3e924fb32c6a10cdb1f4205941453cc3e1340f02cd53ba5a13061f0da9a7e413072a6bd4a6529507b0939 SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
+DIST opencv-4.8.0.tar.gz 91992565 BLAKE2B eede5479acdcef7dfb49d260b696ed14e85a27b8cd7211934d3fa9df9a46072daca9e1b7c50d1d56633d5e7bdf96e4a5731c8ea0e04886dc381e7864357ed8de SHA512 48738c3e7460a361274357aef1dd427082ccd59f749d6317d92a414b3741ce6116ea15ed4fedd2d47a25e456c705f3ba114357558646097bfc0e6dba9b3b865c
+DIST opencv-4.8.0_contrib.tar.gz 59201076 BLAKE2B e30c4f17e1e89c8b0821bbf8ea44b6b4ce505ad2761222a8b119c5aee5ae4ef50e06a73f41fee3b2fa60b71c736989904f6d1fb31a16abfe39e605e2d32d851b SHA512 81cc41cfe1ea03e60b0657edeaa76a90926e5e79a9f93a482e17bc9edbf1b5ce36b13d108fd8fb097f2fb3d6381fbeb102811f44bfc761c2de7f69bf3c5298a1
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.8.0.ebuild b/media-libs/opencv/opencv-4.8.0.ebuild
new file mode 100644
index 000000000000..772cd8408d98
--- /dev/null
+++ b/media-libs/opencv/opencv-4.8.0.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib qt5 )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ 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:
+# openmp? ( !threads )
+
+RDEPEND="
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ <dev-libs/protobuf-23:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.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() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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=(
+ # for protobuf
+ -DCMAKE_CXX_STANDARD=14
+
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -DWITH_FLATBUFFERS=OFF # Requires removed third party component
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # 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=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-08-24 22:37 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-08-24 22:37 UTC (permalink / raw
To: gentoo-commits
commit: f11297869a4c975f5834d185547d5c33a97df661
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 22:35:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 22:35:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1129786
media-libs/opencv: re-conditionalise flatbuffers cmake option
Bug: https://bugs.gentoo.org/912788
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index e4cc0a689fed..0255657a5e62 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -349,6 +349,7 @@ multilib_src_configure() {
# ===================================================
-DENABLE_DOWNLOAD=$(usex download)
-DWITH_QUIRC=OFF # Do not have dependencies
+ -DWITH_FLATBUFFERS=$(usex contribdnn)
-DWITH_1394=$(usex ieee1394)
# -DWITH_AVFOUNDATION=OFF # IOS
-DWITH_VTK=$(multilib_native_usex vtk)
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-08-24 22:37 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-08-24 22:37 UTC (permalink / raw
To: gentoo-commits
commit: b48bd29a09e91fae578a84675c720c142d4b0c23
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 22:37:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 22:37:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48bd29a
media-libs/opencv: disable py3.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index 0255657a5e62..f9390c38feab 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-08-26 5:04 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-08-26 5:04 UTC (permalink / raw
To: gentoo-commits
commit: d5e8c28d05787df2fe2910df523a30fed323ad15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 04:56:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 04:57:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e8c28d
media-libs/opencv: disable py3.12
It doesn't appear to actually support it yet.
Closes: https://bugs.gentoo.org/912987
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index f9390c38feab..846e57c7514b 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+# No 3.12 yet for bug #912987
+PYTHON_COMPAT=( python3_{10..11} )
inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-10-09 16:21 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2023-10-09 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 14111c38c0f85bd142688ee88ee1721fb886f8f8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 16:19:51 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 16:19:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14111c38
media-libs/opencv: Stabilize 4.8.0-r1 x86, #915427
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index 27cec3eb3fa4..9ffb620264e6 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-10-10 7:09 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2023-10-10 7:09 UTC (permalink / raw
To: gentoo-commits
commit: de473ccdb87baac0c1c45cf63d4f1fc634c54c65
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 07:09:33 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 07:09:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de473ccd
media-libs/opencv: Stabilize 4.8.0-r1 amd64, #915427
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index 9ffb620264e6..2910615c0b36 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-11-16 15:11 Florian Schmaus
0 siblings, 0 replies; 208+ messages in thread
From: Florian Schmaus @ 2023-11-16 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 690b410bbf1489482dc86366df104a132331bc7f
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 6 17:04:23 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:10:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690b410b
media-libs/opencv: add myself as maintainer
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
media-libs/opencv/metadata.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index d668f3ee0ba8..2191061366b5 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>negril.nx+gentoo@gmail.com</email>
+ <name>Paul Zander</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-11-16 15:11 Florian Schmaus
0 siblings, 0 replies; 208+ messages in thread
From: Florian Schmaus @ 2023-11-16 15:11 UTC (permalink / raw
To: gentoo-commits
commit: bbb19f14df02c9dbc367a28e884c96b8c84407c5
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 15:10:12 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:10:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb19f14
media-libs/opencv: update upstream metadata
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
media-libs/opencv/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 2191061366b5..3dea3514dbd0 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -42,7 +42,7 @@
<upstream>
<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
<remote-id type="github">opencv/opencv</remote-id>
- <remote-id type="github">Itseez/opencv_contrib</remote-id>
+ <remote-id type="github">opencv/opencv_contrib</remote-id>
<remote-id type="sourceforge">opencvlibrary</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-11-16 15:11 Florian Schmaus
0 siblings, 0 replies; 208+ messages in thread
From: Florian Schmaus @ 2023-11-16 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 9972122a469e7d980a63ea3c9d4beec8f8d16623
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov 3 12:58:50 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:10:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972122a
media-libs/opencv: add 4.8.1
Closes: https://bugs.gentoo.org/912840
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33692
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
media-libs/opencv/Manifest | 2 +
media-libs/opencv/opencv-4.8.1.ebuild | 613 ++++++++++++++++++++++++++++++++++
2 files changed, 615 insertions(+)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 101f4de3c816..eb95310084f5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,4 +7,6 @@ DIST opencv-4.7.0.tar.gz 91027497 BLAKE2B c76ae37a79e48f818b83383f35b4fe518d959e
DIST opencv-4.7.0_contrib.tar.gz 59421940 BLAKE2B d427743c45d7430f3a6dd5712ad46bb7c2b9e88a48a3e924fb32c6a10cdb1f4205941453cc3e1340f02cd53ba5a13061f0da9a7e413072a6bd4a6529507b0939 SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
DIST opencv-4.8.0.tar.gz 91992565 BLAKE2B eede5479acdcef7dfb49d260b696ed14e85a27b8cd7211934d3fa9df9a46072daca9e1b7c50d1d56633d5e7bdf96e4a5731c8ea0e04886dc381e7864357ed8de SHA512 48738c3e7460a361274357aef1dd427082ccd59f749d6317d92a414b3741ce6116ea15ed4fedd2d47a25e456c705f3ba114357558646097bfc0e6dba9b3b865c
DIST opencv-4.8.0_contrib.tar.gz 59201076 BLAKE2B e30c4f17e1e89c8b0821bbf8ea44b6b4ce505ad2761222a8b119c5aee5ae4ef50e06a73f41fee3b2fa60b71c736989904f6d1fb31a16abfe39e605e2d32d851b SHA512 81cc41cfe1ea03e60b0657edeaa76a90926e5e79a9f93a482e17bc9edbf1b5ce36b13d108fd8fb097f2fb3d6381fbeb102811f44bfc761c2de7f69bf3c5298a1
+DIST opencv-4.8.1.tar.gz 92006711 BLAKE2B 54728a37e3e8a528bd8d2e6df5963a996820a51160d05ac72b350234ce5372f99c037af96e13c55de1452e517fffb478c2335b9e1cbc07a36c78f99351eabd58 SHA512 b98d89b8e7b8ae8138bce00c5226816b761b53fbeb8f28ca516e08c5d130f216f9388a81785cd6684034530f768e097cbe12f19a9361f362b7d2048bfc427a65
+DIST opencv-4.8.1_contrib.tar.gz 59200293 BLAKE2B 8cf3ee60cb38a9fa2649013b9b4704022abe5cc65c331078dc7ea87028bc99df8b0de12f835905f5bb5c00a811f256754cac018ca8e02739ac5c6fe36aa4346d SHA512 e3df49e6a1411f55eebbc02f4534ddefabff961b4f63c69b21fe06ff3df894773a8643ab0cb123b83c2bdc8fa02698b332d3c243e8546c894e6c6c8ecaa65500
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/opencv-4.8.1.ebuild b/media-libs/opencv/opencv-4.8.1.ebuild
new file mode 100644
index 000000000000..0bfc5cab4674
--- /dev/null
+++ b/media-libs/opencv/opencv-4.8.1.ebuild
@@ -0,0 +1,613 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No 3.12 yet for bug #912987
+PYTHON_COMPAT=( python3_{10..11} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+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
+ dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+ contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+ contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+ )"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+ cpu_flags_ppc_vsx:VSX
+ cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+ avx:AVX
+ avx2:AVX2
+ avx512f:AVX_512F
+ f16c:FP16
+ fma3:FMA3
+ popcnt:POPCNT
+ sse:SSE
+ sse2:SSE2
+ sse3:SSE3
+ ssse3:SSSE3
+ sse4_1:SSE4_1
+ sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# 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.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? ( contrib
+ tesseract? ( opencl ) )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib || ( qt5 qt6 ) )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib download )
+ examples? ( contribdnn )
+ java? ( python )
+ opengl? ( || ( qt5 qt6 ) )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tesseract? ( contrib )
+ ?? ( gtk3 || ( qt5 qt6 ) )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+# 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= )
+ contribdnn? ( dev-libs/flatbuffers:= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( dev-games/ogre:0/1.12 )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ lapack? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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= )
+ )
+ !qt5? (
+ qt6? (
+ dev-qt/qtbase:6=[gui,widgets,concurrent,opengl?]
+ )
+ )
+ tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+ threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contrib_cvv]
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contrib_hdf]
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+ /usr/include/opencv4/opencv2/hdf.hpp
+ # [contrib_ovis]
+ /usr/include/opencv4/opencv2/ovis.hpp
+ # [contrib_sfm]
+ /usr/include/opencv4/opencv2/sfm.hpp
+ /usr/include/opencv4/opencv2/sfm/conditioning.hpp
+ /usr/include/opencv4/opencv2/sfm/fundamental.hpp
+ /usr/include/opencv4/opencv2/sfm/io.hpp
+ /usr/include/opencv4/opencv2/sfm/numeric.hpp
+ /usr/include/opencv4/opencv2/sfm/projection.hpp
+ /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
+ /usr/include/opencv4/opencv2/sfm/robust.hpp
+ /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
+ /usr/include/opencv4/opencv2/sfm/triangulation.hpp
+ # [vtk]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+ "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+ "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+ "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+ "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch
+ "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch
+ "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.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() {
+ # https://bugs.gentoo.org/838274
+ replace-flags -O3 -O2
+
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use dnnsamples; 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
+ if use contribxfeatures2d; then
+ mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ fi
+ fi
+
+ if use download; then
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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=(
+ # for protobuf
+ -DCMAKE_CXX_STANDARD=14
+
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=$(usex download)
+ -DWITH_QUIRC=OFF # Do not have dependencies
+ -DWITH_FLATBUFFERS=$(usex contribdnn)
+ -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 gtk3)
+ -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+ -DWITH_IPP=OFF
+ # Jasper was removed from tree because of security problems.
+ # Upstream were/are making progress. We use openjpeg instead.
+ # bug 734284
+ -DWITH_JASPER=OFF
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OPENJPEG=$(usex jpeg2k)
+ -DWITH_WEBP=$(usex webp)
+ -DWITH_OPENEXR=$(multilib_native_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_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
+ -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+ -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=OFF
+ # -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
+ -DOPENCV_GENERATE_PKGCONFIG=ON
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ -DENABLE_CCACHE=OFF
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DENABLE_PRECOMPILED_HEADERS=OFF
+ -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
+ -DENABLE_LTO=$(usex lto)
+ # ===================================================
+ # things we want to be hard off or not yet figured out
+ # ===================================================
+ -DBUILD_PACKAGE=OFF
+ # ===================================================
+ # Not building protobuf but update files bug #631418
+ # ===================================================
+ -DWITH_PROTOBUF=ON
+ -DBUILD_PROTOBUF=OFF
+ -DPROTOBUF_UPDATE_FILES=ON
+ -Dprotobuf_MODULE_COMPATIBLE=ON
+ # ===================================================
+ # things we want to be hard enabled not worth useflag
+ # ===================================================
+ -DCMAKE_SKIP_RPATH=ON
+ -DOPENCV_DOC_INSTALL_PATH=
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF)
+ )
+
+ if use qt5; then
+ GLOBALCMAKEARGS+=(
+ -DWITH_QT=$(multilib_native_usex qt5 ON OFF)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
+ )
+ elif use qt6; then
+ GLOBALCMAKEARGS+=(
+ -DWITH_QT=$(multilib_native_usex qt6 ON OFF)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
+ )
+ else
+ GLOBALCMAKEARGS+=(
+ -DWITH_QT=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
+ )
+ fi
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+
+ GLOBALCMAKEARGS+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+ -DCPU_BASELINE=${CPU_BASELINE}
+ -DCPU_DISPATCH=
+ )
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ GLOBALCMAKEARGS+=(
+ -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+ -DBUILD_opencv_dnns_easily_fooled=OFF
+ -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+ -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+ -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+ -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+ -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+ -DBUILD_opencv_ovis=$(usex contribovis 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
+ -DBUILD_opencv_python2=OFF
+ -DBUILD_opencv_python3=OFF
+ )
+
+ cmake_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 contribdnn; 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+=(
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+ -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+ )
+
+ # Regenerate cache file. Can't use rebuild_cache as it won't
+ # have the Gentoo specific options.
+ rm CMakeCache.txt || die "rm failed"
+ cmake_src_configure
+ cmake_src_compile
+ cmake_src_install
+
+ # Remove compiled binary so new version compiles
+ # Avoid conflicts with new module builds as build system doesn't
+ # really support it.
+ rm -r modules/python3 || die "rm failed"
+
+ python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2023-11-27 11:23 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2023-11-27 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 4a56314051f629be7458361c47907996b12f3bec
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Nov 27 04:34:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 11:22:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a563140
media-libs/opencv: Stabilize 4.8.0-r1 arm64, #915427
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index ad47071aba4d..e5f917168501 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-10 12:33 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-01-10 12:33 UTC (permalink / raw
To: gentoo-commits
commit: ffe7db9fea449121418607737c320c312bebb7f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 12:27:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 12:32:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe7db9f
media-libs/opencv: filter LTO
Clearly unsafe, see e.g. https://github.com/opencv/opencv/issues/19020 too.
Closes: https://bugs.gentoo.org/919101
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 2ac1b3b9fcc5..643ae918665e 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -351,6 +351,9 @@ src_prepare() {
}
multilib_src_configure() {
+ # bug #919101 and https://github.com/opencv/opencv/issues/19020
+ filter-lto
+
# please dont sort here, order is the same as in CMakeLists.txt
local mycmakeargs=(
-DMIN_VER_CMAKE=3.26
@@ -484,7 +487,6 @@ multilib_src_configure() {
-DENABLE_INSTRUMENTATION=OFF
-DGENERATE_ABI_DESCRIPTOR=OFF
-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- # -DENABLE_LTO=$(usex lto)
# ===================================================
# things we want to be hard off or not yet figured out
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-10 12:33 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-01-10 12:33 UTC (permalink / raw
To: gentoo-commits
commit: bc28280a52b748c374b883822380917ebcefb2c6
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Jan 6 18:32:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 12:32:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc28280a
media-libs/opencv: drop 4.8.1
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34662
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1.ebuild | 614 ----------------------------------
1 file changed, 614 deletions(-)
diff --git a/media-libs/opencv/opencv-4.8.1.ebuild b/media-libs/opencv/opencv-4.8.1.ebuild
deleted file mode 100644
index 3f219f22a627..000000000000
--- a/media-libs/opencv/opencv-4.8.1.ebuild
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No 3.12 yet for bug #912987
-PYTHON_COMPAT=( python3_{10..11} )
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-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
- dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
- f16c:FP16
- fma3:FMA3
- popcnt:POPCNT
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# 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.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? ( contrib
- tesseract? ( opencl ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib || ( qt5 qt6 ) )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- examples? ( contribdnn )
- java? ( python )
- opengl? ( || ( qt5 qt6 ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 || ( qt5 qt6 ) )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# 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= )
- contribdnn? ( dev-libs/flatbuffers:= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( dev-games/ogre:0/1.12 )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- >=virtual/lapack-3.10
- )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- 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= )
- )
- !qt5? (
- qt6? (
- dev-qt/qtbase:6=[gui,widgets,concurrent,opengl?]
- )
- )
- tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
- java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contrib_cvv]
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
- /usr/include/opencv4/opencv2/hdf.hpp
- # [contrib_ovis]
- /usr/include/opencv4/opencv2/ovis.hpp
- # [contrib_sfm]
- /usr/include/opencv4/opencv2/sfm.hpp
- /usr/include/opencv4/opencv2/sfm/conditioning.hpp
- /usr/include/opencv4/opencv2/sfm/fundamental.hpp
- /usr/include/opencv4/opencv2/sfm/io.hpp
- /usr/include/opencv4/opencv2/sfm/numeric.hpp
- /usr/include/opencv4/opencv2/sfm/projection.hpp
- /usr/include/opencv4/opencv2/sfm/reconstruct.hpp
- /usr/include/opencv4/opencv2/sfm/robust.hpp
- /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
- /usr/include/opencv4/opencv2/sfm/triangulation.hpp
- # [vtk]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
- "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
- "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
- "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch
- "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch
- "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch
- "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.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() {
- # https://bugs.gentoo.org/838274
- replace-flags -O3 -O2
-
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnnsamples; 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
- if use contribxfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- if use download; then
- mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || 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=(
- # for protobuf
- -DCMAKE_CXX_STANDARD=14
-
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -DWITH_FLATBUFFERS=$(usex contribdnn)
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(multilib_native_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_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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -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
- -DENABLE_LTO=$(usex lto)
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DWITH_PROTOBUF=ON
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- -Dprotobuf_MODULE_COMPATIBLE=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- if use qt5; then
- GLOBALCMAKEARGS+=(
- -DWITH_QT=$(multilib_native_usex qt5 ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
- )
- elif use qt6; then
- GLOBALCMAKEARGS+=(
- -DWITH_QT=$(multilib_native_usex qt6 ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
- )
- else
- GLOBALCMAKEARGS+=(
- -DWITH_QT=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
- )
- fi
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- GLOBALCMAKEARGS+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=${CPU_BASELINE}
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
-
- cmake_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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm CMakeCache.txt || die "rm failed"
- cmake_src_configure
- cmake_src_compile
- cmake_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -r modules/python3 || die "rm failed"
-
- python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
- cmake_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
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-10 13:10 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-01-10 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 17175667216af9f238015556b76afca821eb5f1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 13:09:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 13:09:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17175667
media-libs/opencv: backport filter-lto to 4.8.0
Backport ffe7db9fea449121418607737c320c312bebb7f9.
Bug: https://bugs.gentoo.org/919101
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 -
.../opencv/{opencv-4.8.0-r2.ebuild => opencv-4.8.0-r3.ebuild} | 8 +++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 80f1912bd4fd..fc1efa988e96 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -34,7 +34,6 @@
<flag name="gflags">Use Google's C++ argument parsing library (<pkg>dev-cpp/gflags</pkg>)</flag>
<flag name="glog">Use Google's C++ logging library (<pkg>dev-cpp/glog</pkg>)</flag>
<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
- <flag name="lto">Build using Link Time Optimizations (LTO)</flag>
<flag name="non-free">Enable non-free components</flag>
<flag name="opencvapps">Enable compilation with opencvapps</flag>
<flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag>
diff --git a/media-libs/opencv/opencv-4.8.0-r2.ebuild b/media-libs/opencv/opencv-4.8.0-r3.ebuild
similarity index 98%
rename from media-libs/opencv/opencv-4.8.0-r2.ebuild
rename to media-libs/opencv/opencv-4.8.0-r3.ebuild
index 2671f7fab885..99a65fe7d7c7 100644
--- a/media-libs/opencv/opencv-4.8.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
ARM_CPU_FEATURES=(
@@ -342,6 +342,9 @@ src_prepare() {
}
multilib_src_configure() {
+ # bug #919101 and https://github.com/opencv/opencv/issues/19020
+ filter-lto
+
# please dont sort here, order is the same as in CMakeLists.txt
GLOBALCMAKEARGS=(
# for protobuf
@@ -468,7 +471,6 @@ multilib_src_configure() {
-DENABLE_INSTRUMENTATION=OFF
-DGENERATE_ABI_DESCRIPTOR=OFF
-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- -DENABLE_LTO=$(usex lto)
# ===================================================
# things we want to be hard off or not yet figured out
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-12 21:44 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-01-12 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 1f6de8470abd5b1298b26b2868cfba3708b8c72b
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Jan 11 17:41:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:43:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6de847
media-libs/opencv: 4.8.1 restrict contribdnn on ABI_X86_32
`dev-libs/flatbuffers` has no ABI_X86_32 support, so don't enable it there.
Closes: https://bugs.gentoo.org/921761
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34765
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 153 ++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 643ae918665e..1a7df1d12747 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
-DENABLE_DOWNLOAD=yes
-DOPENCV_ENABLE_NONFREE=$(usex non-free)
-DWITH_QUIRC=OFF # Do not have dependencies
- -DWITH_FLATBUFFERS=$(usex contribdnn)
+ -DWITH_FLATBUFFERS=$(multilib_native_usex contribdnn)
-DWITH_1394=$(usex ieee1394)
# -DWITH_AVFOUNDATION=OFF # IOS
-DWITH_VTK=$(multilib_native_usex vtk)
@@ -545,7 +545,7 @@ multilib_src_configure() {
# ===================================================
if use contrib; then
mycmakeargs+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+ -DBUILD_opencv_dnn=$(multilib_native_usex contribdnn ON OFF)
-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
@@ -637,6 +637,155 @@ multilib_src_compile() {
}
multilib_src_install() {
+ if use abi_x86_64 && use abi_x86_32; then
+ MULTILIB_WRAPPED_HEADERS=(
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+
+ /usr/include/opencv4/opencv2/core_detect.hpp
+
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contribcvv]
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contribdnn]
+ /usr/include/opencv4/opencv2/dnn.hpp
+ /usr/include/opencv4/opencv2/dnn/all_layers.hpp
+ /usr/include/opencv4/opencv2/dnn/dict.hpp
+ /usr/include/opencv4/opencv2/dnn/dnn.hpp
+ /usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
+ /usr/include/opencv4/opencv2/dnn/layer.details.hpp
+ /usr/include/opencv4/opencv2/dnn/layer.hpp
+ /usr/include/opencv4/opencv2/dnn/shape_utils.hpp
+ /usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
+ /usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+ /usr/include/opencv4/opencv2/dnn/version.hpp
+ /usr/include/opencv4/opencv2/dnn_superres.hpp
+ # [contribhdf]
+ /usr/include/opencv4/opencv2/hdf.hpp
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+
+ /usr/include/opencv4/opencv2/mcc.hpp
+ /usr/include/opencv4/opencv2/mcc/ccm.hpp
+ /usr/include/opencv4/opencv2/mcc/checker_detector.hpp
+ /usr/include/opencv4/opencv2/mcc/checker_model.hpp
+
+ /usr/include/opencv4/opencv2/text.hpp
+ /usr/include/opencv4/opencv2/text/erfilter.hpp
+ /usr/include/opencv4/opencv2/text/ocr.hpp
+ /usr/include/opencv4/opencv2/text/swt_text_detection.hpp
+ /usr/include/opencv4/opencv2/text/textDetector.hpp
+
+ # [qt5,qt6]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+
+ /usr/include/opencv4/opencv2/wechat_qrcode.hpp
+ )
+ fi
if multilib_is_native_abi && use python; then
python_foreach_impl cmake_src_install
python_foreach_impl python_optimize
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-16 20:00 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2024-01-16 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 21870abb26e2cc0501f8de44ed179df3ccd97878
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 20:00:26 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 20:00:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21870abb
media-libs/opencv: Stabilize 4.8.1-r1 arm64, #921296
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 1a7df1d12747..19f60739e552 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -45,7 +45,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-18 15:19 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2024-01-18 15:19 UTC (permalink / raw
To: gentoo-commits
commit: a66ed551f0b2379cde883734dec72032cbda27bc
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 15:19:33 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 15:19:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66ed551
media-libs/opencv: Stabilize 4.8.1-r1 x86, #921296
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 848bdbc39a58..2559815a7d55 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -45,7 +45,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-18 15:19 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2024-01-18 15:19 UTC (permalink / raw
To: gentoo-commits
commit: c4669e71bfa8e4b4f394e0774a65522970e94c57
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 15:18:46 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 15:18:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4669e71
media-libs/opencv: Stabilize 4.8.1-r1 amd64, #921296
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 19f60739e552..848bdbc39a58 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -45,7 +45,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-01-23 20:35 Andreas Sturmlechner
0 siblings, 0 replies; 208+ messages in thread
From: Andreas Sturmlechner @ 2024-01-23 20:35 UTC (permalink / raw
To: gentoo-commits
commit: ace7d0c6c33c07d1f0e8aa57e2cab2f813deb791
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Jan 22 23:41:10 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 20:34:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace7d0c6
media-libs/opencv: 4.8.1-r1 unpack everything always
Not filtering out these two archives adds about 1 MiB to `WORKDIR`, but doesn't rely on `sys-apps/grep[pcre]`.
Since `pkgcheck` doesn't like them being zip files anyway this is going to change for `-4.9.0` either way.
Closes: https://bugs.gentoo.org/922450
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 2559815a7d55..9d7ece8e5c85 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -242,10 +242,6 @@ pkg_setup() {
use java && java-pkg-opt-2_pkg_setup
}
-src_unpack() {
- unpack $(echo "${A}" | tr ' ' '\n' | grep -vP "(ade-0.1.2|NVIDIAOpticalFlowSDK)")
-}
-
src_prepare() {
if use cuda; then
export CUDA_VERBOSE="$(usex debug "true" "false")"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-03-18 17:06 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-03-18 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 4d61e4edede6ac34a554e862f3662e2f406d8894
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 17:05:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 17:06:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d61e4ed
media-libs/opencv: 4.9.0 fixed wrong distfiles extension
Closes: https://bugs.gentoo.org/927254
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35819
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 202bb7ea81d1..c190e9097d77 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -353,8 +353,8 @@ src_prepare() {
mkdir -p "${S}/.cache/ade" || die
cp \
- "${DISTDIR}/ade-${ADE_PV}.zip" \
- "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.zip" | cut -f 1 -d " ")-v${ADE_PV}.zip" || die
+ "${DISTDIR}/ade-${ADE_PV}.tar.gz" \
+ "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die
if use dnnsamples; then
mkdir -p "${S}/.cache/wechat_qrcode" || die
@@ -415,10 +415,10 @@ src_prepare() {
if use cuda; then
mkdir -p "${S}/.cache/nvidia_optical_flow"
cp \
- "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.zip" \
+ "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \
"${S}/.cache/nvidia_optical_flow/$( \
- md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.zip" | cut -f 1 -d " " \
- )-${NVIDIA_OPTICAL_FLOW_COMMIT}.zip" || die
+ md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \
+ )-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die
fi
if use java; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-03-23 13:44 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-03-23 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 4ff32a9f403ec7f815b2cd494092527d85599df3
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Mar 20 17:43:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 13:43:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff32a9f
media-libs/opencv: 4.9.0 fix
Closes: https://bugs.gentoo.org/927344
Closes: https://bugs.gentoo.org/927270
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35874
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index c190e9097d77..8039acfa0f75 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -448,7 +448,7 @@ multilib_src_configure() {
-DENABLE_DOWNLOAD=yes
-DOPENCV_ENABLE_NONFREE="$(usex non-free)"
-DWITH_QUIRC="$(usex quirc)"
- -DWITH_FLATBUFFERS="$(usex contribdnn)"
+ -DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)"
-DWITH_1394="$(usex ieee1394)"
# -DWITH_AVFOUNDATION="no" # IOS
-DWITH_VTK="$(multilib_native_usex vtk)"
@@ -579,7 +579,7 @@ multilib_src_configure() {
# ===================================================
# things we want to be hard enabled not worth useflag
# ===================================================
- # -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}"
+ -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}"
# NOTE do this so testprograms do not fail TODO adjust path in code
-DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata"
-DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-04-01 7:58 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2024-04-01 7:58 UTC (permalink / raw
To: gentoo-commits
commit: f4abc7ad9ee520d6c9f666757501855138e76926
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Mar 31 17:41:42 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 07:58:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4abc7ad
media-libs/opencv: prohibit cuda-12.4
Also limit cuda interaction to ABI_X86_64.
Bug: https://github.com/opencv/opencv_contrib/issues/3690
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36020
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.8.1-r1.ebuild | 6 +++---
media-libs/opencv/opencv-4.9.0.ebuild | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index d183c6f8d97a..0f6ed3e6a080 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
cudnn? ( dev-libs/cudnn:= )
contribdnn? ( dev-libs/flatbuffers:= )
contribhdf? ( sci-libs/hdf5:= )
@@ -231,7 +231,7 @@ pkg_pretend() {
einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
fi
- if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+ if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
einfo "$info_message so all available architectures are build."
fi
@@ -566,7 +566,7 @@ multilib_src_configure() {
# workaround for bug 413429
tc-export CC CXX
- if use cuda; then
+ if multilib_is_native_abi && use cuda; then
cuda_add_sandbox -w
if [[ -n "${CUDA_GENERATION}" ]]; then
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 8039acfa0f75..5ad9e4eabaaa 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -145,7 +145,7 @@ RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
cudnn? ( dev-libs/cudnn:= )
contribdnn? ( dev-libs/flatbuffers:= )
contribhdf? ( sci-libs/hdf5:= )
@@ -315,7 +315,7 @@ pkg_pretend() {
einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
fi
- if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+ if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
einfo "$info_message so all available architectures are build."
fi
@@ -676,7 +676,7 @@ multilib_src_configure() {
# workaround for bug 413429
tc-export CC CXX
- if use cuda; then
+ if multilib_is_native_abi && use cuda; then
cuda_add_sandbox -w
CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
CUDAARCHS="$(cuda_get_host_native_arch)"
@@ -791,7 +791,7 @@ multilib_src_test() {
)
fi
- if use cuda; then
+ if multilib_is_native_abi && use cuda; then
CMAKE_SKIP_TESTS+=(
'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
@@ -817,7 +817,7 @@ multilib_src_test() {
--test-timeout 180
)
- if use cuda; then
+ if multilib_is_native_abi && use cuda; then
cuda_add_sandbox -w
export OPENCV_PARALLEL_BACKEND="threads"
export DNN_BACKEND_OPENCV="cuda"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-04-22 3:40 Michał Górny
0 siblings, 0 replies; 208+ messages in thread
From: Michał Górny @ 2024-04-22 3:40 UTC (permalink / raw
To: gentoo-commits
commit: 5ee73bf7faeeb2d128ffc4b1ce5a76c14e2134d8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 03:30:11 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 03:40:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee73bf7
media-libs/opencv: Add := op on dev-python/numpy
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 9c1ac20be8c5..36bf72aa8718 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -203,7 +203,7 @@ RDEPEND="
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/numpy:=[${PYTHON_USEDEP}]
)
qt5? (
dev-qt/qtgui:5
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-05-20 16:25 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-05-20 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 18600f194bc724bd545159660ed3b1c598524b7c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 16:18:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 20 16:18:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18600f19
media-libs/opencv: fix revbump for numpy :=
Fixes: 5ee73bf7faeeb2d128ffc4b1ce5a76c14e2134d8
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/{opencv-4.8.1-r1.ebuild => opencv-4.8.1-r2.ebuild} | 2 +-
media-libs/opencv/{opencv-4.9.0.ebuild => opencv-4.9.0-r1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.8.1-r1.ebuild
rename to media-libs/opencv/opencv-4.8.1-r2.ebuild
index 0756ee648856..bb6a1ae807ab 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r2.ebuild
@@ -168,7 +168,7 @@ RDEPEND="
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/numpy:=[${PYTHON_USEDEP}]
)
qt5? (
dev-qt/qtgui:5
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0-r1.ebuild
similarity index 100%
rename from media-libs/opencv/opencv-4.9.0.ebuild
rename to media-libs/opencv/opencv-4.9.0-r1.ebuild
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-07-31 8:47 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2024-07-31 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 3411e383d2932183c9c202863445090757b408f5
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 08:46:01 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 08:46:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3411e383
media-libs/opencv: Stabilize 4.9.0-r1 amd64, #936920
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r1.ebuild b/media-libs/opencv/opencv-4.9.0-r1.ebuild
index dbf8b20165fd..dcd87a1a9d34 100644
--- a/media-libs/opencv/opencv-4.9.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r1.ebuild
@@ -56,7 +56,7 @@ else
https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
)
"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-07-31 8:47 Joonas Niilola
0 siblings, 0 replies; 208+ messages in thread
From: Joonas Niilola @ 2024-07-31 8:47 UTC (permalink / raw
To: gentoo-commits
commit: e017010990a075ea0f20ad800e2e2758f48d727e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 08:46:35 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 08:46:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0170109
media-libs/opencv: Stabilize 4.9.0-r1 x86, #936920
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r1.ebuild b/media-libs/opencv/opencv-4.9.0-r1.ebuild
index dcd87a1a9d34..227ff691acb6 100644
--- a/media-libs/opencv/opencv-4.9.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r1.ebuild
@@ -56,7 +56,7 @@ else
https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
)
"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
fi
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-08-16 3:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-08-16 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 394f067c28043e761497d150e9571a9c3029a9fe
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jul 30 14:14:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 03:57:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394f067c
media-libs/opencv: addwrite "/proc/self/task" instead of sandbox_write
it was left over from a local wrapper.
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37823
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 6678622564f5..3ddfccd217f2 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -690,7 +690,7 @@ multilib_src_configure() {
if multilib_is_native_abi && use cuda; then
cuda_add_sandbox -w
- sandbox_write "/proc/self/task"
+ addwrite "/proc/self/task"
CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
CUDAARCHS="$(cuda_get_host_native_arch)"
export CUDAHOSTCXX
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-08-16 3:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-08-16 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 3e421ff08962b125d182b94216be5433a7d1b553
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jul 30 11:34:34 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 03:57:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e421ff0
media-libs/opencv: build without BSFIX, drop java-ant-2
- Exports -Dant.build.javac.source and -Dant.build.javac.target
- Sets OPENCV_ANT_JAVAC_EXTRA_ATTRS with java-pkg_get-source and java-pkg_get-target
- Stops inheriting java-ant-2
- Introduces COMMON_DEPEND to avoid virtual/jre in DEPEND
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 1035 ++++++++++++++++++++++++++++++
1 file changed, 1035 insertions(+)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
new file mode 100644
index 000000000000..6678622564f5
--- /dev/null
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -0,0 +1,1035 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+
+if [[ ${PV} = *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+ # branch master
+ ADE_PV="0.1.2d"
+ # branch wechat_qrcode_20210119
+ QRCODE_COMMIT="a8b69ccc738421293254aec5ddb38bd523503252"
+ # branch dnn_samples_face_detector_20170830
+ DNN_SAMPLES_FACE_DETECTOR_COMMIT="b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f"
+ # branch contrib_xfeatures2d_boostdesc_20161012
+ XFEATURES2D_BOOSTDESC_COMMIT="34e4206aef44d50e6bbcd0ab06354b52e7466d26"
+ # branch contrib_xfeatures2d_vgg_20160317
+ XFEATURES2D_VGG_COMMIT="fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+ # branch contrib_face_alignment_20170818
+ FACE_ALIGNMENT_COMMIT="8afa57abc8229d611c4937165d20e2a2d9fc5a12"
+ # branch nvof_2_0_bsd
+ NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca"
+
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz
+ contrib? (
+ https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${PN}_contrib-${PV}.tar.gz
+ dnnsamples? (
+ https://github.com/${PN}/${PN}_3rdparty/archive/${QRCODE_COMMIT}.tar.gz -> ${PN}_3rdparty-${QRCODE_COMMIT}.tar.gz
+ https://github.com/${PN}/${PN}_3rdparty/archive/${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
+ -> ${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
+ )
+ contribxfeatures2d? (
+ https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
+ -> ${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
+ https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_VGG_COMMIT}.tar.gz
+ -> ${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}.tar.gz
+ )
+ contribdnn? (
+ https://github.com/${PN}/${PN}_3rdparty/archive/${FACE_ALIGNMENT_COMMIT}.tar.gz
+ -> ${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}.tar.gz
+ )
+ cuda? (
+ https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
+ -> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
+ )
+ )
+ test? (
+ https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
+ )
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+
+# general options
+IUSE="debug doc +eigen gflags glog java non-free opencvapps +python test testprograms"
+
+# modules
+IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d dnnsamples examples +features2d"
+# hardware
+IUSE+=" opencl cuda cudnn video_cards_intel"
+# video
+IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
+# image
+IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
+# gui
+IUSE+=" gtk3 qt5 qt6 opengl vtk"
+# parallel
+IUSE+=" openmp tbb"
+# lapack options
+IUSE+=" atlas lapack mkl"
+
+# TODO make this only relevant for binhost
+CPU_FEATURES_MAP=(
+ cpu_flags_arm_neon:NEON
+ cpu_flags_arm_vfpv3:VFPV3
+
+ cpu_flags_ppc_vsx:VSX # (always available on Power8)
+ cpu_flags_ppc_vsx3:VSX3 # (always available on Power9)
+
+ cpu_flags_x86_sse:SSE # (always available on 64-bit CPUs)
+ cpu_flags_x86_sse2:SSE2 # (always available on 64-bit CPUs)
+
+ cpu_flags_x86_sse3:SSE3
+ cpu_flags_x86_ssse3:SSSE3
+
+ cpu_flags_x86_sse4_1:SSE4_1
+ cpu_flags_x86_popcnt:POPCNT
+ cpu_flags_x86_sse4_2:SSE4_2
+
+ cpu_flags_x86_f16c:FP16
+ cpu_flags_x86_fma3:FMA3
+ cpu_flags_x86_avx:AVX
+ cpu_flags_x86_avx2:AVX2
+ cpu_flags_x86_avx512f:AVX_512F
+)
+IUSE+=" ${CPU_FEATURES_MAP[*]%:*}"
+unset ARM_CPU_FEATURES PPC_CPU_FEATURES X86_CPU_FEATURES_RAW X86_CPU_FEATURES
+
+REQUIRED_USE="
+ amd64? ( cpu_flags_x86_sse cpu_flags_x86_sse2 )
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+ cuda? (
+ contrib
+ tesseract? ( opencl )
+ )
+ cudnn? ( cuda )
+ dnnsamples? ( examples )
+ gflags? ( contrib )
+ glog? ( contrib )
+ contribcvv? ( contrib || ( qt5 qt6 ) )
+ contribdnn? ( contrib )
+ contribfreetype? ( contrib )
+ contribhdf? ( contrib )
+ contribovis? ( contrib )
+ contribsfm? ( contrib eigen gflags glog )
+ contribxfeatures2d? ( contrib )
+ java? ( python )
+ opengl? ( ?? ( gtk3 || ( qt5 qt6 ) ) )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tesseract? ( contrib )
+ ?? ( gtk3 || ( qt5 qt6 ) )
+ test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
+"
+
+# TODO find a way to compile these with the cuda compiler
+REQUIRED_USE+="
+ cuda? ( !gdal !openexr !tbb )
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
+ cudnn? ( dev-libs/cudnn:= )
+ contribdnn? ( dev-libs/flatbuffers:= )
+ contribhdf? ( sci-libs/hdf5:= )
+ contribfreetype? (
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ contribovis? ( >=dev-games/ogre-1.12:= )
+ ffmpeg? ( 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}]
+ )
+ gtk3? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+ sys-libs/libraw1394[${MULTILIB_USEDEP}]
+ )
+ java? ( >=virtual/jre-1.8:* )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ jpeg2k? (
+ jasper? ( media-libs/jasper:= )
+ !jasper? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ )
+ lapack? (
+ atlas? ( sci-libs/atlas )
+ mkl? ( sci-libs/mkl )
+ !atlas? (
+ !mkl? (
+ virtual/cblas
+ >=virtual/lapack-3.10
+ virtual/lapacke
+ )
+ )
+ )
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ dev-util/opencl-headers
+ )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ 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 )
+ )
+ !qt5? (
+ qt6? (
+ dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
+ )
+ )
+ quirc? ( media-libs/quirc )
+ tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+ tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+ vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+ vtk? ( sci-libs/vtk:=[rendering,cuda=] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+ java? ( >=virtual/jdk-1.8:* )
+"
+# TODO gstreamer dependencies
+DEPEND+="
+ test? (
+ gstreamer? (
+ media-plugins/gst-plugins-jpeg[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-x264[${MULTILIB_USEDEP}]
+ )
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+ virtual/pkgconfig
+ cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+ doc? (
+ app-text/doxygen[dot]
+ python? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ )
+ )
+ java? ( >=dev-java/ant-1.10.14-r3 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4.0-disable-download.patch"
+ "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
+ "${FILESDIR}/${PN}-4.1.2-opencl-license.patch"
+ "${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch"
+ "${FILESDIR}/${PN}-4.5.0-link-with-cblas-for-lapack.patch"
+
+ "${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch"
+ "${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch"
+ "${FILESDIR}/${PN}-4.9.0-drop-python2-detection.patch"
+ "${FILESDIR}/${PN}-4.9.0-ade-0.1.2d.tar.gz.patch"
+ "${FILESDIR}/${PN}-4.9.0-cmake-cleanup.patch"
+
+ # TODO applied in src_prepare
+ # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch"
+ # "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
+)
+
+cuda_get_cuda_compiler() {
+ local compiler
+ tc-is-gcc && compiler="gcc"
+ tc-is-clang && compiler="clang"
+ [[ -z "$compiler" ]] && die "no compiler specified"
+
+ local package="sys-devel/${compiler}"
+ local version="${package}"
+ local CUDAHOSTCXX_test
+ while
+ local CUDAHOSTCXX="${CUDAHOSTCXX_test}"
+ version=$(best_version "${version}")
+ if [[ -z "${version}" ]]; then
+ if [[ -z "${CUDAHOSTCXX}" ]]; then
+ die "could not find supported version of ${package}"
+ fi
+ break
+ fi
+ CUDAHOSTCXX_test="$(
+ dirname "$(
+ realpath "$(
+ which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")"
+ )"
+ )"
+ )"
+ version="<${version}"
+ do ! echo "int main(){}" | nvcc "-ccbin ${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done
+
+ echo "${CUDAHOSTCXX}"
+}
+
+cuda_get_host_native_arch() {
+ : "${CUDAARCHS:=$(__nvcc_device_query)}"
+ echo "${CUDAARCHS}"
+}
+
+pkg_pretend() {
+ if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then # TODO CUDAARCHS
+ einfo "The target CUDA architecture can be set via one of:"
+ einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto"
+ einfo " - CUDA_ARCH_BIN, (and optionally CUDA_ARCH_PTX) in the form of x.y tuples."
+ einfo " You can specify multiple tuple separated by \";\"."
+ einfo ""
+ einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
+ fi
+
+ if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+ local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
+ einfo "$info_message so all available architectures are build."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # remove bundled stuff
+ rm -r 3rdparty || die "Removing 3rd party components failed"
+ sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ -i CMakeLists.txt cmake/*cmake || die
+
+ if use contrib; then
+ cd "${WORKDIR}/${PN}_contrib-${PV}" || die
+ eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
+ eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
+ if has_version ">=dev-util/nvidia-cuda-toolkit-12.4" && use cuda; then
+ # TODO https://github.com/NVIDIA/cccl/pull/1522
+ eapply "${FILESDIR}/${PN}_contrib-4.9.0-cuda-12.4.patch"
+ fi
+ cd "${S}" || die
+
+ ! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }
+ # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; }
+ ! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; }
+ ! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; }
+ ! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; }
+ ! use contribsfm && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/sfm" || die; }
+ ! use contribxfeatures2d && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/xfeatures2d" || die; }
+ fi
+
+ mkdir -p "${S}/.cache/ade" || die
+ cp \
+ "${DISTDIR}/ade-${ADE_PV}.tar.gz" \
+ "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die
+
+ if use dnnsamples; then
+ mkdir -p "${S}/.cache/wechat_qrcode" || die
+ for file in "detect.caffemodel" "detect.prototxt" "sr.prototxt" "sr.caffemodel"; do
+ mv \
+ "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" \
+ "${S}/.cache/wechat_qrcode/$( \
+ md5sum "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" | cut -f 1 -d " " \
+ )-${file}" || die
+ done
+
+ mv \
+ "${WORKDIR}/${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}/res10_300x300_ssd_iter_140000.caffemodel" \
+ "${S}/samples/dnn/" || die
+ fi
+
+ if use contribxfeatures2d; then
+ cp \
+ "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i \
+ "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ mkdir -p "${S}/.cache/xfeatures2d/boostdesc" || die
+ for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i; do
+ mv \
+ "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" \
+ "${S}/.cache/xfeatures2d/boostdesc/$( \
+ md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
+ )-$(basename "${file}")" || die
+ done
+
+ cp \
+ "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i \
+ "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+ mkdir -p "${S}/.cache/xfeatures2d/vgg" || die
+ for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i; do
+ mv \
+ "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" \
+ "${S}/.cache/xfeatures2d/vgg/$( \
+ md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
+ )-$(basename "${file}")" || die
+ done
+ fi
+
+ if use contribdnn; then
+ mkdir -p "${S}/.cache/data" || die
+ mkdir -p "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" || die
+ file="face_landmark_model.dat"
+ cp \
+ "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
+ "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" \
+ || die
+ mv \
+ "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
+ "${S}/.cache/data/$( \
+ md5sum "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" | cut -f 1 -d " " \
+ )-${file}" || die
+ fi
+
+ if use cuda; then
+ mkdir -p "${S}/.cache/nvidia_optical_flow"
+ cp \
+ "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \
+ "${S}/.cache/nvidia_optical_flow/$( \
+ md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \
+ )-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die
+ fi
+
+ if use java; then
+ java-pkg-opt-2_src_prepare
+
+ # set encoding so even this cmake build will pick it up.
+ export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+ export ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)"
+ export ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)"
+ fi
+}
+
+multilib_src_configure() {
+ # bug #919101 and https://github.com/opencv/opencv/issues/19020
+ filter-lto
+
+ # please don't sort here, order is the same as in CMakeLists.txt
+ local mycmakeargs=(
+ -DMIN_VER_CMAKE=3.26
+
+ -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # FindPythonInterp
+
+ # for protobuf
+ -DCMAKE_CXX_STANDARD=17
+
+ # Optional 3rd party components
+ # ===================================================
+ -DENABLE_DOWNLOAD=yes
+ -DOPENCV_ENABLE_NONFREE="$(usex non-free)"
+ -DWITH_QUIRC="$(usex quirc)"
+ -DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)"
+ -DWITH_1394="$(usex ieee1394)"
+ # -DWITH_AVFOUNDATION="no" # IOS
+ -DWITH_VTK="$(multilib_native_usex vtk)"
+ -DWITH_EIGEN="$(usex eigen)"
+ -DWITH_VFW="no" # Video windows support
+ -DWITH_FFMPEG="$(usex ffmpeg)"
+ -DWITH_GSTREAMER="$(usex gstreamer)"
+ -DWITH_GTK="$(usex gtk3)"
+ -DWITH_GTK_2_X="no" # only want gtk3 nowadays
+ -DWITH_IPP="no"
+ -DWITH_JASPER="$(multilib_native_usex jasper)"
+ -DWITH_JPEG="$(usex jpeg)"
+ -DWITH_OPENJPEG="$(usex jpeg2k)"
+ -DWITH_WEBP="$(usex webp)"
+ -DWITH_OPENEXR="$(multilib_native_usex openexr)"
+ -DWITH_OPENGL="$(usex opengl)"
+ -DOpenGL_GL_PREFERENCE="GLVND"
+ -DWITH_OPENVX="no"
+ -DWITH_OPENNI="no" # Not packaged
+ -DWITH_OPENNI2="no" # Not packaged
+ -DWITH_PNG="$(usex png)"
+ -DWITH_GDCM="no"
+ -DWITH_PVAPI="no"
+ -DWITH_GIGEAPI="no"
+ -DWITH_ARAVIS="no"
+ -DWITH_WIN32UI="no" # Windows only
+ # -DWITH_QUICKTIME="no"
+ # -DWITH_QTKIT="no"
+ -DWITH_TBB="$(usex tbb)"
+ -DWITH_OPENMP="$(usex !tbb "$(usex openmp)")"
+ -DWITH_PTHREADS_PF="yes"
+ -DWITH_TIFF="$(usex tiff)"
+ -DWITH_UNICAP="no" # Not packaged
+ -DWITH_V4L="$(usex v4l)"
+ -DWITH_LIBV4L="$(usex v4l)"
+ # -DWITH_DSHOW="yes" # direct show supp
+ -DWITH_MSMF="no"
+ -DWITH_XIMEA="no" # Windows only
+ -DWITH_XINE="$(multilib_native_usex xine)"
+ -DWITH_CLP="no"
+ -DWITH_OPENCL="$(usex opencl)"
+ -DWITH_OPENCL_SVM="no" # "$(usex opencl)"
+ -DWITH_DIRECTX="no"
+ -DWITH_INTELPERC="no"
+ -DWITH_IPP_A="no"
+ -DWITH_MATLAB="no"
+ -DWITH_VA="$(usex vaapi)"
+ -DWITH_VA_INTEL="$(usex vaapi "$(usex video_cards_intel)")"
+ -DWITH_GDAL="$(multilib_native_usex gdal)"
+ -DWITH_GPHOTO2="$(usex gphoto2)"
+ -DWITH_LAPACK="$(multilib_native_usex lapack)"
+ -DWITH_ITT="no" # 3dparty libs itt_notify
+ # ===================================================
+ # CUDA build components: nvidia-cuda-toolkit
+ # ===================================================
+ -DWITH_CUDA="$(multilib_native_usex cuda)"
+ -DWITH_CUBLAS="$(multilib_native_usex cuda)"
+ -DWITH_CUFFT="$(multilib_native_usex cuda)"
+ -DWITH_CUDNN="$(multilib_native_usex cudnn)"
+ # NOTE set this via MYCMAKEARGS if needed
+ -DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK
+ -DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK
+ -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${EPREFIX}/opt/cuda" "")"
+ # ===================================================
+ # OpenCV build components
+ # ===================================================
+ -DBUILD_SHARED_LIBS="yes"
+ -DBUILD_JAVA="$(multilib_native_usex java)" # Ant needed, no compile flag
+ -DBUILD_ANDROID_EXAMPLES="no"
+ -DBUILD_opencv_apps="$(usex opencvapps)"
+ -DBUILD_DOCS="$(usex doc)" # Doesn't install anyways.
+ -DBUILD_EXAMPLES="$(multilib_native_usex examples)"
+ -DBUILD_TESTS="$(multilib_native_usex test)"
+ -DBUILD_PERF_TESTS="no"
+
+ # -DBUILD_WITH_STATIC_CRT="no"
+ -DBUILD_WITH_DYNAMIC_IPP="no"
+ -DBUILD_FAT_JAVA_LIB="no"
+ # -DBUILD_ANDROID_SERVICE="no"
+ -DBUILD_CUDA_STUBS="$(multilib_native_usex cuda)"
+ -DOPENCV_EXTRA_MODULES_PATH="$(usex contrib "${WORKDIR}/${PN}_contrib-${PV}/modules" "")"
+ # ===================================================
+ # OpenCV installation options
+ # ===================================================
+ -DINSTALL_CREATE_DISTRIB="no"
+ -DINSTALL_BIN_EXAMPLES="$(multilib_native_usex examples)"
+ -DINSTALL_C_EXAMPLES="$(multilib_native_usex examples)"
+ -DINSTALL_TESTS="$(multilib_native_usex testprograms)"
+ # -DINSTALL_ANDROID_EXAMPLES="no"
+ -DINSTALL_TO_MANGLED_PATHS="no"
+ -DOPENCV_GENERATE_PKGCONFIG="yes"
+ # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+ # to set its destination libdir
+ -DLIB_SUFFIX=
+ # ===================================================
+ # OpenCV build options
+ # ===================================================
+ # -DENABLE_CCACHE="no"
+ # bug 733796, but PCH is a risky game in CMake anyway
+ -DBUILD_USE_SYMLINKS="yes"
+ -DENABLE_PRECOMPILED_HEADERS="no"
+ -DENABLE_SOLUTION_FOLDERS="no"
+ -DENABLE_PROFILING="no"
+ -DENABLE_COVERAGE="no"
+ -DOPENCV_DOWNLOAD_TRIES_LIST="0"
+
+ -DHAVE_opencv_java="$(multilib_native_usex java)"
+
+ -DBUILD_WITH_DEBUG_INFO="$(usex debug)"
+ -DOPENCV_ENABLE_MEMORY_SANITIZER="$(usex debug)"
+ -DCV_TRACE="$(usex debug)"
+ -DENABLE_NOISY_WARNINGS="$(usex debug)"
+ -DOPENCV_WARNINGS_ARE_ERRORS="no"
+ -DENABLE_IMPL_COLLECTION="no"
+ -DENABLE_INSTRUMENTATION="no"
+ -DGENERATE_ABI_DESCRIPTOR="no"
+ # ===================================================
+ # things we want to be hard off or not yet figured out
+ # ===================================================
+ -DBUILD_PACKAGE="no"
+ # ===================================================
+ # Not building protobuf but update files bug #631418
+ # ===================================================
+ -DWITH_PROTOBUF="yes"
+ -DBUILD_PROTOBUF="no"
+ -DPROTOBUF_UPDATE_FILES="yes"
+ -DProtobuf_MODULE_COMPATIBLE="yes"
+ # ===================================================
+ # things we want to be hard enabled not worth useflag
+ # ===================================================
+ -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}"
+ # NOTE do this so testprograms do not fail TODO adjust path in code
+ -DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata"
+ -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
+ -DOPENCV_SAMPLES_BIN_INSTALL_PATH="libexec/${PN}/bin/samples"
+
+ -DBUILD_IPP_IW="no"
+ -DBUILD_ITT="no"
+
+ # ===================================================
+ # configure modules to be build
+ # ===================================================
+ -DBUILD_opencv_gapi="$(usex ffmpeg yes "$(usex gstreamer)")"
+ -DBUILD_opencv_features2d="$(usex features2d)"
+ -DBUILD_opencv_java_bindings_generator="$(usex java)"
+ -DBUILD_opencv_js="no"
+ -DBUILD_opencv_js_bindings_generator="no"
+ -DBUILD_opencv_objc_bindings_generator="no"
+ -DBUILD_opencv_python2="no"
+ -DBUILD_opencv_ts="$(usex test)"
+ -DBUILD_opencv_video="$(usex ffmpeg yes "$(usex gstreamer)")"
+ -DBUILD_opencv_videoio="$(usex ffmpeg yes "$(usex gstreamer)")"
+
+ -DBUILD_opencv_cudalegacy="no"
+
+ # -DBUILD_opencv_world="yes"
+
+ -DDNN_PLUGIN_LIST="all"
+ -DHIGHGUI_PLUGIN_LIST="all"
+ -DVIDEOIO_PLUGIN_LIST="all"
+
+ )
+
+ if use qt5; then
+ mycmakeargs+=(
+ -DWITH_QT="$(multilib_native_usex qt5)"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
+ )
+ elif use qt6; then
+ mycmakeargs+=(
+ -DWITH_QT="$(multilib_native_usex qt6)"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
+ )
+ else
+ mycmakeargs+=(
+ -DWITH_QT="no"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
+ )
+ fi
+
+ # ==================================================
+ # cpu flags, should solve 633900
+ #===================================================
+ # TODO binhost https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
+
+ local CPU_BASELINE=""
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+ use "${i%:*}" && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+ fi
+ done
+ unset CPU_FEATURES_MAP
+
+ mycmakeargs+=(
+ -DCPU_BASELINE="${CPU_BASELINE}"
+ )
+ if [[ ${MERGE_TYPE} != "buildonly" ]]; then
+ mycmakeargs+=(
+ -DOPENCV_CPU_OPT_IMPLIES_IGNORE="yes"
+ -DCPU_DISPATCH=
+ )
+ fi
+
+ # ===================================================
+ # OpenCV Contrib Modules
+ # ===================================================
+ if use contrib; then
+ mycmakeargs+=(
+ -DBUILD_opencv_cvv="$(usex contribcvv)"
+ -DBUILD_opencv_dnn="$(usex contribdnn)"
+ -DBUILD_opencv_freetype="$(usex contribfreetype)"
+ -DBUILD_opencv_hdf="$(multilib_native_usex contribhdf)"
+ -DBUILD_opencv_ovis="$(usex contribovis)"
+ -DBUILD_opencv_sfm="$(usex contribsfm)"
+ -DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)"
+ )
+
+ if multilib_is_native_abi && use !tesseract; then
+ mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract="yes"
+ )
+ fi
+ fi
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ if multilib_is_native_abi && use cuda; then
+ cuda_add_sandbox -w
+ sandbox_write "/proc/self/task"
+ CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
+ CUDAARCHS="$(cuda_get_host_native_arch)"
+ export CUDAHOSTCXX
+ export CUDAARCHS
+ mycmakeargs+=(
+ -DENABLE_CUDA_FIRST_CLASS_LANGUAGE="yes"
+ )
+ fi
+
+ if use ffmpeg; then
+ mycmakeargs+=(
+ -DOPENCV_GAPI_GSTREAMER="no"
+ )
+ fi
+
+ # according to modules/java/jar/CMakeLists.txt:23-26
+ if use java; then
+ mycmakeargs+=(
+ -DOPENCV_JAVA_SOURCE_VERSION="$(java-pkg_get-source)"
+ -DOPENCV_JAVA_TARGET_VERSION="$(java-pkg_get-target)"
+ )
+ fi
+
+ if use mkl; then
+ mycmakeargs+=(
+ -DLAPACK_IMPL="MKL"
+ -DMKL_WITH_OPENMP="$(usex !tbb "$(usex openmp)")"
+ -DMKL_WITH_TBB="$(usex tbb)"
+ )
+ fi
+
+ # NOTE set this via MYCMAKEARGS if needed
+ if use opencl; then
+ if has_version sci-libs/clfft; then
+ mycmakeargs+=( -DWITH_OPENCLAMDFFT="yes" )
+ else
+ mycmakeargs+=( -DWITH_OPENCLAMDFFT="no" )
+ fi
+ if has_version sci-libs/clblas; then
+ mycmakeargs+=( -DWITH_OPENCLAMDBLAS="yes" )
+ else
+ mycmakeargs+=( -DWITH_OPENCLAMDBLAS="no" )
+ fi
+ else
+ mycmakeargs+=(
+ -DWITH_OPENCLAMDFFT="no"
+ -DWITH_OPENCLAMDBLAS="no"
+ )
+ fi
+
+ if use test; then
+ # opencv tests assume to be build in Release mode
+ CMAKE_BUILD_TYPE="Release"
+ mycmakeargs+=(
+ -DOPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+ )
+ if use vtk; then
+ mycmakeargs+=(
+ -DVTK_MPI_NUMPROCS="$(nproc)" # TODO
+ )
+ fi
+ fi
+
+ if multilib_is_native_abi && use python; then
+ python_configure() {
+ # Set all python variables to load the correct Gentoo paths
+ local mycmakeargs=(
+ "${mycmakeargs[@]}"
+ # python_setup alters PATH and sets this as wrapper
+ # to the correct interpreter we are building for
+ -DBUILD_opencv_python3="yes"
+ -DBUILD_opencv_python_bindings_generator="yes"
+ -DBUILD_opencv_python_tests="$(usex test)"
+ -DPYTHON_DEFAULT_EXECUTABLE="${EPYTHON}"
+ -DINSTALL_PYTHON_EXAMPLES="$(usex examples)"
+ )
+ cmake_src_configure
+ }
+
+ python_foreach_impl python_configure
+ else
+ mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="no"
+ -DINSTALL_PYTHON_EXAMPLES="no"
+ -DBUILD_opencv_python3="no"
+ -DBUILD_opencv_python_bindings_generator="no"
+ -DBUILD_opencv_python_tests="no"
+ )
+ cmake_src_configure
+ fi
+}
+
+multilib_src_compile() {
+ opencv_compile() {
+ cmake_src_compile
+ }
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl opencv_compile
+ else
+ opencv_compile
+ fi
+}
+
+multilib_src_test() {
+ CMAKE_SKIP_TESTS=(
+ 'Test_ONNX_layers.LSTM_cell_forward/0'
+ 'Test_ONNX_layers.LSTM_cell_bidirectional/0'
+ 'Test_TensorFlow_layers.Convolution3D/1'
+ 'Test_TensorFlow_layers.concat_3d/1'
+
+ 'AsyncAPICancelation/cancel*basic'
+ )
+
+ if ! use gtk && ! use qt5 && ! use qt6; then
+ CMAKE_SKIP_TESTS+=(
+ # these fail with parallism
+ '^Highgui_*'
+ )
+ fi
+
+ if multilib_is_native_abi && use cuda; then
+ CMAKE_SKIP_TESTS+=(
+ 'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
+ 'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
+ 'CUDA_OptFlow/NvidiaOpticalFlow_1_0.Regression/0'
+ 'CUDA_OptFlow/NvidiaOpticalFlow_2_0.Regression/0'
+ )
+ fi
+
+ if use opengl; then
+ CMAKE_SKIP_TESTS+=(
+ 'OpenGL/Buffer.MapDevice/*'
+ 'OpenGL/*Gpu*'
+ )
+ fi
+
+ if use opencl; then
+ CMAKE_SKIP_TESTS+=(
+ 'OCL_Arithm/InRange.Mat/\(CV_32S,*'
+ )
+ fi
+
+ local myctestargs=(
+ --test-timeout 180
+ )
+
+ if multilib_is_native_abi && use cuda; then
+ cuda_add_sandbox -w
+ export OPENCV_PARALLEL_BACKEND="threads"
+ export DNN_BACKEND_OPENCV="cuda"
+ fi
+
+ opencv_test() {
+ export OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib"
+ export OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib"
+ export OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib"
+
+ export OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+
+ # Work around zink warnings
+ export LIBGL_ALWAYS_SOFTWARE=true
+ results=()
+ for test in "${BUILD_DIR}/bin/opencv_test_"*; do
+ echo "${test}"
+ if ! "${test}" --gtest_color=yes --gtest_filter="-$(IFS=: ; echo "${CMAKE_SKIP_TESTS[*]}")"; then
+
+ results+=( "$(basename ${test})" )
+
+ if [[ -z "${OPENCV_TEST_CONTINUE_ON_FAIL}" ]]; then
+ eerror "${results[*]} failed"
+ die
+ fi
+ fi
+ done
+
+ echo -e "${results[*]}"
+ }
+
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl virtx opencv_test
+ else
+ virtx opencv_test
+ fi
+}
+
+multilib_src_install() {
+ if use abi_x86_64 && use abi_x86_32; then
+ MULTILIB_WRAPPED_HEADERS=( # {{{
+ # [opencv4]
+ /usr/include/opencv4/opencv2/cvconfig.h
+ /usr/include/opencv4/opencv2/opencv_modules.hpp
+
+ /usr/include/opencv4/opencv2/core_detect.hpp
+
+ /usr/include/opencv4/opencv2/cudaarithm.hpp
+ /usr/include/opencv4/opencv2/cudabgsegm.hpp
+ /usr/include/opencv4/opencv2/cudacodec.hpp
+ /usr/include/opencv4/opencv2/cudafeatures2d.hpp
+ /usr/include/opencv4/opencv2/cudafilters.hpp
+ /usr/include/opencv4/opencv2/cudaimgproc.hpp
+ /usr/include/opencv4/opencv2/cudalegacy.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+ /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+ /usr/include/opencv4/opencv2/cudaobjdetect.hpp
+ /usr/include/opencv4/opencv2/cudaoptflow.hpp
+ /usr/include/opencv4/opencv2/cudastereo.hpp
+ /usr/include/opencv4/opencv2/cudawarping.hpp
+ # [cudev]
+ /usr/include/opencv4/opencv2/cudev.hpp
+ /usr/include/opencv4/opencv2/cudev/block/block.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+ /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/block/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+ /usr/include/opencv4/opencv2/cudev/common.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/color.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+ /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+ /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+ /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+ /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/limits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+ /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+ /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+ /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+ /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+ /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+ # [contribcvv]
+ /usr/include/opencv4/opencv2/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+ /usr/include/opencv4/opencv2/cvv/cvv.hpp
+ /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+ /usr/include/opencv4/opencv2/cvv/dmatch.hpp
+ /usr/include/opencv4/opencv2/cvv/filter.hpp
+ /usr/include/opencv4/opencv2/cvv/final_show.hpp
+ /usr/include/opencv4/opencv2/cvv/show_image.hpp
+ # [contribdnn]
+ /usr/include/opencv4/opencv2/dnn.hpp
+ /usr/include/opencv4/opencv2/dnn/all_layers.hpp
+ /usr/include/opencv4/opencv2/dnn/dict.hpp
+ /usr/include/opencv4/opencv2/dnn/dnn.hpp
+ /usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
+ /usr/include/opencv4/opencv2/dnn/layer.details.hpp
+ /usr/include/opencv4/opencv2/dnn/layer.hpp
+ /usr/include/opencv4/opencv2/dnn/shape_utils.hpp
+ /usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
+ /usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+ /usr/include/opencv4/opencv2/dnn/version.hpp
+ /usr/include/opencv4/opencv2/dnn_superres.hpp
+ # [contribhdf]
+ /usr/include/opencv4/opencv2/hdf.hpp
+ /usr/include/opencv4/opencv2/hdf/hdf5.hpp
+
+ /usr/include/opencv4/opencv2/mcc.hpp
+ /usr/include/opencv4/opencv2/mcc/ccm.hpp
+ /usr/include/opencv4/opencv2/mcc/checker_detector.hpp
+ /usr/include/opencv4/opencv2/mcc/checker_model.hpp
+
+ /usr/include/opencv4/opencv2/text.hpp
+ /usr/include/opencv4/opencv2/text/erfilter.hpp
+ /usr/include/opencv4/opencv2/text/ocr.hpp
+ /usr/include/opencv4/opencv2/text/swt_text_detection.hpp
+ /usr/include/opencv4/opencv2/text/textDetector.hpp
+
+ # [qt5,qt6]
+ /usr/include/opencv4/opencv2/viz.hpp
+ /usr/include/opencv4/opencv2/viz/types.hpp
+ /usr/include/opencv4/opencv2/viz/viz3d.hpp
+ /usr/include/opencv4/opencv2/viz/vizcore.hpp
+ /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+ /usr/include/opencv4/opencv2/viz/widgets.hpp
+
+ /usr/include/opencv4/opencv2/wechat_qrcode.hpp
+ ) # }}}
+ fi
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl cmake_src_install
+ python_foreach_impl python_optimize
+ else
+ cmake_src_install
+ fi
+}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-10-02 11:35 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2024-10-02 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 3a82f42b90408da1f52ef8a0f57d3160ca56989b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 2 11:35:49 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 11:35:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a82f42b
media-libs/opencv: Stabilize 4.9.0-r2 amd64, #939513
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 3ddfccd217f2..0293fb4de11c 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -56,7 +56,7 @@ else
https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
)
"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-10-02 11:37 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2024-10-02 11:37 UTC (permalink / raw
To: gentoo-commits
commit: a348231aa4998e8c8a7297e5c1e9e2e2cf788087
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 2 11:34:16 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 11:37:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a348231a
media-libs/opencv: Stabilize 4.9.0-r2 x86, #939513
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 0293fb4de11c..3c4cc427c17e 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -56,7 +56,7 @@ else
https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
)
"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
fi
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-10-02 13:23 Arthur Zamarin
0 siblings, 0 replies; 208+ messages in thread
From: Arthur Zamarin @ 2024-10-02 13:23 UTC (permalink / raw
To: gentoo-commits
commit: a07d2280b33e08028697713c54cabd1d8e965bd5
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 2 13:23:01 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 13:23:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07d2280
media-libs/opencv: Stabilize 4.9.0-r2 arm64, #939513
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 3c4cc427c17e..906134107bdd 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -56,7 +56,7 @@ else
https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
)
"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
fi
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-10-07 2:52 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-10-07 2:52 UTC (permalink / raw
To: gentoo-commits
commit: f26104cc9a07b9a90057170f17eabd05334521b4
Author: Sasha Finkelstein <fnkl.kernel <AT> gmail <DOT> com>
AuthorDate: Sat Oct 5 13:59:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 02:50:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26104cc
media-libs/opencv: Add python3_13 compat
Signed-off-by: Sasha Finkelstein <fnkl.kernel <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 906134107bdd..eb231630bdf3 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-10-08 7:09 Florian Schmaus
0 siblings, 0 replies; 208+ messages in thread
From: Florian Schmaus @ 2024-10-08 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 4e16153d2c3de914bfd492c8c2361366a2da5e41
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 2 14:31:41 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Oct 8 07:09:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e16153d
media-libs/opencv: drop 4.8.1-r2, 4.9.0-r1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
media-libs/opencv/Manifest | 3 -
media-libs/opencv/opencv-4.8.1-r2.ebuild | 794 -----------------------
media-libs/opencv/opencv-4.9.0-r1.ebuild | 1022 ------------------------------
3 files changed, 1819 deletions(-)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 01fe1161a6bf..0aa44ea95dab 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,8 +1,5 @@
DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
-DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0 SHA512 d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44
DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
-DIST opencv-4.8.1.tar.gz 92006711 BLAKE2B 54728a37e3e8a528bd8d2e6df5963a996820a51160d05ac72b350234ce5372f99c037af96e13c55de1452e517fffb478c2335b9e1cbc07a36c78f99351eabd58 SHA512 b98d89b8e7b8ae8138bce00c5226816b761b53fbeb8f28ca516e08c5d130f216f9388a81785cd6684034530f768e097cbe12f19a9361f362b7d2048bfc427a65
-DIST opencv-4.8.1_contrib.tar.gz 59200293 BLAKE2B 8cf3ee60cb38a9fa2649013b9b4704022abe5cc65c331078dc7ea87028bc99df8b0de12f835905f5bb5c00a811f256754cac018ca8e02739ac5c6fe36aa4346d SHA512 e3df49e6a1411f55eebbc02f4534ddefabff961b4f63c69b21fe06ff3df894773a8643ab0cb123b83c2bdc8fa02698b332d3c243e8546c894e6c6c8ecaa65500
DIST opencv-4.9.0.tar.gz 92788647 BLAKE2B 257478b0f5e19abca5b3676767dacd40765c645eb455080160b8b9dc54e66fba4880200b483829fc9050bc3f9b3e815f8ee784d7b41261877784536778fe3c96 SHA512 1598ae59849e7805b3cbec5260bb501006f26edff452343b366b9262a0f48a6e09f4b2e760209cb677f2a64a7b22f4e70bc6195c104bcea74cc9fe04031d0292
DIST opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 BLAKE2B 9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169e2222f6 SHA512 8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BLAKE2B 923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8 SHA512 68cce870da0846cbd12a093ec7896b510e34590dad2b91699be1df5d4f72d343f9789d54c45c1b801784f7e57e0e80b19ba65dd99855225da99b4193dae97aaa
diff --git a/media-libs/opencv/opencv-4.8.1-r2.ebuild b/media-libs/opencv/opencv-4.8.1-r2.ebuild
deleted file mode 100644
index bb6a1ae807ab..000000000000
--- a/media-libs/opencv/opencv-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,794 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-ADE_PV="0.1.2a" # branch master
-QRCODE_COMMIT="a8b69ccc738421293254aec5ddb38bd523503252" # branch wechat_qrcode_20210119
-DNN_SAMPLES_FACE_DETECTOR_COMMIT="b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f" # branch dnn_samples_face_detector_20170830
-XFEATURES2D_BOOSTDESC_COMMIT="34e4206aef44d50e6bbcd0ab06354b52e7466d26" # branch contrib_xfeatures2d_boostdesc_20161012
-XFEATURES2D_VGG_COMMIT="fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" # branch contrib_xfeatures2d_vgg_20160317
-FACE_ALIGNMENT_COMMIT="8afa57abc8229d611c4937165d20e2a2d9fc5a12" # branch contrib_face_alignment_20170818
-NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca" # branch nvof_2_0_bsd
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- dnnsamples? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${QRCODE_COMMIT}.tar.gz -> ${PN}_3rdparty-${QRCODE_COMMIT}.tar.gz
- https://github.com/${PN}/${PN}_3rdparty/archive/${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
- )
- contribxfeatures2d? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
- https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_VGG_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}.tar.gz
- )
- contribdnn? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${FACE_ALIGNMENT_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}.tar.gz
- )
- cuda? (
- https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
- -> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
- )
- )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
- cpu_flags_ppc_vsx:VSX
- cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
- sse:SSE
- sse2:SSE2
- sse3:SSE3
- ssse3:SSSE3
- sse4_1:SSE4_1
- popcnt:POPCNT
- sse4_2:SSE4_2
- f16c:FP16
- fma3:FMA3
- avx:AVX
- avx2:AVX2
- avx512f:AVX_512F
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# 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.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? (
- contrib
- tesseract? ( opencl )
- )
- cudnn? ( cuda )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib || ( qt5 qt6 ) )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib )
- java? ( python )
- opengl? ( || ( qt5 qt6 ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 || ( qt5 qt6 ) )
- ?? ( cuda gdal )
- ?? ( cuda openexr )
- ?? ( cuda tbb )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# openmp? ( !tbb )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
- cudnn? ( dev-libs/cudnn:= )
- contribdnn? ( dev-libs/flatbuffers:= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( >=dev-games/ogre-1.12:= )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- lapack? (
- virtual/cblas
- >=virtual/lapack-3.10
- virtual/lapacke
- )
- opencl? (
- virtual/opencl[${MULTILIB_USEDEP}]
- dev-util/opencl-headers
- )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- 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 )
- )
- !qt5? (
- qt6? (
- dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
- )
- )
- tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk:=[rendering,cuda=] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
- java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.4.0-disable-download.patch"
- "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
- "${FILESDIR}/${PN}-4.1.2-opencl-license.patch"
- "${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch"
- "${FILESDIR}/${PN}-4.5.0-link-with-cblas-for-lapack.patch"
- "${FILESDIR}/${PN}-4.8.0-arm64-fp16.patch"
- "${FILESDIR}/${PN}-4.8.0-fix-cuda-12.2.0.patch"
-
- "${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch"
- "${FILESDIR}/${PN}-4.8.1-eliminate-lto-compiler-warnings.patch"
- "${FILESDIR}/${PN}-4.8.1-python3_12-support.patch"
-
- "${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch"
- "${FILESDIR}/${PN}-4.8.1-opencv_test.patch"
- "${FILESDIR}/${PN}-4.8.1-drop-python2-detection.patch"
- "${FILESDIR}/${PN}-4.8.1-libpng16.patch"
- "${FILESDIR}/${PN}-4.8.1-ade-0.1.2a.tar.gz.patch"
-
- "${FILESDIR}/${PN}-4.8.1-protobuf-22.patch" # bug 909087, in 4.9.0
-
- # TODO applied in src_prepare
- # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch"
- # "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
-)
-
-pkg_pretend() {
- if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then
- einfo "The target CUDA architecture can be set via one of:"
- einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto"
- einfo " - CUDA_ARCH_BIN, (and optionally CUDA_ARCH_PTX) in the form of x.y tuples."
- einfo " You can specify multiple tuple separated by \";\"."
- einfo ""
- einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
- fi
-
- if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
- local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
- einfo "$info_message so all available architectures are build."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- if use cuda; then
- export CUDA_VERBOSE="$(usex debug "true" "false")"
- cuda_src_prepare
- fi
-
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use contrib; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch"
- eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
- cd "${S}" || die
-
- ! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }
- # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; }
- ! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; }
- ! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; }
- ! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; }
- ! use contribsfm && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/sfm" || die; }
- ! use contribxfeatures2d && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/xfeatures2d" || die; }
- fi
-
- mkdir -p "${S}/.cache/ade" || die
- cp \
- "${DISTDIR}/ade-${ADE_PV}.tar.gz" \
- "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die
-
- if use dnnsamples; then
- mkdir -p "${S}/.cache/wechat_qrcode" || die
- for file in "detect.caffemodel" "detect.prototxt" "sr.prototxt" "sr.caffemodel"; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" \
- "${S}/.cache/wechat_qrcode/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" | cut -f 1 -d " " \
- )-${file}" || die
- done
-
- mv \
- "${WORKDIR}/${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}/res10_300x300_ssd_iter_140000.caffemodel" \
- "${S}/samples/dnn/" || die
- fi
-
- if use contribxfeatures2d; then
- cp \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i \
- "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- mkdir -p "${S}/.cache/xfeatures2d/boostdesc" || die
- for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" \
- "${S}/.cache/xfeatures2d/boostdesc/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
- )-$(basename "${file}")" || die
- done
-
- cp \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i \
- "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- mkdir -p "${S}/.cache/xfeatures2d/vgg" || die
- for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" \
- "${S}/.cache/xfeatures2d/vgg/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
- )-$(basename "${file}")" || die
- done
- fi
-
- if use contribdnn; then
- mkdir -p "${S}/.cache/data" || die
- for file in "face_landmark_model.dat"; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
- "${S}/.cache/data/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" | cut -f 1 -d " " \
- )-${file}" || die
- done
- fi
-
- if use cuda; then
- mkdir -p "${S}/.cache/nvidia_optical_flow"
- cp \
- "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \
- "${S}/.cache/nvidia_optical_flow/$( \
- md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \
- )-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die
- fi
-
- if use java; then
- 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"
- fi
-}
-
-multilib_src_configure() {
- # bug #919101 and https://github.com/opencv/opencv/issues/19020
- filter-lto
-
- # please dont sort here, order is the same as in CMakeLists.txt
- local mycmakeargs=(
- -DMIN_VER_CMAKE=3.26
-
- -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # FindCUDA
- -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # FindPythonInterp
-
- # for protobuf
- -DCMAKE_CXX_STANDARD=14
-
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=yes
- -DOPENCV_ENABLE_NONFREE=$(usex non-free)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -DWITH_FLATBUFFERS=$(multilib_native_usex contribdnn)
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- # Jasper was removed from tree because of security problems.
- # Upstream were/are making progress. We use openjpeg instead.
- # bug 734284
- -DWITH_JASPER=OFF
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OPENJPEG=$(usex jpeg2k)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(multilib_native_usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DOpenGL_GL_PREFERENCE="GLVND"
- -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_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex tbb)
- -DWITH_OPENMP=$(usex !tbb $(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 $(usex video_cards_intel))
- -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
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_CUDNN=$(multilib_native_usex cudnn)
- -DWITH_NVCUVID="no"
- -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
- -DBUILD_opencv_apps=$(usex opencvapps ON OFF)
- -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)
- -DOPENCV_ENABLE_MEMORY_SANITIZER=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=OFF
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/${PN}_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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- # bug 733796, but PCH is a risky game in CMake anyway
- -DENABLE_PRECOMPILED_HEADERS=OFF
- -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
- # ===================================================
- -DWITH_PROTOBUF=ON
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- -DProtobuf_MODULE_COMPATIBLE=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- if use qt5; then
- mycmakeargs+=(
- -DWITH_QT=$(multilib_native_usex qt5 ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
- )
- elif use qt6; then
- mycmakeargs+=(
- -DWITH_QT=$(multilib_native_usex qt6 ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
- )
- else
- mycmakeargs+=(
- -DWITH_QT=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
- )
- fi
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
-
- mycmakeargs+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE="${CPU_BASELINE}"
- -DCPU_DISPATCH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- mycmakeargs+=(
- -DBUILD_opencv_dnn=$(multilib_native_usex contribdnn ON OFF)
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
- -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
- -DBUILD_opencv_ovis=$(usex contribovis ON OFF)
- )
-
- if multilib_is_native_abi; then
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- if multilib_is_native_abi && use cuda; then
- cuda_add_sandbox -w
- sandbox_write "/proc/self/task"
-
- if [[ -n "${CUDA_GENERATION}" ]]; then
- mycmakeargs+=(
- -DCUDA_GENERATION="${CUDA_GENERATION}"
- )
- fi
-
- if [[ -n "${CUDA_ARCH_BIN}" ]]; then
- mycmakeargs+=(
- -DCUDA_ARCH_BIN="${CUDA_ARCH_BIN}"
- )
-
- if [[ -n "${CUDA_ARCH_PTX}" ]]; then
- mycmakeargs+=(
- -DCUDA_ARCH_PTX="${CUDA_ARCH_PTX}"
- )
- fi
- fi
-
- local NVCCFLAGS_OpenCV="${NVCCFLAGS// /\;}"
- mycmakeargs+=(
- -DOPENCV_CUDA_DETECTION_NVCC_FLAGS="-ccbin=$(cuda_gccdir)"
- -DCUDA_NVCC_FLAGS="-forward-unknown-opts;${NVCCFLAGS_OpenCV//\"/}"
- )
-
- use vtk && mycmakeargs+=(
- -DCMAKE_CUDA_FLAGS="-forward-unknown-opts ${NVCCFLAGS//\;/ }"
- )
- fi
-
- if multilib_is_native_abi && use python; then
- python_configure() {
- # Set all python variables to load the correct Gentoo paths
- local mycmakeargs=(
- "${mycmakeargs[@]}"
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE="${EPYTHON}"
- -DINSTALL_PYTHON_EXAMPLES="$(usex examples)"
- )
- cmake_src_configure
- use java && java-ant-2_src_configure
- }
-
- python_foreach_impl python_configure
- else
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=OFF
- )
- cmake_src_configure
- use java && java-ant-2_src_configure
- fi
-
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use python; then
- python_foreach_impl cmake_src_compile
- else
- cmake_src_compile
- fi
-}
-
-multilib_src_install() {
- if use abi_x86_64 && use abi_x86_32; then
- MULTILIB_WRAPPED_HEADERS=(
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
-
- /usr/include/opencv4/opencv2/core_detect.hpp
-
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contribcvv]
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contribdnn]
- /usr/include/opencv4/opencv2/dnn.hpp
- /usr/include/opencv4/opencv2/dnn/all_layers.hpp
- /usr/include/opencv4/opencv2/dnn/dict.hpp
- /usr/include/opencv4/opencv2/dnn/dnn.hpp
- /usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
- /usr/include/opencv4/opencv2/dnn/layer.details.hpp
- /usr/include/opencv4/opencv2/dnn/layer.hpp
- /usr/include/opencv4/opencv2/dnn/shape_utils.hpp
- /usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
- /usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
- /usr/include/opencv4/opencv2/dnn/version.hpp
- /usr/include/opencv4/opencv2/dnn_superres.hpp
- # [contribhdf]
- /usr/include/opencv4/opencv2/hdf.hpp
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
-
- /usr/include/opencv4/opencv2/mcc.hpp
- /usr/include/opencv4/opencv2/mcc/ccm.hpp
- /usr/include/opencv4/opencv2/mcc/checker_detector.hpp
- /usr/include/opencv4/opencv2/mcc/checker_model.hpp
-
- /usr/include/opencv4/opencv2/text.hpp
- /usr/include/opencv4/opencv2/text/erfilter.hpp
- /usr/include/opencv4/opencv2/text/ocr.hpp
- /usr/include/opencv4/opencv2/text/swt_text_detection.hpp
- /usr/include/opencv4/opencv2/text/textDetector.hpp
-
- # [qt5,qt6]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-
- /usr/include/opencv4/opencv2/wechat_qrcode.hpp
- )
- fi
- if multilib_is_native_abi && use python; then
- python_foreach_impl cmake_src_install
- python_foreach_impl python_optimize
- else
- cmake_src_install
- fi
-}
diff --git a/media-libs/opencv/opencv-4.9.0-r1.ebuild b/media-libs/opencv/opencv-4.9.0-r1.ebuild
deleted file mode 100644
index 227ff691acb6..000000000000
--- a/media-libs/opencv/opencv-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,1022 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
- # branch master
- ADE_PV="0.1.2d"
- # branch wechat_qrcode_20210119
- QRCODE_COMMIT="a8b69ccc738421293254aec5ddb38bd523503252"
- # branch dnn_samples_face_detector_20170830
- DNN_SAMPLES_FACE_DETECTOR_COMMIT="b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f"
- # branch contrib_xfeatures2d_boostdesc_20161012
- XFEATURES2D_BOOSTDESC_COMMIT="34e4206aef44d50e6bbcd0ab06354b52e7466d26"
- # branch contrib_xfeatures2d_vgg_20160317
- XFEATURES2D_VGG_COMMIT="fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
- # branch contrib_face_alignment_20170818
- FACE_ALIGNMENT_COMMIT="8afa57abc8229d611c4937165d20e2a2d9fc5a12"
- # branch nvof_2_0_bsd
- NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca"
-
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${PN}_contrib-${PV}.tar.gz
- dnnsamples? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${QRCODE_COMMIT}.tar.gz -> ${PN}_3rdparty-${QRCODE_COMMIT}.tar.gz
- https://github.com/${PN}/${PN}_3rdparty/archive/${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
- )
- contribxfeatures2d? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
- https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_VGG_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}.tar.gz
- )
- contribdnn? (
- https://github.com/${PN}/${PN}_3rdparty/archive/${FACE_ALIGNMENT_COMMIT}.tar.gz
- -> ${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}.tar.gz
- )
- cuda? (
- https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
- -> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
- )
- )
- test? (
- https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
- )
- "
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-
-# general options
-IUSE="debug doc +eigen gflags glog java non-free opencvapps +python test testprograms"
-
-# modules
-IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d dnnsamples examples +features2d"
-# hardware
-IUSE+=" opencl cuda cudnn video_cards_intel"
-# video
-IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
-# image
-IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
-# gui
-IUSE+=" gtk3 qt5 qt6 opengl vtk"
-# parallel
-IUSE+=" openmp tbb"
-# lapack options
-IUSE+=" atlas lapack mkl"
-
-# TODO make this only relevant for binhost
-CPU_FEATURES_MAP=(
- cpu_flags_arm_neon:NEON
- cpu_flags_arm_vfpv3:VFPV3
-
- cpu_flags_ppc_vsx:VSX # (always available on Power8)
- cpu_flags_ppc_vsx3:VSX3 # (always available on Power9)
-
- cpu_flags_x86_sse:SSE # (always available on 64-bit CPUs)
- cpu_flags_x86_sse2:SSE2 # (always available on 64-bit CPUs)
-
- cpu_flags_x86_sse3:SSE3
- cpu_flags_x86_ssse3:SSSE3
-
- cpu_flags_x86_sse4_1:SSE4_1
- cpu_flags_x86_popcnt:POPCNT
- cpu_flags_x86_sse4_2:SSE4_2
-
- cpu_flags_x86_f16c:FP16
- cpu_flags_x86_fma3:FMA3
- cpu_flags_x86_avx:AVX
- cpu_flags_x86_avx2:AVX2
- cpu_flags_x86_avx512f:AVX_512F
-)
-IUSE+=" ${CPU_FEATURES_MAP[*]%:*}"
-unset ARM_CPU_FEATURES PPC_CPU_FEATURES X86_CPU_FEATURES_RAW X86_CPU_FEATURES
-
-REQUIRED_USE="
- amd64? ( cpu_flags_x86_sse cpu_flags_x86_sse2 )
- cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
- cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
- cuda? (
- contrib
- tesseract? ( opencl )
- )
- cudnn? ( cuda )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib || ( qt5 qt6 ) )
- contribdnn? ( contrib )
- contribfreetype? ( contrib )
- contribhdf? ( contrib )
- contribovis? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib )
- java? ( python )
- opengl? ( ?? ( gtk3 || ( qt5 qt6 ) ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 || ( qt5 qt6 ) )
- test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
-"
-
-# TODO find a way to compile these with the cuda compiler
-REQUIRED_USE+="
- cuda? ( !gdal !openexr !tbb )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
- cudnn? ( dev-libs/cudnn:= )
- contribdnn? ( dev-libs/flatbuffers:= )
- contribhdf? ( sci-libs/hdf5:= )
- contribfreetype? (
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
- )
- contribovis? ( >=dev-games/ogre-1.12:= )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394:=[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- jpeg2k? (
- jasper? ( media-libs/jasper:= )
- !jasper? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- )
- lapack? (
- atlas? ( sci-libs/atlas )
- mkl? ( sci-libs/mkl )
- !atlas? (
- !mkl? (
- virtual/cblas
- >=virtual/lapack-3.10
- virtual/lapacke
- )
- )
- )
- opencl? (
- virtual/opencl[${MULTILIB_USEDEP}]
- dev-util/opencl-headers
- )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- 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 )
- )
- !qt5? (
- qt6? (
- dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
- )
- )
- quirc? ( media-libs/quirc )
- tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
- tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk:=[rendering,cuda=] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )
-"
-DEPEND="
- ${RDEPEND}
- eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
- java? ( >=virtual/jdk-1.8:* )
-"
-# TODO gstreamer dependencies
-DEPEND+="
- test? (
- gstreamer? (
- media-plugins/gst-plugins-jpeg[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-x264[${MULTILIB_USEDEP}]
- )
- )
-"
-BDEPEND="
- virtual/pkgconfig
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- doc? (
- app-text/doxygen[dot]
- python? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.4.0-disable-download.patch"
- "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
- "${FILESDIR}/${PN}-4.1.2-opencl-license.patch"
- "${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch"
- "${FILESDIR}/${PN}-4.5.0-link-with-cblas-for-lapack.patch"
-
- "${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch"
- "${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch"
- "${FILESDIR}/${PN}-4.9.0-drop-python2-detection.patch"
- "${FILESDIR}/${PN}-4.9.0-ade-0.1.2d.tar.gz.patch"
- "${FILESDIR}/${PN}-4.9.0-cmake-cleanup.patch"
-
- # TODO applied in src_prepare
- # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch"
- # "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
-)
-
-cuda_get_cuda_compiler() {
- local compiler
- tc-is-gcc && compiler="gcc"
- tc-is-clang && compiler="clang"
- [[ -z "$compiler" ]] && die "no compiler specified"
-
- local package="sys-devel/${compiler}"
- local version="${package}"
- local CUDAHOSTCXX_test
- while
- local CUDAHOSTCXX="${CUDAHOSTCXX_test}"
- version=$(best_version "${version}")
- if [[ -z "${version}" ]]; then
- if [[ -z "${CUDAHOSTCXX}" ]]; then
- die "could not find supported version of ${package}"
- fi
- break
- fi
- CUDAHOSTCXX_test="$(
- dirname "$(
- realpath "$(
- which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")"
- )"
- )"
- )"
- version="<${version}"
- do ! echo "int main(){}" | nvcc "-ccbin ${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done
-
- echo "${CUDAHOSTCXX}"
-}
-
-cuda_get_host_native_arch() {
- : "${CUDAARCHS:=$(__nvcc_device_query)}"
- echo "${CUDAARCHS}"
-}
-
-pkg_pretend() {
- if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then # TODO CUDAARCHS
- einfo "The target CUDA architecture can be set via one of:"
- einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto"
- einfo " - CUDA_ARCH_BIN, (and optionally CUDA_ARCH_PTX) in the form of x.y tuples."
- einfo " You can specify multiple tuple separated by \";\"."
- einfo ""
- einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
- fi
-
- if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
- local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
- einfo "$info_message so all available architectures are build."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled stuff
- rm -r 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use contrib; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
- eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
- if has_version ">=dev-util/nvidia-cuda-toolkit-12.4" && use cuda; then
- # TODO https://github.com/NVIDIA/cccl/pull/1522
- eapply "${FILESDIR}/${PN}_contrib-4.9.0-cuda-12.4.patch"
- fi
- cd "${S}" || die
-
- ! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }
- # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; }
- ! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; }
- ! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; }
- ! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; }
- ! use contribsfm && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/sfm" || die; }
- ! use contribxfeatures2d && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/xfeatures2d" || die; }
- fi
-
- mkdir -p "${S}/.cache/ade" || die
- cp \
- "${DISTDIR}/ade-${ADE_PV}.tar.gz" \
- "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die
-
- if use dnnsamples; then
- mkdir -p "${S}/.cache/wechat_qrcode" || die
- for file in "detect.caffemodel" "detect.prototxt" "sr.prototxt" "sr.caffemodel"; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" \
- "${S}/.cache/wechat_qrcode/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" | cut -f 1 -d " " \
- )-${file}" || die
- done
-
- mv \
- "${WORKDIR}/${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}/res10_300x300_ssd_iter_140000.caffemodel" \
- "${S}/samples/dnn/" || die
- fi
-
- if use contribxfeatures2d; then
- cp \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i \
- "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- mkdir -p "${S}/.cache/xfeatures2d/boostdesc" || die
- for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" \
- "${S}/.cache/xfeatures2d/boostdesc/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
- )-$(basename "${file}")" || die
- done
-
- cp \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i \
- "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- mkdir -p "${S}/.cache/xfeatures2d/vgg" || die
- for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i; do
- mv \
- "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" \
- "${S}/.cache/xfeatures2d/vgg/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
- )-$(basename "${file}")" || die
- done
- fi
-
- if use contribdnn; then
- mkdir -p "${S}/.cache/data" || die
- mkdir -p "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" || die
- file="face_landmark_model.dat"
- cp \
- "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
- "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" \
- || die
- mv \
- "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
- "${S}/.cache/data/$( \
- md5sum "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" | cut -f 1 -d " " \
- )-${file}" || die
- fi
-
- if use cuda; then
- mkdir -p "${S}/.cache/nvidia_optical_flow"
- cp \
- "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \
- "${S}/.cache/nvidia_optical_flow/$( \
- md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \
- )-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die
- fi
-
- if use java; then
- java-pkg-opt-2_src_prepare
-
- 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"
- fi
-}
-
-multilib_src_configure() {
- # bug #919101 and https://github.com/opencv/opencv/issues/19020
- filter-lto
-
- # please don't sort here, order is the same as in CMakeLists.txt
- local mycmakeargs=(
- -DMIN_VER_CMAKE=3.26
-
- -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # FindPythonInterp
-
- # for protobuf
- -DCMAKE_CXX_STANDARD=17
-
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=yes
- -DOPENCV_ENABLE_NONFREE="$(usex non-free)"
- -DWITH_QUIRC="$(usex quirc)"
- -DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)"
- -DWITH_1394="$(usex ieee1394)"
- # -DWITH_AVFOUNDATION="no" # IOS
- -DWITH_VTK="$(multilib_native_usex vtk)"
- -DWITH_EIGEN="$(usex eigen)"
- -DWITH_VFW="no" # Video windows support
- -DWITH_FFMPEG="$(usex ffmpeg)"
- -DWITH_GSTREAMER="$(usex gstreamer)"
- -DWITH_GTK="$(usex gtk3)"
- -DWITH_GTK_2_X="no" # only want gtk3 nowadays
- -DWITH_IPP="no"
- -DWITH_JASPER="$(multilib_native_usex jasper)"
- -DWITH_JPEG="$(usex jpeg)"
- -DWITH_OPENJPEG="$(usex jpeg2k)"
- -DWITH_WEBP="$(usex webp)"
- -DWITH_OPENEXR="$(multilib_native_usex openexr)"
- -DWITH_OPENGL="$(usex opengl)"
- -DOpenGL_GL_PREFERENCE="GLVND"
- -DWITH_OPENVX="no"
- -DWITH_OPENNI="no" # Not packaged
- -DWITH_OPENNI2="no" # Not packaged
- -DWITH_PNG="$(usex png)"
- -DWITH_GDCM="no"
- -DWITH_PVAPI="no"
- -DWITH_GIGEAPI="no"
- -DWITH_ARAVIS="no"
- -DWITH_WIN32UI="no" # Windows only
- # -DWITH_QUICKTIME="no"
- # -DWITH_QTKIT="no"
- -DWITH_TBB="$(usex tbb)"
- -DWITH_OPENMP="$(usex !tbb "$(usex openmp)")"
- -DWITH_PTHREADS_PF="yes"
- -DWITH_TIFF="$(usex tiff)"
- -DWITH_UNICAP="no" # Not packaged
- -DWITH_V4L="$(usex v4l)"
- -DWITH_LIBV4L="$(usex v4l)"
- # -DWITH_DSHOW="yes" # direct show supp
- -DWITH_MSMF="no"
- -DWITH_XIMEA="no" # Windows only
- -DWITH_XINE="$(multilib_native_usex xine)"
- -DWITH_CLP="no"
- -DWITH_OPENCL="$(usex opencl)"
- -DWITH_OPENCL_SVM="no" # "$(usex opencl)"
- -DWITH_DIRECTX="no"
- -DWITH_INTELPERC="no"
- -DWITH_IPP_A="no"
- -DWITH_MATLAB="no"
- -DWITH_VA="$(usex vaapi)"
- -DWITH_VA_INTEL="$(usex vaapi "$(usex video_cards_intel)")"
- -DWITH_GDAL="$(multilib_native_usex gdal)"
- -DWITH_GPHOTO2="$(usex gphoto2)"
- -DWITH_LAPACK="$(multilib_native_usex lapack)"
- -DWITH_ITT="no" # 3dparty libs itt_notify
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit
- # ===================================================
- -DWITH_CUDA="$(multilib_native_usex cuda)"
- -DWITH_CUBLAS="$(multilib_native_usex cuda)"
- -DWITH_CUFFT="$(multilib_native_usex cuda)"
- -DWITH_CUDNN="$(multilib_native_usex cudnn)"
- # NOTE set this via MYCMAKEARGS if needed
- -DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK
- -DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK
- -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${EPREFIX}/opt/cuda" "")"
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS="yes"
- -DBUILD_JAVA="$(multilib_native_usex java)" # Ant needed, no compile flag
- -DBUILD_ANDROID_EXAMPLES="no"
- -DBUILD_opencv_apps="$(usex opencvapps)"
- -DBUILD_DOCS="$(usex doc)" # Doesn't install anyways.
- -DBUILD_EXAMPLES="$(multilib_native_usex examples)"
- -DBUILD_TESTS="$(multilib_native_usex test)"
- -DBUILD_PERF_TESTS="no"
-
- # -DBUILD_WITH_STATIC_CRT="no"
- -DBUILD_WITH_DYNAMIC_IPP="no"
- -DBUILD_FAT_JAVA_LIB="no"
- # -DBUILD_ANDROID_SERVICE="no"
- -DBUILD_CUDA_STUBS="$(multilib_native_usex cuda)"
- -DOPENCV_EXTRA_MODULES_PATH="$(usex contrib "${WORKDIR}/${PN}_contrib-${PV}/modules" "")"
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB="no"
- -DINSTALL_BIN_EXAMPLES="$(multilib_native_usex examples)"
- -DINSTALL_C_EXAMPLES="$(multilib_native_usex examples)"
- -DINSTALL_TESTS="$(multilib_native_usex testprograms)"
- # -DINSTALL_ANDROID_EXAMPLES="no"
- -DINSTALL_TO_MANGLED_PATHS="no"
- -DOPENCV_GENERATE_PKGCONFIG="yes"
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- # -DENABLE_CCACHE="no"
- # bug 733796, but PCH is a risky game in CMake anyway
- -DBUILD_USE_SYMLINKS="yes"
- -DENABLE_PRECOMPILED_HEADERS="no"
- -DENABLE_SOLUTION_FOLDERS="no"
- -DENABLE_PROFILING="no"
- -DENABLE_COVERAGE="no"
- -DOPENCV_DOWNLOAD_TRIES_LIST="0"
-
- -DHAVE_opencv_java="$(multilib_native_usex java)"
-
- -DBUILD_WITH_DEBUG_INFO="$(usex debug)"
- -DOPENCV_ENABLE_MEMORY_SANITIZER="$(usex debug)"
- -DCV_TRACE="$(usex debug)"
- -DENABLE_NOISY_WARNINGS="$(usex debug)"
- -DOPENCV_WARNINGS_ARE_ERRORS="no"
- -DENABLE_IMPL_COLLECTION="no"
- -DENABLE_INSTRUMENTATION="no"
- -DGENERATE_ABI_DESCRIPTOR="no"
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE="no"
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DWITH_PROTOBUF="yes"
- -DBUILD_PROTOBUF="no"
- -DPROTOBUF_UPDATE_FILES="yes"
- -DProtobuf_MODULE_COMPATIBLE="yes"
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}"
- # NOTE do this so testprograms do not fail TODO adjust path in code
- -DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata"
- -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
- -DOPENCV_SAMPLES_BIN_INSTALL_PATH="libexec/${PN}/bin/samples"
-
- -DBUILD_IPP_IW="no"
- -DBUILD_ITT="no"
-
- # ===================================================
- # configure modules to be build
- # ===================================================
- -DBUILD_opencv_gapi="$(usex ffmpeg yes "$(usex gstreamer)")"
- -DBUILD_opencv_features2d="$(usex features2d)"
- -DBUILD_opencv_java_bindings_generator="$(usex java)"
- -DBUILD_opencv_js="no"
- -DBUILD_opencv_js_bindings_generator="no"
- -DBUILD_opencv_objc_bindings_generator="no"
- -DBUILD_opencv_python2="no"
- -DBUILD_opencv_ts="$(usex test)"
- -DBUILD_opencv_video="$(usex ffmpeg yes "$(usex gstreamer)")"
- -DBUILD_opencv_videoio="$(usex ffmpeg yes "$(usex gstreamer)")"
-
- -DBUILD_opencv_cudalegacy="no"
-
- # -DBUILD_opencv_world="yes"
-
- -DDNN_PLUGIN_LIST="all"
- -DHIGHGUI_PLUGIN_LIST="all"
- -DVIDEOIO_PLUGIN_LIST="all"
-
- )
-
- if use qt5; then
- mycmakeargs+=(
- -DWITH_QT="$(multilib_native_usex qt5)"
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
- )
- elif use qt6; then
- mycmakeargs+=(
- -DWITH_QT="$(multilib_native_usex qt6)"
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
- )
- else
- mycmakeargs+=(
- -DWITH_QT="no"
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
- )
- fi
-
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- # TODO binhost https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
-
- local CPU_BASELINE=""
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
- use "${i%:*}" && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
- fi
- done
- unset CPU_FEATURES_MAP
-
- mycmakeargs+=(
- -DCPU_BASELINE="${CPU_BASELINE}"
- )
- if [[ ${MERGE_TYPE} != "buildonly" ]]; then
- mycmakeargs+=(
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE="yes"
- -DCPU_DISPATCH=
- )
- fi
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- mycmakeargs+=(
- -DBUILD_opencv_cvv="$(usex contribcvv)"
- -DBUILD_opencv_dnn="$(usex contribdnn)"
- -DBUILD_opencv_freetype="$(usex contribfreetype)"
- -DBUILD_opencv_hdf="$(multilib_native_usex contribhdf)"
- -DBUILD_opencv_ovis="$(usex contribovis)"
- -DBUILD_opencv_sfm="$(usex contribsfm)"
- -DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)"
- )
-
- if multilib_is_native_abi && use !tesseract; then
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract="yes"
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- if multilib_is_native_abi && use cuda; then
- cuda_add_sandbox -w
- sandbox_write "/proc/self/task"
- CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
- CUDAARCHS="$(cuda_get_host_native_arch)"
- export CUDAHOSTCXX
- export CUDAARCHS
- mycmakeargs+=(
- -DENABLE_CUDA_FIRST_CLASS_LANGUAGE="yes"
- )
- fi
-
- if use ffmpeg; then
- mycmakeargs+=(
- -DOPENCV_GAPI_GSTREAMER="no"
- )
- fi
-
- if use mkl; then
- mycmakeargs+=(
- -DLAPACK_IMPL="MKL"
- -DMKL_WITH_OPENMP="$(usex !tbb "$(usex openmp)")"
- -DMKL_WITH_TBB="$(usex tbb)"
- )
- fi
-
- # NOTE set this via MYCMAKEARGS if needed
- if use opencl; then
- if has_version sci-libs/clfft; then
- mycmakeargs+=( -DWITH_OPENCLAMDFFT="yes" )
- else
- mycmakeargs+=( -DWITH_OPENCLAMDFFT="no" )
- fi
- if has_version sci-libs/clblas; then
- mycmakeargs+=( -DWITH_OPENCLAMDBLAS="yes" )
- else
- mycmakeargs+=( -DWITH_OPENCLAMDBLAS="no" )
- fi
- else
- mycmakeargs+=(
- -DWITH_OPENCLAMDFFT="no"
- -DWITH_OPENCLAMDBLAS="no"
- )
- fi
-
- if use test; then
- # opencv tests assume to be build in Release mode
- CMAKE_BUILD_TYPE="Release"
- mycmakeargs+=(
- -DOPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
- )
- if use vtk; then
- mycmakeargs+=(
- -DVTK_MPI_NUMPROCS="$(nproc)" # TODO
- )
- fi
- fi
-
- if multilib_is_native_abi && use python; then
- python_configure() {
- # Set all python variables to load the correct Gentoo paths
- local mycmakeargs=(
- "${mycmakeargs[@]}"
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DBUILD_opencv_python3="yes"
- -DBUILD_opencv_python_bindings_generator="yes"
- -DBUILD_opencv_python_tests="$(usex test)"
- -DPYTHON_DEFAULT_EXECUTABLE="${EPYTHON}"
- -DINSTALL_PYTHON_EXAMPLES="$(usex examples)"
- )
- cmake_src_configure
- }
-
- python_foreach_impl python_configure
- else
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE="no"
- -DINSTALL_PYTHON_EXAMPLES="no"
- -DBUILD_opencv_python3="no"
- -DBUILD_opencv_python_bindings_generator="no"
- -DBUILD_opencv_python_tests="no"
- )
- cmake_src_configure
- fi
- use java && java-ant-2_src_configure
-}
-
-multilib_src_compile() {
- opencv_compile() {
- cmake_src_compile
- }
- if multilib_is_native_abi && use python; then
- python_foreach_impl opencv_compile
- else
- opencv_compile
- fi
-}
-
-multilib_src_test() {
- CMAKE_SKIP_TESTS=(
- 'Test_ONNX_layers.LSTM_cell_forward/0'
- 'Test_ONNX_layers.LSTM_cell_bidirectional/0'
- 'Test_TensorFlow_layers.Convolution3D/1'
- 'Test_TensorFlow_layers.concat_3d/1'
-
- 'AsyncAPICancelation/cancel*basic'
- )
-
- if ! use gtk && ! use qt5 && ! use qt6; then
- CMAKE_SKIP_TESTS+=(
- # these fail with parallism
- '^Highgui_*'
- )
- fi
-
- if multilib_is_native_abi && use cuda; then
- CMAKE_SKIP_TESTS+=(
- 'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
- 'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
- 'CUDA_OptFlow/NvidiaOpticalFlow_1_0.Regression/0'
- 'CUDA_OptFlow/NvidiaOpticalFlow_2_0.Regression/0'
- )
- fi
-
- if use opengl; then
- CMAKE_SKIP_TESTS+=(
- 'OpenGL/Buffer.MapDevice/*'
- 'OpenGL/*Gpu*'
- )
- fi
-
- if use opencl; then
- CMAKE_SKIP_TESTS+=(
- 'OCL_Arithm/InRange.Mat/\(CV_32S,*'
- )
- fi
-
- local myctestargs=(
- --test-timeout 180
- )
-
- if multilib_is_native_abi && use cuda; then
- cuda_add_sandbox -w
- export OPENCV_PARALLEL_BACKEND="threads"
- export DNN_BACKEND_OPENCV="cuda"
- fi
-
- opencv_test() {
- export OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib"
- export OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib"
- export OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib"
-
- export OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
-
- # Work around zink warnings
- export LIBGL_ALWAYS_SOFTWARE=true
- results=()
- for test in "${BUILD_DIR}/bin/opencv_test_"*; do
- echo "${test}"
- if ! "${test}" --gtest_color=yes --gtest_filter="-$(IFS=: ; echo "${CMAKE_SKIP_TESTS[*]}")"; then
-
- results+=( "$(basename ${test})" )
-
- if [[ -z "${OPENCV_TEST_CONTINUE_ON_FAIL}" ]]; then
- eerror "${results[*]} failed"
- die
- fi
- fi
- done
-
- echo -e "${results[*]}"
- }
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl virtx opencv_test
- else
- virtx opencv_test
- fi
-}
-
-multilib_src_install() {
- if use abi_x86_64 && use abi_x86_32; then
- MULTILIB_WRAPPED_HEADERS=( # {{{
- # [opencv4]
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/opencv_modules.hpp
-
- /usr/include/opencv4/opencv2/core_detect.hpp
-
- /usr/include/opencv4/opencv2/cudaarithm.hpp
- /usr/include/opencv4/opencv2/cudabgsegm.hpp
- /usr/include/opencv4/opencv2/cudacodec.hpp
- /usr/include/opencv4/opencv2/cudafeatures2d.hpp
- /usr/include/opencv4/opencv2/cudafilters.hpp
- /usr/include/opencv4/opencv2/cudaimgproc.hpp
- /usr/include/opencv4/opencv2/cudalegacy.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv4/opencv2/cudaobjdetect.hpp
- /usr/include/opencv4/opencv2/cudaoptflow.hpp
- /usr/include/opencv4/opencv2/cudastereo.hpp
- /usr/include/opencv4/opencv2/cudawarping.hpp
- # [cudev]
- /usr/include/opencv4/opencv2/cudev.hpp
- /usr/include/opencv4/opencv2/cudev/block/block.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv4/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/block/scan.hpp
- /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv4/opencv2/cudev/common.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/color.hpp
- /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv4/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv4/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv4/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv4/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv4/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/limits.hpp
- /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv4/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv4/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv4/opencv2/cudev/warp/warp.hpp
- # [contribcvv]
- /usr/include/opencv4/opencv2/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv4/opencv2/cvv/cvv.hpp
- /usr/include/opencv4/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv4/opencv2/cvv/dmatch.hpp
- /usr/include/opencv4/opencv2/cvv/filter.hpp
- /usr/include/opencv4/opencv2/cvv/final_show.hpp
- /usr/include/opencv4/opencv2/cvv/show_image.hpp
- # [contribdnn]
- /usr/include/opencv4/opencv2/dnn.hpp
- /usr/include/opencv4/opencv2/dnn/all_layers.hpp
- /usr/include/opencv4/opencv2/dnn/dict.hpp
- /usr/include/opencv4/opencv2/dnn/dnn.hpp
- /usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
- /usr/include/opencv4/opencv2/dnn/layer.details.hpp
- /usr/include/opencv4/opencv2/dnn/layer.hpp
- /usr/include/opencv4/opencv2/dnn/shape_utils.hpp
- /usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
- /usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
- /usr/include/opencv4/opencv2/dnn/version.hpp
- /usr/include/opencv4/opencv2/dnn_superres.hpp
- # [contribhdf]
- /usr/include/opencv4/opencv2/hdf.hpp
- /usr/include/opencv4/opencv2/hdf/hdf5.hpp
-
- /usr/include/opencv4/opencv2/mcc.hpp
- /usr/include/opencv4/opencv2/mcc/ccm.hpp
- /usr/include/opencv4/opencv2/mcc/checker_detector.hpp
- /usr/include/opencv4/opencv2/mcc/checker_model.hpp
-
- /usr/include/opencv4/opencv2/text.hpp
- /usr/include/opencv4/opencv2/text/erfilter.hpp
- /usr/include/opencv4/opencv2/text/ocr.hpp
- /usr/include/opencv4/opencv2/text/swt_text_detection.hpp
- /usr/include/opencv4/opencv2/text/textDetector.hpp
-
- # [qt5,qt6]
- /usr/include/opencv4/opencv2/viz.hpp
- /usr/include/opencv4/opencv2/viz/types.hpp
- /usr/include/opencv4/opencv2/viz/viz3d.hpp
- /usr/include/opencv4/opencv2/viz/vizcore.hpp
- /usr/include/opencv4/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv4/opencv2/viz/widgets.hpp
-
- /usr/include/opencv4/opencv2/wechat_qrcode.hpp
- ) # }}}
- fi
- if multilib_is_native_abi && use python; then
- python_foreach_impl cmake_src_install
- python_foreach_impl python_optimize
- else
- cmake_src_install
- fi
-}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: a3c86c1428052831632d404877d328db8427efaf
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 17:12:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c86c14
media-libs/opencv: cuda device detection
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 181b70f84784..0f90b6e92d2b 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -371,8 +371,9 @@ cuda_get_host_compiler() {
}
cuda_get_host_native_arch() {
- : "${CUDAARCHS:=$(__nvcc_device_query)}"
- echo "${CUDAARCHS}"
+ [[ -n ${CUDAARCHS} ]] && echo "${CUDAARCHS}"
+
+ __nvcc_device_query || die "failed to query the native device"
}
pkg_pretend() {
@@ -385,6 +386,7 @@ pkg_pretend() {
einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
fi
+ # When building binpkgs you probably want to include all targets
if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
einfo "$info_message so all available architectures are build."
@@ -396,6 +398,13 @@ pkg_pretend() {
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use java && java-pkg-opt-2_pkg_setup
+
+ if use cuda && [[ ! -e /dev/nvidia-uvm ]]; then
+ # NOTE We try to load nvidia-uvm and nvidia-modeset here,
+ # so __nvcc_device_query does not fail later.
+
+ nvidia-modprobe -m -u -c 0 || true
+ fi
}
src_prepare() {
@@ -774,10 +783,22 @@ multilib_src_configure() {
cuda_add_sandbox -w
addwrite "/proc/self/task"
+ if ! test -w /dev/nvidiactl; then
+ # eqawarn "Can't access the GPU at /dev/nvidiactl."
+ # eqawarn "User $(id -nu) is not in the group \"video\"."
+ if [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then
+ # build all targets
+ mycmakeargs+=(
+ -DCUDA_GENERATION=""
+ )
+ fi
+ else
+ local -x CUDAARCHS
+ : "${CUDAARCHS:="$(cuda_get_host_native_arch)"}"
+ fi
+
local -x CUDAHOSTCXX CUDAHOSTLD
CUDAHOSTCXX="$(cuda_get_host_compiler)"
- CUDAARCHS="$(cuda_get_host_native_arch)"
- export CUDAARCHS
CUDAHOSTLD="$(tc-getCXX)"
if tc-is-gcc; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: dd85527d38dd07dc7e4a9ec3de95edee916777c6
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Nov 2 12:51:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd85527d
media-libs/opencv: fix doc install path #932338
Closes: https://bugs.gentoo.org/932338
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 070727815ba8..fb15696ce141 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -672,7 +672,7 @@ multilib_src_configure() {
# ===================================================
# things we want to be hard enabled not worth useflag
# ===================================================
- -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}"
+ -DOPENCV_DOC_INSTALL_PATH="share/doc/${PF}"
# NOTE do this so testprograms do not fail TODO adjust path in code
-DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata"
-DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: ece155227e62d231904646e58493d80b9acfb1e4
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 17:27:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece15522
media-libs/opencv: allow CUDA_PATH override
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 0f90b6e92d2b..dc2b31fa8321 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -595,7 +595,7 @@ multilib_src_configure() {
# NOTE set this via MYCMAKEARGS if needed
-DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK
-DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK
- -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${EPREFIX}/opt/cuda" "")"
+ -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${CUDA_PATH:=${EPREFIX}/opt/cuda}" "")"
# ===================================================
# OpenCV build components
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: e860505c0f26cdc62e436ea1c35120889cab5c94
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Oct 15 12:02:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e860505c
media-libs/opencv: remove obsolete ENABLE_DOWNLOAD patch
We prefetch the files so we actually need to use the download logic.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index f25d07f2e464..29f10a8eb53a 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -286,7 +286,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-3.4.0-disable-download.patch"
"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
"${FILESDIR}/${PN}-4.1.2-opencl-license.patch"
"${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch"
@@ -529,7 +528,6 @@ multilib_src_configure() {
# Optional 3rd party components
# ===================================================
- -DENABLE_DOWNLOAD=yes
-DOPENCV_ENABLE_NONFREE="$(usex non-free)"
-DWITH_QUIRC="$(usex quirc)"
-DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: dda5b8e6883d0c1784cce1d18f9d5a14d3a15479
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:14:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda5b8e6
media-libs/opencv: clean up java
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 29f10a8eb53a..07eb7a2f61dd 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -208,7 +208,6 @@ COMMON_DEPEND="
media-libs/libdc1394:=[${MULTILIB_USEDEP}]
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
- java? ( >=virtual/jre-1.8:* )
jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
jpeg2k? (
jasper? ( media-libs/jasper:= )
@@ -273,6 +272,8 @@ RDEPEND="
${COMMON_DEPEND}
java? ( >=virtual/jre-1.8:* )
"
+unset COMMON_DEPEND
+
BDEPEND="
virtual/pkgconfig
cuda? ( dev-util/nvidia-cuda-toolkit:= )
@@ -507,9 +508,9 @@ src_prepare() {
java-pkg-opt-2_src_prepare
# set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- export ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)"
- export ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)"
+ ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+ ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)"
+ ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)"
fi
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: f03bd6e74ab2f999a3e6647943347fb672f57c1a
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Oct 15 11:56:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03bd6e7
media-libs/opencv: default to qt6, drop qt5
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index fb15696ce141..f25d07f2e464 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -76,7 +76,7 @@ IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
# image
IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
# gui
-IUSE+=" gtk3 qt5 qt6 opengl vtk"
+IUSE+=" gtk3 qt6 opengl vtk"
# parallel
IUSE+=" openmp tbb"
# lapack options
@@ -158,7 +158,7 @@ REQUIRED_USE="
dnnsamples? ( examples )
gflags? ( contrib )
glog? ( contrib )
- contribcvv? ( contrib || ( qt5 qt6 ) )
+ contribcvv? ( contrib qt6 )
contribdnn? ( contrib )
contribfreetype? ( contrib )
contribhdf? ( contrib )
@@ -166,10 +166,10 @@ REQUIRED_USE="
contribsfm? ( contrib eigen gflags glog )
contribxfeatures2d? ( contrib )
java? ( python )
- opengl? ( ?? ( gtk3 || ( qt5 qt6 ) ) )
+ opengl? ( ?? ( gtk3 qt6 ) )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
- ?? ( gtk3 || ( qt5 qt6 ) )
+ ?? ( gtk3 qt6 )
test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
"
@@ -242,17 +242,8 @@ COMMON_DEPEND="
${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 )
- )
- !qt5? (
- qt6? (
- dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
- )
+ qt6? (
+ dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
)
quirc? ( media-libs/quirc )
tesseract? ( app-text/tesseract[${MULTILIB_USEDEP}] )
@@ -705,12 +696,7 @@ multilib_src_configure() {
)
- if use qt5; then
- mycmakeargs+=(
- -DWITH_QT="$(multilib_native_usex qt5)"
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
- )
- elif use qt6; then
+ if use qt6; then
mycmakeargs+=(
-DWITH_QT="$(multilib_native_usex qt6)"
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
@@ -928,7 +914,7 @@ multilib_src_test() {
'AsyncAPICancelation/cancel*basic'
)
- if ! use gtk3 && ! use qt5 && ! use qt6; then
+ if ! use gtk3 && ! use qt6; then
CMAKE_SKIP_TESTS+=(
# these fail with parallism
'^Highgui_*'
@@ -1139,7 +1125,7 @@ multilib_src_install() {
/usr/include/opencv4/opencv2/text/swt_text_detection.hpp
/usr/include/opencv4/opencv2/text/textDetector.hpp
- # [qt5,qt6]
+ # [qt6]
/usr/include/opencv4/opencv2/viz.hpp
/usr/include/opencv4/opencv2/viz/types.hpp
/usr/include/opencv4/opencv2/viz/viz3d.hpp
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 96c77b22de30705b298965ee6d5b7be0837a60ac
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:16:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c77b22
media-libs/opencv: use makeopts_jobs
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 07eb7a2f61dd..4e3c32df4947 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx
+inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic multiprocessing python-r1 toolchain-funcs virtualx
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -858,7 +858,7 @@ multilib_src_configure() {
)
if use vtk; then
mycmakeargs+=(
- -DVTK_MPI_NUMPROCS="$(nproc)" # TODO
+ -DVTK_MPI_NUMPROCS="$(makeopts_jobs)" # TODO
)
fi
fi
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: d74914ed1f33f9ea681337fcf80e828a5c46f374
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:29:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74914ed
media-libs/opencv: make openmp tbb non-exclusive
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 6948cca7dacf..43b9b4b762a8 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -573,7 +573,7 @@ multilib_src_configure() {
# -DWITH_QUICKTIME="no"
# -DWITH_QTKIT="no"
-DWITH_TBB="$(usex tbb)"
- -DWITH_OPENMP="$(usex !tbb "$(usex openmp)")"
+ -DWITH_OPENMP="$(usex openmp)"
-DWITH_PTHREADS_PF="yes"
-DWITH_TIFF="$(usex tiff)"
-DWITH_UNICAP="no" # Not packaged
@@ -838,7 +838,7 @@ multilib_src_configure() {
if use mkl; then
mycmakeargs+=(
-DLAPACK_IMPL="MKL"
- -DMKL_WITH_OPENMP="$(usex !tbb "$(usex openmp)")"
+ -DMKL_WITH_OPENMP="$(usex openmp)"
-DMKL_WITH_TBB="$(usex tbb)"
)
fi
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 6dd281f3ad2f7fc6f9f6e31d7f1606036121b502
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:30:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd281f3
media-libs/opencv: refactor testprograms configuration
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 43b9b4b762a8..780257a82d35 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -170,6 +170,7 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt6 )
+ testprograms? ( test )
test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
"
@@ -524,6 +525,12 @@ src_prepare() {
ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)"
ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)"
fi
+
+ if multilib_native_use testprograms; then
+ sed \
+ -e 's:share/OpenCV/testdata:@OPENCV_TEST_DATA_INSTALL_PATH@:g' \
+ -i "${S}/cmake/templates/opencv_run_all_tests_unix.sh.in" || die
+ fi
}
multilib_src_configure() {
@@ -616,7 +623,7 @@ multilib_src_configure() {
-DBUILD_opencv_apps="$(usex opencvapps)"
-DBUILD_DOCS="$(usex doc)" # Doesn't install anyways.
-DBUILD_EXAMPLES="$(multilib_native_usex examples)"
- -DBUILD_TESTS="$(multilib_native_usex test)"
+ -DBUILD_TESTS="$(multilib_native_usex test "yes" "$(multilib_native_usex testprograms)")"
-DBUILD_PERF_TESTS="no"
# -DBUILD_WITH_STATIC_CRT="no"
@@ -675,9 +682,6 @@ multilib_src_configure() {
# things we want to be hard enabled not worth useflag
# ===================================================
-DOPENCV_DOC_INSTALL_PATH="share/doc/${PF}"
- # NOTE do this so testprograms do not fail TODO adjust path in code
- -DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata"
- -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
-DOPENCV_SAMPLES_BIN_INSTALL_PATH="libexec/${PN}/bin/samples"
-DBUILD_IPP_IW="no"
@@ -875,6 +879,13 @@ multilib_src_configure() {
fi
fi
+ if multilib_native_use testprograms; then
+ # NOTE do this so testprograms do not fail
+ mycmakeargs+=(
+ -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
+ )
+ fi
+
if multilib_is_native_abi && use python; then
python_configure() {
# Set all python variables to load the correct Gentoo paths
@@ -916,6 +927,9 @@ multilib_src_compile() {
}
multilib_src_test() {
+ # NOTE we don't run the tests
+ use testprograms && return
+
CMAKE_SKIP_TESTS=(
'Test_ONNX_layers.LSTM_cell_forward/0'
'Test_ONNX_layers.LSTM_cell_bidirectional/0'
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: a5fd91d2eb5f35aa32b15cbcf5619802cde4639e
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:29:55 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fd91d2
media-libs/opencv: ebuild clean up
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 780257a82d35..b2aad4b16b18 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic multiprocessing python-r1 toolchain-funcs virtualx
+inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic multilib multiprocessing python-r1 toolchain-funcs virtualx
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
@@ -28,7 +28,8 @@ else
# branch nvof_2_0_bsd
NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca"
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ SRC_URI="
+ https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz
contrib? (
https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${PN}_contrib-${PV}.tar.gz
@@ -70,7 +71,7 @@ IUSE="debug doc +eigen gflags glog java non-free opencvapps +python test testpro
# modules
IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d dnnsamples examples +features2d"
# hardware
-IUSE+=" opencl cuda cudnn video_cards_intel"
+IUSE+=" cuda cudnn opencl video_cards_intel"
# video
IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
# image
@@ -171,7 +172,7 @@ REQUIRED_USE="
tesseract? ( contrib )
?? ( gtk3 qt6 )
testprograms? ( test )
- test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
+ test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
"
RESTRICT="!test? ( test )"
@@ -307,6 +308,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch"
"${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch"
+
"${FILESDIR}/${PN}-4.9.0-drop-python2-detection.patch"
"${FILESDIR}/${PN}-4.9.0-ade-0.1.2d.tar.gz.patch"
"${FILESDIR}/${PN}-4.9.0-cmake-cleanup.patch"
@@ -318,7 +320,8 @@ PATCHES=(
"${FILESDIR}/${PN}-4.10.0-tbb-detection.patch"
# TODO applied in src_prepare
- # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch"
+ # "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
+
# "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
# "${FILESDIR}/${PN}_contrib-4.10.0-CUDA-12.6-tuple_size.patch" # 3785
@@ -389,6 +392,8 @@ cuda_get_host_native_arch() {
}
pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then # TODO CUDAARCHS
einfo "The target CUDA architecture can be set via one of:"
einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto"
@@ -403,12 +408,11 @@ pkg_pretend() {
local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
einfo "$info_message so all available architectures are build."
fi
-
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
use java && java-pkg-opt-2_pkg_setup
if use cuda && [[ ! -e /dev/nvidia-uvm ]]; then
@@ -916,13 +920,10 @@ multilib_src_configure() {
}
multilib_src_compile() {
- opencv_compile() {
- cmake_src_compile
- }
if multilib_is_native_abi && use python; then
- python_foreach_impl opencv_compile
+ python_foreach_impl cmake_src_compile
else
- opencv_compile
+ cmake_src_compile
fi
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: c3b9b68da652c7b6f79b3a692067454e6454336d
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Oct 31 16:03:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b9b68d
media-libs/opencv: use multilib_native_use
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index b2aad4b16b18..e0fb1354215a 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -783,7 +783,7 @@ multilib_src_configure() {
-DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)"
)
- if multilib_is_native_abi && use !tesseract; then
+ if ! multilib_native_use tesseract; then
mycmakeargs+=(
-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract="yes"
)
@@ -793,7 +793,7 @@ multilib_src_configure() {
# workaround for bug 413429
tc-export CC CXX
- if multilib_is_native_abi && use cuda; then
+ if multilib_native_use cuda; then
cuda_add_sandbox -w
addwrite "/proc/self/task"
@@ -870,6 +870,8 @@ multilib_src_configure() {
)
fi
+ # NOTE due to multilib we can't do
+ # if multilib_native_use test; then
if use test; then
# opencv tests assume to be build in Release mode
CMAKE_BUILD_TYPE="Release"
@@ -890,7 +892,7 @@ multilib_src_configure() {
)
fi
- if multilib_is_native_abi && use python; then
+ if multilib_native_use python; then
python_configure() {
# Set all python variables to load the correct Gentoo paths
local mycmakeargs=(
@@ -920,7 +922,7 @@ multilib_src_configure() {
}
multilib_src_compile() {
- if multilib_is_native_abi && use python; then
+ if multilib_native_use python; then
python_foreach_impl cmake_src_compile
else
cmake_src_compile
@@ -947,7 +949,7 @@ multilib_src_test() {
)
fi
- if multilib_is_native_abi && use cuda; then
+ if multilib_native_use cuda; then
CMAKE_SKIP_TESTS+=(
'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
@@ -973,7 +975,7 @@ multilib_src_test() {
--test-timeout 180
)
- if multilib_is_native_abi && use cuda; then
+ if multilib_native_use cuda; then
cuda_add_sandbox -w
export OPENCV_PARALLEL_BACKEND="threads"
export DNN_BACKEND_OPENCV="cuda"
@@ -1005,7 +1007,7 @@ multilib_src_test() {
echo -e "${results[*]}"
}
- if multilib_is_native_abi && use python; then
+ if multilib_native_use python; then
python_foreach_impl virtx opencv_test
else
virtx opencv_test
@@ -1162,7 +1164,8 @@ multilib_src_install() {
/usr/include/opencv4/opencv2/wechat_qrcode.hpp
) # }}}
fi
- if multilib_is_native_abi && use python; then
+
+ if multilib_native_use python; then
python_foreach_impl cmake_src_install
python_foreach_impl python_optimize
else
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 900c50dd186dc8c716fc882f7345b45e9b088976
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 18:51:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900c50dd
media-libs/opencv: rework plugin lists
Explicitly specify `videoio` plugins.
Disable plugins for `highgui`, as this would otherwise autodetect gtk2.
`opengl` support would require `x11-libs/gtkglext` which is obsolete, reflect
that in `REQUIRED_USE`.
Bug: https://bugs.gentoo.org/698950
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index e0fb1354215a..23dda8d411b1 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -167,7 +167,7 @@ REQUIRED_USE="
contribsfm? ( contrib eigen gflags glog )
contribxfeatures2d? ( contrib )
java? ( python )
- opengl? ( ?? ( gtk3 qt6 ) )
+ opengl? ( qt6 )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt6 )
@@ -709,10 +709,23 @@ multilib_src_configure() {
# -DBUILD_opencv_world="yes"
+ -DOPENCV_PLUGIN_VERSION=".$(ver_rs 1-2 '' "$(ver_cut 1-2)")"
+ -DOPENCV_PLUGIN_ARCH=".${ARCH}"
+
-DDNN_PLUGIN_LIST="all"
- -DHIGHGUI_PLUGIN_LIST="all"
- -DVIDEOIO_PLUGIN_LIST="all"
+ -DHIGHGUI_ENABLE_PLUGINS="no"
+ )
+ local VIDEOIO_PLUGIN_LIST=()
+ if use ffmpeg; then
+ VIDEOIO_PLUGIN_LIST+=("ffmpeg")
+ fi
+ if use gstreamer; then
+ VIDEOIO_PLUGIN_LIST+=("gstreamer")
+ fi
+
+ mycmakeargs+=(
+ -DVIDEOIO_PLUGIN_LIST="$(IFS=';'; echo "${VIDEOIO_PLUGIN_LIST[*]}")"
)
if use qt6; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: d9dc4bbd862fec4bb73a9569686b284c07c9a0c8
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 12:57:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9dc4bbd
media-libs/opencv: don't default enable USE="python"
This should lower the burden since OpenCV is now a hard-dep of
kde-apps/spectacle.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 6906e584b825..27100bf19dbb 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -66,7 +66,7 @@ LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
# general options
-IUSE="debug doc +eigen gflags glog java non-free opencvapps +python test testprograms"
+IUSE="debug doc +eigen gflags glog java non-free opencvapps python test testprograms"
# modules
IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d dnnsamples examples +features2d"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 70f5f240a0ce97a95179cf953303472ebfd90c17
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 12:50:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f5f240
media-libs/opencv: set SONAME on plugins #927269
Closes: https://bugs.gentoo.org/927269
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index ded47e82a8eb..6906e584b825 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -1190,4 +1190,8 @@ multilib_src_install() {
else
cmake_src_install
fi
+
+ for plugin in "${ED}/usr/$(get_libdir)/libopencv_"*".$(ver_rs 1-2 '' "$(ver_cut 1-2)").${ARCH}"* ; do
+ patchelf --set-soname "$(basename "${plugin}" ".$(get_libname)")" "${plugin}"
+ done
}
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 245f0ef1e68399ac94df4e996e0e0cd45dc71c74
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 14:22:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245f0ef1
media-libs/opencv: reflect dnn move from opencv_contrib
https://github.com/opencv/opencv/commit/93729784bb1c4e544e07ec27a43ef57c4f456cec
We still pretend USE=dnn needs USE=contrib until we rework the module handling
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index bd5c10a93814..53c8949d37ed 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -9,6 +9,10 @@ inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic multilib multiprocessing
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="https://opencv.org"
+# TODO
+# - dnn: move module from opencv_contrib
+# https://github.com/opencv/opencv/commit/93729784bb1c4e544e07ec27a43ef57c4f456cec
+
if [[ ${PV} = *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -453,7 +457,7 @@ src_prepare() {
cd "${S}" || die
! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }
- # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; }
+ ! use contribdnn && { rm -R "${S}/modules/dnn" || die; }
! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; }
! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; }
! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; }
@@ -802,10 +806,16 @@ multilib_src_configure() {
# ===================================================
# OpenCV Contrib Modules
# ===================================================
+ # NOTE
+ # we remove unused modules,
+ # so we shouldn't need to disable options for unused modules
if use contrib; then
mycmakeargs+=(
-DBUILD_opencv_cvv="$(usex contribcvv)"
-DBUILD_opencv_dnn="$(usex contribdnn)"
+ -DOPENCV_DNN_OPENCL="$(usex opencl)"
+ -DOPENCV_DNN_CUDA="$(multilib_native_usex cudnn)"
+
-DBUILD_opencv_freetype="$(usex contribfreetype)"
-DBUILD_opencv_hdf="$(multilib_native_usex contribhdf)"
-DBUILD_opencv_ovis="$(usex contribovis)"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 22b6bc516c11b0c879002fbc0571294e4062e34a
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:31:33 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b6bc51
media-libs/opencv: add USE=truetype
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 1 +
media-libs/opencv/opencv-4.10.0.ebuild | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 5979caa25015..2ff04570cd89 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -42,6 +42,7 @@
<flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag>
<flag name="tesseract">Use Google's OCR Engine</flag>
<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
+ <flag name="truetype">Enable <pkg>media-libs/freetype</pkg> support for gapi module</flag>
<flag name="video_cards_intel">Enable Video Acceleration API for hardware decoding for Intel cards</flag>
<flag name="vtk">Build new 3D visualization module viz based on <pkg>sci-libs/vtk</pkg></flag>
</use>
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 3d31e8b0cc01..332c5c9f7e8a 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -77,7 +77,7 @@ IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
# image
IUSE+=" avif gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
# gui
-IUSE+=" gtk3 qt6 opengl vtk"
+IUSE+=" gtk3 qt6 opengl truetype vtk"
# parallel
IUSE+=" openmp tbb"
# lapack options
@@ -195,6 +195,7 @@ COMMON_DEPEND="
)
contribovis? ( >=dev-games/ogre-1.12:= )
ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
gdal? ( sci-libs/gdal:= )
gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] )
glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] )
@@ -610,6 +611,7 @@ multilib_src_configure() {
-DWITH_ITT="no" # 3dparty libs itt_notify
-DWITH_AVIF="$(usex avif)"
+ -DWITH_FREETYPE="$(usex truetype)"
# ===================================================
# CUDA build components: nvidia-cuda-toolkit
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 13948f88725c37b101848aee1168e0081a4e2082
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 12:48:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13948f88
media-libs/opencv: only build jasper iff USE="jpeg2k -abi_x86_32"
Closes: https://bugs.gentoo.org/939924
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 332c5c9f7e8a..ded47e82a8eb 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -168,6 +168,7 @@ REQUIRED_USE="
contribxfeatures2d? ( contrib )
java? ( python )
opengl? ( qt6 )
+ jasper? ( !abi_x86_32 )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt6 )
@@ -567,9 +568,9 @@ multilib_src_configure() {
-DWITH_GTK="$(usex gtk3)"
-DWITH_GTK_2_X="no" # only want gtk3 nowadays
-DWITH_IPP="no"
- -DWITH_JASPER="$(multilib_native_usex jasper)"
+ -DWITH_JASPER="$(usex jpeg2k "$(multilib_native_usex jasper)")"
-DWITH_JPEG="$(usex jpeg)"
- -DWITH_OPENJPEG="$(usex jpeg2k)"
+ -DWITH_OPENJPEG="$(usex jpeg2k "$(multilib_native_usex !jasper)")"
-DWITH_WEBP="$(usex webp)"
-DWITH_OPENEXR="$(multilib_native_usex openexr)"
-DWITH_OPENGL="$(usex opengl)"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 3579f2377f82c3ed05cfa17bc01b4d4fee3ffa14
Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Thu Jul 11 15:08:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3579f237
media-libs/opencv: extend metadata
Add changelog and doc urls to metadata.xml
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/metadata.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 2ff04570cd89..b23fac5f689f 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -47,6 +47,8 @@
<flag name="vtk">Build new 3D visualization module viz based on <pkg>sci-libs/vtk</pkg></flag>
</use>
<upstream>
+ <changelog>https://github.com/opencv/opencv/wiki/ChangeLog</changelog>
+ <doc>https://docs.opencv.org</doc>
<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
<remote-id type="github">opencv/opencv</remote-id>
<remote-id type="github">opencv/opencv_contrib</remote-id>
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 10edbadeabd3b2bbec7c95c213810d7064e73ca4
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 13:02:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10edbade
media-libs/opencv: work around gcc-15 bug in dnn
Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116352
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 27100bf19dbb..790cacb306ff 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -544,6 +544,10 @@ multilib_src_configure() {
# bug #919101 and https://github.com/opencv/opencv/issues/19020
filter-lto
+ if tc-is-gcc && [[ $(gcc-major-version) -ge 15 ]] && use contribdnn; then
+ append-cxxflags "-fno-tree-vectorize"
+ fi
+
# please don't sort here, order is the same as in CMakeLists.txt
local mycmakeargs=(
-DMIN_VER_CMAKE=3.26
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 2f963ad44f046315f714b5f7c453a86c858d1189
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 17:04:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f963ad4
media-libs/opencv: refactor tests. split up skip logic per module
The prior logic expanded CMAKE_SKIP_TESTS for each tests. Filtering testcases
that do exist for that test.
Split that up to be set per test.
Do not run the testphase for abi_x86_32 as they are never build.
Skip CUDA related tests when we can not access the render devices. Usually due
to the build user not being in the video group.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 172 +++++++++++++++++++++++++--------
1 file changed, 134 insertions(+), 38 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 790cacb306ff..bd5c10a93814 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -434,6 +434,13 @@ src_prepare() {
sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-i CMakeLists.txt cmake/*cmake || die
+ sed \
+ -e 's:truetype/wqy:wqy-microhei:g' \
+ -i \
+ modules/gapi/test/render/gapi_render_tests_ocv.cpp \
+ modules/gapi/test/render/ftp_render_test.cpp \
+ || die
+
if use contrib; then
cd "${WORKDIR}/${PN}_contrib-${PV}" || die
eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
@@ -855,6 +862,7 @@ multilib_src_configure() {
if use ffmpeg; then
mycmakeargs+=(
-DOPENCV_GAPI_GSTREAMER="no"
+ -DOPENCV_FFMPEG_DISABLE_MEDIASDK="yes"
)
fi
@@ -897,7 +905,7 @@ multilib_src_configure() {
# if multilib_native_use test; then
if use test; then
# opencv tests assume to be build in Release mode
- CMAKE_BUILD_TYPE="Release"
+ local -x CMAKE_BUILD_TYPE="Release"
mycmakeargs+=(
-DOPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
)
@@ -953,72 +961,157 @@ multilib_src_compile() {
}
multilib_src_test() {
+ # no tests on ABI_X86_32
+ ! multilib_is_native_abi && return
+
# NOTE we don't run the tests
use testprograms && return
- CMAKE_SKIP_TESTS=(
- 'Test_ONNX_layers.LSTM_cell_forward/0'
- 'Test_ONNX_layers.LSTM_cell_bidirectional/0'
- 'Test_TensorFlow_layers.Convolution3D/1'
- 'Test_TensorFlow_layers.concat_3d/1'
+ declare -xA OPENCV_SKIP_TESTS
+
+ local -x OPENCV_SKIP_TESTS_core=(
+ 'hal_intrin128.*32x4_CPP_EMULATOR'
+ 'hal_intrin128.*64x2_CPP_EMULATOR'
+ )
+
+ local -x OPENCV_SKIP_TESTS_gapi=(
+ 'AsyncAPICancelation/cancel/*.basic'
+ )
+
+ local -x OPENCV_SKIP_TESTS_videoio=(
+ '*mfx*'
+ 'videoio/videoio_bunny.frame_count/12'
+ )
- 'AsyncAPICancelation/cancel*basic'
+ local -x OPENCV_SKIP_TESTS_video=(
+ 'GOTURN.accuracy'
+ 'DaSiamRPN.accuracy'
+ 'NanoTrack.accuracy_NanoTrack_V1'
+ 'NanoTrack.accuracy_NanoTrack_V2'
+ 'Tracking/DistanceAndOverlap.GOTURN*'
)
if ! use gtk3 && ! use qt6; then
- CMAKE_SKIP_TESTS+=(
- # these fail with parallism
- '^Highgui_*'
+ local -x OPENCV_SKIP_TESTS_highgui=(
+ 'Highgui_GUI.*'
)
+ else
+ addpredict /dev/fuse
fi
if multilib_native_use cuda; then
- CMAKE_SKIP_TESTS+=(
+ local -x OPENCV_SKIP_TESTS_cudaoptflow=(
'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
'CUDA_OptFlow/NvidiaOpticalFlow_1_0.Regression/0'
'CUDA_OptFlow/NvidiaOpticalFlow_2_0.Regression/0'
)
+ if use opengl; then
+ local -x OPENCV_SKIP_TESTS_cudaarithm=(
+ 'OpenGL/Buffer.MapDevice/*'
+ 'OpenGL/*Gpu*'
+ )
+ fi
fi
- if use opengl; then
- CMAKE_SKIP_TESTS+=(
- 'OpenGL/Buffer.MapDevice/*'
- 'OpenGL/*Gpu*'
+ if use contribdnn; then
+ local -x OPENCV_SKIP_TESTS_dnn=(
+ 'Test_ONNX_layers.LSTM_cell_forward/*'
+ 'Test_ONNX_layers.LSTM_cell_bidirectional/*'
+ 'Test_TensorFlow_layers.Convolution3D/*'
+ 'Test_TensorFlow_layers.concat_3d/*'
)
- fi
+ local -x OPENCV_SKIP_TESTS_objdetect=(
+ 'Objdetect_face_detection.regression'
+ 'Objdetect_face_recognition.regression' 'Objdetect_QRCode_Encode_Decode_Structured_Append.regression'
+ )
+ else
+ local -x OPENCV_SKIP_TESTS_objdetect=(
+ 'Objdetect_face_detection.regression'
+ 'Objdetect_face_recognition.regression'
+ )
- if use opencl; then
- CMAKE_SKIP_TESTS+=(
- 'OCL_Arithm/InRange.Mat/\(CV_32S,*'
+ OPENCV_SKIP_TESTS_video+=(
+ 'vittrack.accuracy_vittrack'
+ )
+ fi
+ if use dnnsamples; then
+ local -x OPENCV_SKIP_TESTS_wechat_qrcode=(
+ 'Objdetect_QRCode_points_position.rotate45'
+ 'Objdetect_QRCode_Big.regression'
+ 'Objdetect_QRCode_Tiny.regression'
+ 'Objdetect_QRCode_Multi.regression/*'
+ 'Objdetect_QRCode_Easy_Multi.regression/1'
)
fi
-
- local myctestargs=(
- --test-timeout 180
- )
if multilib_native_use cuda; then
- cuda_add_sandbox -w
- export OPENCV_PARALLEL_BACKEND="threads"
- export DNN_BACKEND_OPENCV="cuda"
+ if ! SANDBOX_WRITE=/dev/nvidiactl test -w /dev/nvidiactl ; then
+ eerror "Can't access the GPU at /dev/nvidiactl."
+ eerror "User $(id -nu) is not in the group \"video\"."
+ local -x TEST_CUDA="false"
+ # local -x OPENCV_PARALLEL_BACKEND="threads"
+ # local -x DNN_BACKEND_OPENCV="cuda"
+
+ local -x OPENCV_SKIP_TESTS_photo=( "CUDA_*" )
+ local -x OPENCV_SKIP_TESTS_stitching=( "CUDA_*" )
+ OPENCV_SKIP_TESTS_video+=( "CUDA_*" )
+ else
+ cuda_add_sandbox -w
+ addwrite "/dev/dri/"
+ [[ -e /dev/udmabuf ]] && addwrite /dev/udmabuf
+ fi
fi
opencv_test() {
- export OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib"
- export OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib"
- export OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib"
+ cd "${BUILD_DIR}" || die
+
+ # directories to search for _core_ plugins
+ local -x OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib"
+ # directories to search for _dnn_ plugins
+ local -x OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib"
+ # directories to search for _videoio_ plugins
+ local -x OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib"
+ # # path to extra OpenVINO plugins
+ # local -x OPENCV_DNN_IE_EXTRA_PLUGIN_PATH="${BUILD_DIR}/lib"
+
+ local -x OPENCV_TEMP_PATH="${T}"
+
+ local -x OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+
+ local test_opts_base=(
+ --skip_unstable=1
+ --test_threads="$(makeopts_jobs)"
+ )
- export OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+ local results=()
- # Work around zink warnings
- export LIBGL_ALWAYS_SOFTWARE=true
- results=()
- for test in "${BUILD_DIR}/bin/opencv_test_"*; do
- echo "${test}"
- if ! "${test}" --gtest_color=yes --gtest_filter="-$(IFS=: ; echo "${CMAKE_SKIP_TESTS[*]}")"; then
+ local tests
+ readarray -t tests <<< "$(find "${BUILD_DIR}/bin" -name 'opencv_test_*')"
- results+=( "$(basename ${test})" )
+ for test in "${tests[@]}" ; do
+
+ if [[ ${TEST_CUDA} == "false" && ${test} = *opencv_test_cu* ]] ; then
+ eqawarn "Skipping test ${test}"
+ continue
+ fi
+
+ local test_opts=(
+ --gtest_color=yes
+ --gtest_output="json:${BUILD_DIR}/test-reports/$(basename "${test}").json"
+ )
+
+ local testname
+ testname="OPENCV_SKIP_TESTS_$(basename "${test//opencv_test_/}")[*]"
+ if [[ -n "${!testname}" ]]; then
+ test_opts+=(
+ --gtest_filter="-$(IFS=':'; echo "${!testname}")"
+ )
+ fi
+
+ einfo "${test} ${test_opts_base[*]} ${test_opts[*]}"
+ if ! "${test}" "${test_opts_base[@]}" "${test_opts[@]}"; then
+ results+=( "$(basename "${test}")" )
if [[ -z "${OPENCV_TEST_CONTINUE_ON_FAIL}" ]]; then
eerror "${results[*]} failed"
@@ -1027,7 +1120,10 @@ multilib_src_test() {
fi
done
- echo -e "${results[*]}"
+ if [[ -n "${results[*]}" ]]; then
+ eerror "failed: ${results[*]}"
+ die "${results[*]}"
+ fi
}
if multilib_native_use python; then
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 3db769c9725026eabb9b697856ef2bd57b6ebe4d
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 14:31:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db769c9
media-libs/opencv: rework vtk depspec #929217
The VTK <-> OpenCASCADE interaction is cumbersome with their circular inclusion
and non-namespaced exporting of defines in cmake files.
Since we do not want `OpenCASCADE` polluting our build environment with
e.g. `-DHAVE_FFMPEG=true`, we require `VTK` to be build without `OpenCASCADE`
support or `OpenCASCADE` to be build without ffmpeg support.
Closes: https://bugs.gentoo.org/929217
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 53c8949d37ed..ea1242c5e0b7 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -259,7 +259,16 @@ COMMON_DEPEND="
tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk:=[rendering,cuda=] )
+ vtk? (
+ sci-libs/vtk:=[rendering,cuda=]
+ || (
+ (
+ sci-libs/vtk[opencascade(+)]
+ sci-libs/opencascade[-ffmpeg]
+ )
+ sci-libs/vtk[-opencascade(-)]
+ )
+ )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )
"
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:03 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 638185d3aecaf93a9fd21227418d8722aa8da0be
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Nov 2 12:20:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638185d3
media-libs/opencv: add USE=avif
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 23dda8d411b1..3d31e8b0cc01 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -75,7 +75,7 @@ IUSE+=" cuda cudnn opencl video_cards_intel"
# video
IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394"
# image
-IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
+IUSE+=" avif gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp"
# gui
IUSE+=" gtk3 qt6 opengl vtk"
# parallel
@@ -181,6 +181,7 @@ COMMON_DEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
+ avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
cudnn? (
dev-cpp/abseil-cpp:=
@@ -607,6 +608,8 @@ multilib_src_configure() {
-DWITH_GPHOTO2="$(usex gphoto2)"
-DWITH_LAPACK="$(multilib_native_usex lapack)"
-DWITH_ITT="no" # 3dparty libs itt_notify
+
+ -DWITH_AVIF="$(usex avif)"
# ===================================================
# CUDA build components: nvidia-cuda-toolkit
# ===================================================
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 2:58 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 2:58 UTC (permalink / raw
To: gentoo-commits
commit: acdafb3f95a4dd143af220d4213893f86719b2e4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 02:57:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:58:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdafb3f
media-libs/opencv: fix check for whether nvcc is installed
```
* Applying opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch ...
[ ok ]
/var/tmp/portage/media-libs/opencv-4.10.0/temp/environment: line 5691: nvcc: command not found
* ERROR: media-libs/opencv-4.10.0::gentoo failed (prepare phase):
* __eapi7_ver_compare: invalid version:
```
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index ea1242c5e0b7..853455f07d30 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -458,7 +458,7 @@ src_prepare() {
cd "${WORKDIR}/${PN}_contrib-${PV}" || die
eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
- if ver_test "$(nvcc --version | tail -n 1 | cut -d '_' -f 2- | cut -d '.' -f 1-2)" -ge 12.4; then
+ if type -P nvcc &> /dev/null && ver_test "$(nvcc --version | tail -n 1 | cut -d '_' -f 2- | cut -d '.' -f 1-2)" -ge 12.4; then
eapply "${DISTDIR}/${PN}_contrib-4.10.0-3607.patch"
eapply "${FILESDIR}/${PN}_contrib-4.10.0-CUDA-12.6-tuple_size.patch" # 3785
fi
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 4:22 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 6130944f838f600bb00f4c266f718ffd174ae561
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Nov 5 04:18:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 04:22:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6130944f
media-libs/opencv: add patchelf dep
The libraries patched are runtime plugins only used by opencv itself, they are
never linked against.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 853455f07d30..34bfb33194a0 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -305,6 +305,7 @@ RDEPEND="
unset COMMON_DEPEND
BDEPEND="
+ dev-util/patchelf
virtual/pkgconfig
cuda? ( dev-util/nvidia-cuda-toolkit:= )
doc? (
^ permalink raw reply related [flat|nested] 208+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
@ 2024-11-05 20:31 Sam James
0 siblings, 0 replies; 208+ messages in thread
From: Sam James @ 2024-11-05 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 07492174b6695b6e8da69d1be7416f425c094ab7
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Nov 5 20:10:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 20:30:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07492174
media-libs/opencv: opencl(+)= doesn't really work well.
Can't be equal when you assume always enabled.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.9.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild
index 4a0fbf062b69..971d60f16ecb 100644
--- a/media-libs/opencv/opencv-4.9.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild
@@ -218,7 +218,7 @@ COMMON_DEPEND="
)
)
quirc? ( media-libs/quirc )
- tesseract? ( app-text/tesseract[opencl(+)=,${MULTILIB_USEDEP}] )
+ tesseract? ( app-text/tesseract[opencl(+),${MULTILIB_USEDEP}] )
tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 208+ messages in thread
end of thread, other threads:[~2024-11-05 20:31 UTC | newest]
Thread overview: 208+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-11 4:31 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-05 20:31 Sam James
2024-11-05 4:22 Sam James
2024-11-05 2:58 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-11-05 2:03 Sam James
2024-10-08 7:09 Florian Schmaus
2024-10-07 2:52 Sam James
2024-10-02 13:23 Arthur Zamarin
2024-10-02 11:37 Arthur Zamarin
2024-10-02 11:35 Arthur Zamarin
2024-08-16 3:58 Sam James
2024-08-16 3:58 Sam James
2024-07-31 8:47 Joonas Niilola
2024-07-31 8:47 Joonas Niilola
2024-05-20 16:25 Sam James
2024-04-22 3:40 Michał Górny
2024-04-01 7:58 Joonas Niilola
2024-03-23 13:44 Sam James
2024-03-18 17:06 Sam James
2024-01-23 20:35 Andreas Sturmlechner
2024-01-18 15:19 Joonas Niilola
2024-01-18 15:19 Joonas Niilola
2024-01-16 20:00 Arthur Zamarin
2024-01-12 21:44 Sam James
2024-01-10 13:10 Sam James
2024-01-10 12:33 Sam James
2024-01-10 12:33 Sam James
2023-11-27 11:23 Sam James
2023-11-16 15:11 Florian Schmaus
2023-11-16 15:11 Florian Schmaus
2023-11-16 15:11 Florian Schmaus
2023-10-10 7:09 Joonas Niilola
2023-10-09 16:21 Arthur Zamarin
2023-08-26 5:04 Sam James
2023-08-24 22:37 Sam James
2023-08-24 22:37 Sam James
2023-08-22 13:12 Andrew Ammerlaan
2023-08-21 19:57 Sam James
2023-07-15 6:08 Sam James
2023-05-17 11:36 Joonas Niilola
2023-05-17 8:16 Joonas Niilola
2023-03-04 7:18 Sam James
2023-02-21 20:00 Alfredo Tupone
2022-12-03 4:47 WANG Xuerui
2022-09-15 16:43 Andreas Sturmlechner
2022-09-15 15:11 Agostino Sarubbo
2022-09-15 6:48 Agostino Sarubbo
2022-09-15 6:44 Joonas Niilola
2022-07-08 7:41 Sam James
2022-07-08 0:57 Sam James
2022-06-07 6:59 Sam James
2022-06-07 6:58 Sam James
2022-06-07 4:37 Sam James
2022-05-22 20:47 Sam James
2022-04-21 20:49 Matt Turner
2022-04-19 5:50 Matt Turner
2022-04-14 6:55 Sam James
2022-04-13 15:02 Sam James
2022-03-01 0:02 Sam James
2022-02-28 23:58 Sam James
2022-02-28 5:21 Sam James
2022-02-15 19:51 Sam James
2022-01-25 19:01 Amy Liffey
2021-12-28 6:58 Sam James
2021-12-13 2:07 Sam James
2021-12-12 23:49 Sam James
2021-12-12 23:48 Sam James
2021-12-04 19:09 David Seifert
2021-12-03 0:54 Sam James
2021-11-22 9:07 Sam James
2021-11-09 12:05 Arthur Zamarin
2021-10-29 22:23 Sam James
2021-10-26 18:40 Amy Liffey
2021-09-09 7:39 Agostino Sarubbo
2021-09-08 0:42 Sam James
2021-09-07 11:55 Agostino Sarubbo
2021-08-25 10:16 Pacho Ramos
2021-07-21 21:57 Marek Szuba
2021-07-21 21:57 Marek Szuba
2021-07-21 21:57 Marek Szuba
2021-06-03 0:43 Sam James
2021-05-26 9:13 Agostino Sarubbo
2021-05-23 13:05 Stefan Strogin
2021-05-17 22:30 Sam James
2021-01-22 21:11 Sam James
2021-01-22 21:11 Sam James
2020-12-27 4:34 Sam James
2020-11-12 15:27 Sam James
2020-11-11 15:38 Sam James
2020-10-18 14:49 Sam James
2020-10-16 21:48 Sam James
2020-10-12 16:15 Andreas Sturmlechner
2020-10-12 16:11 Sam James
2020-10-11 19:16 Sam James
2020-10-11 19:16 Sam James
2020-06-25 17:08 Andreas Sturmlechner
2020-06-22 6:57 Agostino Sarubbo
2020-06-20 15:45 Thomas Deutschmann
2020-04-25 18:45 Mikle Kolyada
2020-03-09 13:00 David Seifert
2020-02-09 16:29 Michał Górny
2020-01-30 21:26 Michał Górny
2020-01-30 21:26 Michał Górny
2019-12-26 14:42 David Seifert
2019-12-25 17:32 Pacho Ramos
2019-12-25 16:57 Pacho Ramos
2019-11-30 19:48 Amy Liffey
2019-11-30 19:48 Amy Liffey
2019-11-30 19:48 Amy Liffey
2019-11-28 20:02 Amy Liffey
2019-11-28 16:56 Amy Liffey
2019-11-28 10:00 Amy Liffey
2019-08-28 8:19 David Seifert
2019-08-04 13:58 Alexey Shvetsov
2019-05-16 19:30 Aaron Bauman
2019-05-16 5:54 Michał Górny
2019-03-26 20:47 Georgy Yakovlev
2018-12-02 22:30 Andreas K. Hüttel
2018-11-27 18:29 Amy Liffey
2018-10-19 8:51 Michał Górny
2018-08-18 6:13 Amy Liffey
2018-08-16 15:09 Amy Liffey
2018-08-16 15:09 Amy Liffey
2018-08-16 15:09 Amy Liffey
2018-05-28 12:56 Amy Liffey
2018-05-25 20:28 Amy Liffey
2018-05-25 19:34 Amy Liffey
2017-11-27 7:33 Amy Liffey
2017-11-27 0:20 Thomas Deutschmann
2017-11-24 13:23 Agostino Sarubbo
2017-11-20 18:50 Andreas Sturmlechner
2017-11-20 18:50 Andreas Sturmlechner
2017-11-20 18:50 Andreas Sturmlechner
2017-11-01 17:25 Amy Liffey
2017-10-31 17:09 Amy Liffey
2017-10-09 14:54 Amy Liffey
2017-09-11 20:43 Michał Górny
2017-09-11 14:32 Michał Górny
2017-09-06 21:00 Michał Górny
2017-09-01 11:39 Amy Liffey
2017-08-26 20:02 Michał Górny
2017-08-21 22:30 Michał Górny
2017-08-14 19:49 Michał Górny
2017-08-11 13:21 Michał Górny
2017-08-11 13:21 Michał Górny
2017-07-09 9:48 Alexis Ballier
2017-02-09 20:04 Amy Liffey
2017-02-07 18:51 Johannes Huber
2017-01-23 15:46 Agostino Sarubbo
2017-01-23 13:51 Agostino Sarubbo
2017-01-20 14:37 Amy Liffey
2016-12-14 23:31 Amy Winston
2016-12-10 21:47 David Seifert
2016-12-10 21:25 Michał Górny
2016-12-10 21:25 Michał Górny
2016-11-12 23:37 David Seifert
2016-10-21 16:06 Michael Palimaka
2016-10-20 21:23 Michael Palimaka
2016-10-06 6:11 Amy Winston
2016-10-02 17:41 Amy Winston
2016-08-20 19:01 Amy Winston
2016-08-06 16:51 Michał Górny
2016-06-09 13:54 Amy Winston
2016-06-04 19:06 Amy Winston
2016-05-24 15:08 Amy Winston
2016-05-24 15:08 Amy Winston
2016-05-15 13:16 Mikle Kolyada
2016-05-14 13:52 Amy Winston
2016-03-13 19:06 Amy Winston
2016-03-13 19:06 Amy Winston
2016-02-23 12:19 Amy Winston
2016-01-31 14:56 Andreas Hüttel
2016-01-31 14:56 Andreas Hüttel
2016-01-19 21:47 Amy Winston
2016-01-19 17:49 Amy Winston
2016-01-19 17:49 Amy Winston
2016-01-19 17:49 Amy Winston
2016-01-19 17:49 Amy Winston
2015-12-16 9:06 Amy Winston
2015-11-26 21:13 Amy Winston
2015-11-10 22:37 Amy Winston
2015-10-31 8:27 Amy Winston
2015-10-30 23:55 Amy Winston
2015-10-30 17:09 Amy Winston
2015-08-18 15:41 Amy Winston
2015-08-18 14:19 Amy Winston
2015-08-18 12:14 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox