| 1 |
commit: 2dfae79d6eb34ffd11bd31342e340d92d47ec6a8 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 30 04:01:15 2019 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 30 19:47:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfae79d |
| 7 |
|
| 8 |
media-libs/opencv: add USE=+features2d |
| 9 |
|
| 10 |
USE=contribxfeatures2d should not control building features2d module. |
| 11 |
Add USE=+features2d instead. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
| 14 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 15 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 16 |
|
| 17 |
media-libs/opencv/metadata.xml | 1 + |
| 18 |
media-libs/opencv/opencv-4.1.2-r1.ebuild | 4 ++-- |
| 19 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml |
| 22 |
index fa1de56873e..f7bccfa408e 100644 |
| 23 |
--- a/media-libs/opencv/metadata.xml |
| 24 |
+++ b/media-libs/opencv/metadata.xml |
| 25 |
@@ -15,6 +15,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under |
| 26 |
<flag name="cuda">Enable NVIDIA Cuda computations support (Experimental!)</flag> |
| 27 |
<flag restrict=">=media-libs/opencv-4.1.2" name="download">Enable download during cmake configure</flag> |
| 28 |
<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag> |
| 29 |
+ <flag name="features2d">Enable features2d module</flag> |
| 30 |
<flag name="gdal">Enable support for sci-libs/gdal library</flag> |
| 31 |
<flag restrict=">=media-libs/opencv-4.1.2" name="opencvapps">Enable compilation with opencvapps</flag> |
| 32 |
<flag restrict=">=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag> |
| 33 |
|
| 34 |
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 35 |
index 9b2a7e66419..b897cdd744a 100644 |
| 36 |
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 37 |
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 38 |
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 39 |
LICENSE="BSD" |
| 40 |
SLOT="0/4.1.2" # subslot = libopencv* soname version |
| 41 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
| 42 |
-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" |
| 43 |
+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" |
| 44 |
# OpenGL needs gtk or Qt installed to activate, otherwise build system |
| 45 |
# will silently disable it Wwithout the user knowing, which defeats the |
| 46 |
# purpose of the opengl use flag. |
| 47 |
@@ -410,7 +410,7 @@ multilib_src_configure() { |
| 48 |
-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON |
| 49 |
-DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}") |
| 50 |
-DCPU_DISPATCH= |
| 51 |
- -DBUILD_opencv_features2d=$(usex contribxfeatures2d) |
| 52 |
+ -DBUILD_opencv_features2d=$(usex features2d ON OFF) |
| 53 |
) |
| 54 |
|
| 55 |
# =================================================== |
Archives