| 1 |
commit: 78bcdb12864a1e60ef79d66d1aabf732704450ce |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 18:39:01 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 19:16:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bcdb12 |
| 7 |
|
| 8 |
media-libs/opencv: fix automagic dep on openjpeg |
| 9 |
|
| 10 |
USE=jpeg2k was a no-op until now. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/747427 |
| 13 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
media-libs/opencv/{opencv-4.4.0.ebuild => opencv-4.4.0-r1.ebuild} | 7 ++++++- |
| 17 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 20 |
similarity index 97% |
| 21 |
rename from media-libs/opencv/opencv-4.4.0.ebuild |
| 22 |
rename to media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 23 |
index 5e6c41a3d97..259f25ce1f0 100644 |
| 24 |
--- a/media-libs/opencv/opencv-4.4.0.ebuild |
| 25 |
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild |
| 26 |
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 27 |
LICENSE="BSD" |
| 28 |
SLOT="0/${PV}" # subslot = libopencv* soname version |
| 29 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 30 |
-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" |
| 31 |
+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" |
| 32 |
|
| 33 |
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications |
| 34 |
ARM_CPU_FEATURES=( |
| 35 |
@@ -110,6 +110,7 @@ RDEPEND=" |
| 36 |
) |
| 37 |
java? ( >=virtual/jre-1.6:* ) |
| 38 |
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) |
| 39 |
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) |
| 40 |
lapack? ( virtual/lapack ) |
| 41 |
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) |
| 42 |
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) |
| 43 |
@@ -328,8 +329,12 @@ multilib_src_configure() { |
| 44 |
-DWITH_GTK=$(usex gtk3) |
| 45 |
-DWITH_GTK_2_X=OFF # only want gtk3 nowadays |
| 46 |
-DWITH_IPP=OFF |
| 47 |
+ # Jasper was removed from tree because of security problems. |
| 48 |
+ # Upstream were/are making progress. We use openjpeg instead. |
| 49 |
+ # bug 734284 |
| 50 |
-DWITH_JASPER=OFF |
| 51 |
-DWITH_JPEG=$(usex jpeg) |
| 52 |
+ -DWITH_OPENJPEG=$(usex jpeg2k) |
| 53 |
-DWITH_WEBP=$(usex webp) |
| 54 |
-DWITH_OPENEXR=$(usex openexr) |
| 55 |
-DWITH_OPENGL=$(usex opengl) |
Archives