commit: 78bcdb12864a1e60ef79d66d1aabf732704450ce Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 11 18:39:01 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 11 19:16:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bcdb12
media-libs/opencv: fix automagic dep on openjpeg USE=jpeg2k was a no-op until now. Bug: https://bugs.gentoo.org/747427 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/opencv/{opencv-4.4.0.ebuild => opencv-4.4.0-r1.ebuild} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild similarity index 97% rename from media-libs/opencv/opencv-4.4.0.ebuild rename to media-libs/opencv/opencv-4.4.0-r1.ebuild index 5e6c41a3d97..259f25ce1f0 100644 --- a/media-libs/opencv/opencv-4.4.0.ebuild +++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/${PV}" # subslot = libopencv* soname version KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" +IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications ARM_CPU_FEATURES=( @@ -110,6 +110,7 @@ RDEPEND=" ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) @@ -328,8 +329,12 @@ multilib_src_configure() { -DWITH_GTK=$(usex gtk3) -DWITH_GTK_2_X=OFF # only want gtk3 nowadays -DWITH_IPP=OFF + # Jasper was removed from tree because of security problems. + # Upstream were/are making progress. We use openjpeg instead. + # bug 734284 -DWITH_JASPER=OFF -DWITH_JPEG=$(usex jpeg) + -DWITH_OPENJPEG=$(usex jpeg2k) -DWITH_WEBP=$(usex webp) -DWITH_OPENEXR=$(usex openexr) -DWITH_OPENGL=$(usex opengl)
