Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Wed, 28 Aug 2019 08:20:01
Message-Id: 1566980357.e781bc0af848df21f259929a7aae7cf8b30c9588.soap@gentoo
1 commit: e781bc0af848df21f259929a7aae7cf8b30c9588
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 28 08:19:17 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 28 08:19:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e781bc0a
7
8 media-libs/opencv: [QA] Remove media-libs/jasper dep
9
10 Bug: https://bugs.gentoo.org/689784
11 Package-Manager: Portage-2.3.68, Repoman-2.3.16
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 media-libs/opencv/opencv-2.4.13-r3.ebuild | 7 +++----
15 media-libs/opencv/opencv-3.4.1-r5.ebuild | 5 ++---
16 media-libs/opencv/opencv-3.4.1-r6.ebuild | 5 ++---
17 3 files changed, 7 insertions(+), 10 deletions(-)
18
19 diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
20 index 37b41c40568..d4379a93e73 100644
21 --- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
22 +++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
30 LICENSE="BSD"
31 SLOT="0/2.4"
32 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
33 -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"
34 +IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
35
36 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
37
38 @@ -43,7 +43,6 @@ RDEPEND="
39 )
40 java? ( >=virtual/jre-1.6:* )
41 jpeg? ( virtual/jpeg:0 )
42 - jpeg2k? ( media-libs/jasper:= )
43 ieee1394? (
44 media-libs/libdc1394
45 sys-libs/libraw1394
46 @@ -122,7 +121,7 @@ src_configure() {
47 -DWITH_GTK=$(usex gtk)
48 -DWITH_IMAGEIO=OFF
49 -DWITH_IPP=OFF
50 - -DWITH_JASPER=$(usex jpeg2k)
51 + -DWITH_JASPER=OFF
52 -DWITH_JPEG=$(usex jpeg)
53 -DWITH_OPENEXR=$(usex openexr)
54 -DWITH_OPENGL=$(usex opengl)
55
56 diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
57 index d096c1963ff..662a0e1a266 100644
58 --- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
59 +++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
60 @@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
61 LICENSE="BSD"
62 SLOT="0/3.4.1" # subslot = libopencv* soname version
63 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
64 -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"
65 +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"
66 # OpenGL needs gtk or Qt installed to activate, otherwise build system
67 # will silently disable it Wwithout the user knowing, which defeats the
68 # purpose of the opengl use flag.
69 @@ -77,7 +77,6 @@ RDEPEND="
70 )
71 java? ( >=virtual/jre-1.6:* )
72 jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
73 - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
74 lapack? ( virtual/lapack )
75 opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
76 openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
77 @@ -293,7 +292,7 @@ multilib_src_configure() {
78 -DWITH_GTK=$(usex gtk)
79 -DWITH_GTK_2_X=$(usex gtk)
80 -DWITH_IPP=OFF
81 - -DWITH_JASPER=$(usex jpeg2k)
82 + -DWITH_JASPER=OFF
83 -DWITH_JPEG=$(usex jpeg)
84 -DWITH_WEBP=$(usex webp)
85 -DWITH_OPENEXR=$(usex openexr)
86
87 diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
88 index 1f5783f9621..92376a497c4 100644
89 --- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
90 +++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
91 @@ -25,7 +25,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
92 LICENSE="BSD"
93 SLOT="0/3.4.1" # subslot = libopencv* soname version
94 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
95 -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"
96 +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"
97 # OpenGL needs gtk or Qt installed to activate, otherwise build system
98 # will silently disable it Wwithout the user knowing, which defeats the
99 # purpose of the opengl use flag.
100 @@ -78,7 +78,6 @@ RDEPEND="
101 )
102 java? ( >=virtual/jre-1.6:* )
103 jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
104 - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
105 lapack? ( virtual/lapack )
106 opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
107 openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
108 @@ -295,7 +294,7 @@ multilib_src_configure() {
109 -DWITH_GTK=$(usex gtk)
110 -DWITH_GTK_2_X=$(usex gtk)
111 -DWITH_IPP=OFF
112 - -DWITH_JASPER=$(usex jpeg2k)
113 + -DWITH_JASPER=OFF
114 -DWITH_JPEG=$(usex jpeg)
115 -DWITH_WEBP=$(usex webp)
116 -DWITH_OPENEXR=$(usex openexr)
Report Message
Find on MARC Find on Google Groups