summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2018-08-16 15:24:24 +0100
committerAmy Liffey <amynka@gentoo.org>2018-08-16 16:09:39 +0100
commit676eaaf60bb9f5ea1dffaae93f56aff379ab6878 (patch)
tree0c260ccf3c25b369525aea92dc33d5f3f4a0f47b /media-libs
parentmedia-libs/opencv: remove old revisions (diff)
downloadgentoo-676eaaf60bb9f5ea1dffaae93f56aff379ab6878.tar.gz
gentoo-676eaaf60bb9f5ea1dffaae93f56aff379ab6878.tar.bz2
gentoo-676eaaf60bb9f5ea1dffaae93f56aff379ab6878.zip
media-libs/opencv: remove non existing dep sci-libs/ipp
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/metadata.xml1
-rw-r--r--media-libs/opencv/opencv-2.4.13-r3.ebuild5
-rw-r--r--media-libs/opencv/opencv-3.2.0-r3.ebuild7
-rw-r--r--media-libs/opencv/opencv-3.3.0-r5.ebuild5
-rw-r--r--media-libs/opencv/opencv-3.4.1-r2.ebuild5
5 files changed, 9 insertions, 14 deletions
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index f87770fadafa..edc61febd4c1 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -21,7 +21,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<flag name="gdal">Enable support for sci-libs/gdal library</flag>
<flag restrict="&gt;=media-libs/opencv-3.1.0" name="gflags">Use Google's C++ argument parsing library</flag>
<flag restrict="&gt;=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="&gt;=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag>
<flag restrict="&gt;=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag>
<flag restrict="&gt;=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag>
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 9ff99bb067e2..37b41c40568e 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/2.4"
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -48,7 +48,6 @@ RDEPEND="
media-libs/libdc1394
sys-libs/libraw1394
)
- ipp? ( sci-libs/ipp )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr )
opengl? ( virtual/opengl virtual/glu )
@@ -122,7 +121,7 @@ src_configure() {
-DWITH_GSTREAMER_0_10=OFF
-DWITH_GTK=$(usex gtk)
-DWITH_IMAGEIO=OFF
- -DWITH_IPP=$(usex ipp)
+ -DWITH_IPP=OFF
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index 4046f42d260b..ed0aa785e85b 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/3.2" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it without the user knowing, which defeats the
@@ -63,7 +63,6 @@ RDEPEND="
media-libs/libdc1394[${MULTILIB_USEDEP}]
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
- ipp? ( sci-libs/ipp )
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -176,7 +175,7 @@ multilib_src_configure() {
-DWITH_GSTREAMER_0_10=OFF # Don't want this
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=$(multilib_native_usex ipp)
+ -DWITH_IPP=OFF
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
diff --git a/media-libs/opencv/opencv-3.3.0-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r5.ebuild
index 8b76d7910413..b9fbce050f1e 100644
--- a/media-libs/opencv/opencv-3.3.0-r5.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/3.3" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it without the user knowing, which defeats the
@@ -68,7 +68,6 @@ RDEPEND="
media-libs/libdc1394[${MULTILIB_USEDEP}]
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
- ipp? ( sci-libs/ipp )
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -280,7 +279,7 @@ multilib_src_configure() {
-DWITH_GSTREAMER_0_10=OFF # Don't want this
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=$(multilib_native_usex ipp)
+ -DWITH_IPP=OFF
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild
index 34085a8db247..2b315c3dae25 100644
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/3.4.1" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it Wwithout the user knowing, which defeats the
# purpose of the opengl use flag.
@@ -73,7 +73,6 @@ RDEPEND="
media-libs/libdc1394[${MULTILIB_USEDEP}]
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
- ipp? ( sci-libs/ipp )
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
@@ -286,7 +285,7 @@ multilib_src_configure() {
-DWITH_GSTREAMER_0_10=OFF # Don't want this
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=$(multilib_native_usex ipp)
+ -DWITH_IPP=OFF
-DWITH_JASPER=$(usex jpeg2k)
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)