diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-11 18:39:01 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-11 19:16:13 +0000 |
| commit | 78bcdb12864a1e60ef79d66d1aabf732704450ce (patch) | |
| tree | c119e13fbfae0c338dcca3fc170e33b33957608f /media-libs | |
| parent | media-libs/opencv: drop pch support (fixes eigen build) (diff) | |
| download | gentoo-78bcdb12864a1e60ef79d66d1aabf732704450ce.tar.gz gentoo-78bcdb12864a1e60ef79d66d1aabf732704450ce.tar.bz2 gentoo-78bcdb12864a1e60ef79d66d1aabf732704450ce.zip | |
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@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/opencv/opencv-4.4.0-r1.ebuild (renamed from media-libs/opencv/opencv-4.4.0.ebuild) | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild index 5e6c41a3d972..259f25ce1f01 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) |