Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Thu, 09 Feb 2017 20:04:41
Message-Id: 1486670640.0d7cbaf881eceb24fd9485cd5ed4646e7d39c82f.amynka@gentoo
1 commit: 0d7cbaf881eceb24fd9485cd5ed4646e7d39c82f
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 9 20:04:00 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 9 20:04:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7cbaf8
7
8 media-libs/opencv: remove old
9
10 Package-Manager: portage-2.3.0
11
12 media-libs/opencv/Manifest | 1 -
13 media-libs/opencv/opencv-2.4.12-r1.ebuild | 242 ------------------------------
14 2 files changed, 243 deletions(-)
15
16 diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
17 index 985f9f18f7..4b12e50eae 100644
18 --- a/media-libs/opencv/Manifest
19 +++ b/media-libs/opencv/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
22 DIST opencv-2.4.13.zip 94319943 SHA256 fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b WHIRLPOOL 86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
23 DIST opencv-3.1.0.tar.gz 76135587 SHA256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f WHIRLPOOL b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
24 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a WHIRLPOOL 18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
25
26 diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild
27 deleted file mode 100644
28 index 9eeddfd411..0000000000
29 --- a/media-libs/opencv/opencv-2.4.12-r1.ebuild
30 +++ /dev/null
31 @@ -1,242 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python2_7 )
38 -
39 -inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
40 -
41 -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
42 -HOMEPAGE="http://opencv.org"
43 -
44 -SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
45 -
46 -LICENSE="BSD"
47 -SLOT="0/2.4"
48 -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
49 -IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
50 -REQUIRED_USE="
51 - python? ( ${PYTHON_REQUIRED_USE} )
52 - ?? ( qt4 qt5 )
53 -"
54 -
55 -# The following logic is intrinsic in the build system, but we do not enforce
56 -# it on the useflags since this just blocks emerging pointlessly:
57 -# gtk? ( !qt4 )
58 -# opengl? ( || ( gtk qt4 ) )
59 -# openmp? ( !threads )
60 -
61 -RDEPEND="
62 - app-arch/bzip2
63 - sys-libs/zlib
64 - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
65 - ffmpeg? (
66 - libav? ( media-video/libav:0= )
67 - !libav? ( media-video/ffmpeg:0= )
68 - )
69 - gstreamer? (
70 - media-libs/gstreamer:1.0
71 - media-libs/gst-plugins-base:1.0
72 - )
73 - gtk? (
74 - dev-libs/glib:2
75 - x11-libs/gtk+:2
76 - opengl? ( x11-libs/gtkglext )
77 - )
78 - java? ( >=virtual/jre-1.6:* )
79 - jpeg? ( virtual/jpeg:0 )
80 - jpeg2k? ( media-libs/jasper:= )
81 - ieee1394? (
82 - media-libs/libdc1394
83 - sys-libs/libraw1394
84 - )
85 - ipp? ( sci-libs/ipp )
86 - opencl? ( virtual/opencl )
87 - openexr? ( media-libs/openexr )
88 - opengl? ( virtual/opengl virtual/glu )
89 - png? ( media-libs/libpng:0= )
90 - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
91 - qt4? (
92 - dev-qt/qtgui:4
93 - dev-qt/qttest:4
94 - opengl? ( dev-qt/qtopengl:4 )
95 - )
96 - qt5? (
97 - dev-qt/qtgui:5
98 - dev-qt/qttest:5
99 - dev-qt/qtconcurrent:5
100 - opengl? ( dev-qt/qtopengl:5 )
101 - )
102 - threads? ( dev-cpp/tbb )
103 - tiff? ( media-libs/tiff:0 )
104 - v4l? ( >=media-libs/libv4l-0.8.3 )
105 - vtk? ( sci-libs/vtk[rendering] )
106 - xine? ( media-libs/xine-lib )
107 -"
108 -DEPEND="${RDEPEND}
109 - virtual/pkgconfig
110 - eigen? ( dev-cpp/eigen:3 )
111 - java? ( >=virtual/jdk-1.6 )
112 -"
113 -
114 -PATCHES=(
115 - "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
116 - "${FILESDIR}/${PN}-2.4.3-gcc47.patch"
117 - "${FILESDIR}/${PN}-2.4.2-cflags.patch"
118 - "${FILESDIR}/${PN}-2.4.8-javamagic.patch"
119 - "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
120 - "${FILESDIR}/${P}-git-autodetect.patch"
121 - "${FILESDIR}/${PN}-3.0.0-gles.patch"
122 - )
123 -
124 -pkg_setup() {
125 - use python && python-single-r1_pkg_setup
126 - java-pkg-opt-2_pkg_setup
127 -}
128 -
129 -src_prepare() {
130 - default
131 -
132 - # remove bundled stuff
133 - rm -rf 3rdparty || die "Removing 3rd party components failed"
134 - sed -i \
135 - -e '/add_subdirectory(3rdparty)/ d' \
136 - CMakeLists.txt || die
137 -
138 - java-pkg-opt-2_src_prepare
139 -}
140 -
141 -src_configure() {
142 - if use openmp; then
143 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
144 - fi
145 -
146 - JAVA_ANT_ENCODING="iso-8859-1"
147 - # set encoding so even this cmake build will pick it up.
148 - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
149 - java-ant-2_src_configure
150 -
151 - # please dont sort here, order is the same as in CMakeLists.txt
152 - local mycmakeargs=(
153 - # the optinal dependency libraries
154 - -DWITH_1394=$(usex ieee1394 ON OFF)
155 - -DWITH_AVFOUNDATION=OFF
156 - -DWITH_VTK=$(usex vtk ON OFF)
157 - -DWITH_EIGEN=$(usex eigen ON OFF)
158 - -DWITH_VFW=OFF
159 - -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
160 - -DWITH_GSTREAMER=$(usex gstreamer ON OFF)
161 - -DWITH_GSTREAMER_0_10=OFF
162 - -DWITH_GTK=$(usex gtk ON OFF)
163 - -DWITH_IMAGEIO=OFF
164 - -DWITH_IPP=$(usex ipp ON OFF)
165 - -DWITH_JASPER=$(usex jpeg2k ON OFF)
166 - -DWITH_JPEG=$(usex jpeg ON OFF)
167 - -DWITH_OPENEXR=$(usex openexr ON OFF)
168 - -DWITH_OPENGL=$(usex opengl ON OFF)
169 - -DWITH_OPENCL=$(usex opencl ON OFF)
170 - -DWITH_OPENNI=OFF
171 - -DWITH_PNG=$(usex png ON OFF)
172 - -DWITH_PVAPI=OFF
173 - -DWITH_GIGEAPI=OFF
174 - -DWITH_WIN32UI=OFF
175 - -DWITH_QUICKTIME=OFF
176 - -DWITH_TBB=$(usex threads ON OFF)
177 - -DWITH_OPENMP=$(usex openmp ON OFF)
178 - -DWITH_CSTRIPES=OFF
179 - -DWITH_TIFF=$(usex tiff ON OFF)
180 - -DWITH_UNICAP=OFF
181 - -DWITH_V4L=$(usex v4l ON OFF)
182 - -DWITH_LIBV4L=$(usex v4l ON OFF)
183 - -DWITH_DSHOW=ON
184 - -DWITH_MSMF=OFF
185 - -DWITH_XIMEA=OFF
186 - -DWITH_XINE=$(usex xine ON OFF)
187 - -DWITH_OPENCL=$(usex opencl ON OFF)
188 - -DWITH_OPENCLAMDFFT=$(usex opencl ON OFF)
189 - -DWITH_OPENCLAMDBLAS=$(usex opencl ON OFF)
190 - -DWITH_INTELPERC=OFF
191 - -DWITH_JAVA=$(usex java ON OFF)
192 -
193 - # the build components
194 - -DBUILD_SHARED_LIBS=ON
195 - -DBUILD_ANDROID_EXAMPLES=OFF
196 - -DBUILD_DOCS=OFF #too much dark magic in cmakelists
197 - -DBUILD_EXAMPLES=$(usex examples ON OFF)
198 - -DBUILD_PERF_TESTS=OFF
199 - -DBUILD_TESTS=$(usex testprograms ON OFF)
200 -
201 - # install examples
202 - -DINSTALL_C_EXAMPLES=$(usex examples ON OFF)
203 - -DINSTALL_TESTS=$(usex testprograms ON OFF)
204 -
205 - # build options
206 - -DENABLE_PRECOMPILED_HEADERS=$(usex pch ON OFF)
207 - -DENABLE_SOLUTION_FOLDERS=OFF
208 - -DENABLE_PROFILING=OFF
209 - -DENABLE_COVERAGE=OFF
210 - -DENABLE_OMIT_FRAME_POINTER=OFF
211 - -DENABLE_FAST_MATH=OFF #
212 - -DENABLE_SSE=OFF # these options do nothing but
213 - -DENABLE_SSE2=OFF # add params to CFLAGS
214 - -DENABLE_SSE3=OFF
215 - -DENABLE_SSSE3=OFF
216 - -DENABLE_SSE41=OFF
217 - -DENABLE_SSE42=OFF
218 -
219 - -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic
220 - )
221 -
222 - if use qt4; then
223 - mycmakeargs+=( -DWITH_QT=4 )
224 - elif use qt5; then
225 - mycmakeargs+=( -DWITH_QT=5 )
226 - else
227 - mycmakeargs+=( -DWITH_QT=OFF )
228 - fi
229 -
230 - if use cuda; then
231 - if [[ "$(gcc-version)" > "4.8" ]]; then
232 - # bug 577410
233 - # #error -- unsupported GNU version! gcc 4.9 and up are not supported!
234 - ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
235 - mycmakeargs+=( -DWITH_CUDA=OFF )
236 - mycmakeargs+=( -DWITH_CUBLAS=OFF )
237 - mycmakeargs+=( -DWITH_CUFFT=OFF )
238 -
239 - else
240 - mycmakeargs+=( -DWITH_CUDA=ON )
241 - mycmakeargs+=( -DWITH_CUBLAS=ON )
242 - mycmakeargs+=( -DWITH_CUFFT=ON )
243 - mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
244 - fi
245 - else
246 - mycmakeargs+=( -DWITH_CUDA=OFF )
247 - mycmakeargs+=( -DWITH_CUBLAS=OFF )
248 - mycmakeargs+=( -DWITH_CUFFT=OFF )
249 - fi
250 -
251 - if use examples && use python; then
252 - mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
253 - else
254 - mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
255 - fi
256 -
257 - # things we want to be hard off or not yet figured out
258 - mycmakeargs+=(
259 - -DOPENCV_BUILD_3RDPARTY_LIBS=OFF
260 - -DBUILD_PACKAGE=OFF
261 - )
262 -
263 - # things we want to be hard enabled not worth useflag
264 - mycmakeargs+=(
265 - -DCMAKE_SKIP_RPATH=ON
266 - -DOPENCV_DOC_INSTALL_PATH=
267 - )
268 -
269 - # workaround for bug 413429
270 - tc-export CC CXX
271 -
272 - cmake-utils_src_configure
273 -}