| 1 |
commit: 221778ddc640df71449fa8b0b695d9d105d4dd8c |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 25 18:44:52 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 25 18:45:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221778dd |
| 7 |
|
| 8 |
media-libs/opencv: migrate from libav |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/opencv/opencv-2.4.13-r4.ebuild | 7 ++----- |
| 14 |
media-libs/opencv/opencv-3.4.1-r7.ebuild | 7 ++----- |
| 15 |
media-libs/opencv/opencv-4.1.2-r1.ebuild | 7 ++----- |
| 16 |
media-libs/opencv/opencv-4.1.2-r3.ebuild | 7 ++----- |
| 17 |
4 files changed, 8 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/opencv/opencv-2.4.13-r4.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild |
| 20 |
index e678316f625..1e5584759aa 100644 |
| 21 |
--- a/media-libs/opencv/opencv-2.4.13-r4.ebuild |
| 22 |
+++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild |
| 23 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 24 |
LICENSE="BSD" |
| 25 |
SLOT="0/2.4" |
| 26 |
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux" |
| 27 |
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine" |
| 28 |
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine" |
| 29 |
|
| 30 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 31 |
|
| 32 |
@@ -28,10 +28,7 @@ RDEPEND=" |
| 33 |
app-arch/bzip2 |
| 34 |
sys-libs/zlib |
| 35 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) |
| 36 |
- ffmpeg? ( |
| 37 |
- libav? ( media-video/libav:0= ) |
| 38 |
- !libav? ( media-video/ffmpeg:0= ) |
| 39 |
- ) |
| 40 |
+ ffmpeg? ( media-video/ffmpeg:0= ) |
| 41 |
gstreamer? ( |
| 42 |
media-libs/gstreamer:1.0 |
| 43 |
media-libs/gst-plugins-base:1.0 |
| 44 |
|
| 45 |
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild |
| 46 |
index d91ffc890ea..683c36a1493 100644 |
| 47 |
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild |
| 48 |
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild |
| 49 |
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 50 |
LICENSE="BSD" |
| 51 |
SLOT="0/3.4.1" # subslot = libopencv* soname version |
| 52 |
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux" |
| 53 |
-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" |
| 54 |
+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" |
| 55 |
# OpenGL needs gtk or Qt installed to activate, otherwise build system |
| 56 |
# will silently disable it Wwithout the user knowing, which defeats the |
| 57 |
# purpose of the opengl use flag. |
| 58 |
@@ -55,10 +55,7 @@ RDEPEND=" |
| 59 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 60 |
cuda? ( dev-util/nvidia-cuda-toolkit:0= ) |
| 61 |
contribhdf? ( sci-libs/hdf5 ) |
| 62 |
- ffmpeg? ( |
| 63 |
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) |
| 64 |
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 65 |
- ) |
| 66 |
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 67 |
gdal? ( sci-libs/gdal:= ) |
| 68 |
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] ) |
| 69 |
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] ) |
| 70 |
|
| 71 |
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 72 |
index 888c589b1c0..ba6201ddc53 100644 |
| 73 |
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 74 |
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild |
| 75 |
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 76 |
LICENSE="BSD" |
| 77 |
SLOT="0/4.1.2" # subslot = libopencv* soname version |
| 78 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
| 79 |
-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" |
| 80 |
+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" |
| 81 |
# OpenGL needs gtk or Qt installed to activate, otherwise build system |
| 82 |
# will silently disable it Wwithout the user knowing, which defeats the |
| 83 |
# purpose of the opengl use flag. |
| 84 |
@@ -51,10 +51,7 @@ RDEPEND=" |
| 85 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 86 |
cuda? ( dev-util/nvidia-cuda-toolkit:0= ) |
| 87 |
contribhdf? ( sci-libs/hdf5:= ) |
| 88 |
- ffmpeg? ( |
| 89 |
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) |
| 90 |
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 91 |
- ) |
| 92 |
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 93 |
gdal? ( sci-libs/gdal:= ) |
| 94 |
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] ) |
| 95 |
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] ) |
| 96 |
|
| 97 |
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild |
| 98 |
index 4b4180760a3..0265b343131 100644 |
| 99 |
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild |
| 100 |
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild |
| 101 |
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 102 |
LICENSE="BSD" |
| 103 |
SLOT="0/4.1.2" # subslot = libopencv* soname version |
| 104 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
| 105 |
-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" |
| 106 |
+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" |
| 107 |
# OpenGL needs gtk or Qt installed to activate, otherwise build system |
| 108 |
# will silently disable it Wwithout the user knowing, which defeats the |
| 109 |
# purpose of the opengl use flag. |
| 110 |
@@ -51,10 +51,7 @@ RDEPEND=" |
| 111 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 112 |
cuda? ( dev-util/nvidia-cuda-toolkit:0= ) |
| 113 |
contribhdf? ( sci-libs/hdf5:= ) |
| 114 |
- ffmpeg? ( |
| 115 |
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) |
| 116 |
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 117 |
- ) |
| 118 |
+ ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) |
| 119 |
gdal? ( sci-libs/gdal:= ) |
| 120 |
gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] ) |
| 121 |
glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] ) |
Archives