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)
