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}] )
