Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/
Date: Sat, 06 Oct 2018 19:45:41
Message-Id: 1538855114.640bb6cccb3c071724ae448942c4e37e9d6821f0.asturm@gentoo
1 commit: 640bb6cccb3c071724ae448942c4e37e9d6821f0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 6 19:33:01 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 6 19:45:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640bb6cc
7
8 media-libs/aubio: Security cleanup
9
10 Bug: https://bugs.gentoo.org/667510
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.11
13
14 media-libs/aubio/Manifest | 3 -
15 media-libs/aubio/aubio-0.4.1-r1.ebuild | 104 --------------------
16 media-libs/aubio/aubio-0.4.2-r1.ebuild | 105 --------------------
17 media-libs/aubio/aubio-0.4.6.ebuild | 111 ----------------------
18 media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch | 22 -----
19 media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch | 13 ---
20 6 files changed, 358 deletions(-)
21
22 diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
23 index 6a455a6bc03..b4ed4a63e48 100644
24 --- a/media-libs/aubio/Manifest
25 +++ b/media-libs/aubio/Manifest
26 @@ -1,4 +1 @@
27 -DIST aubio-0.4.1.tar.bz2 288136 BLAKE2B ba7368fab21fec73dc555ea0d7291eea010a415d8bc77601337cf311277f3c82564c2f021b971a4117a3f99ab69e7a61e55b8ee488ca24b9b5319ab4a00a3a6b SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c
28 -DIST aubio-0.4.2.tar.bz2 304216 BLAKE2B aab7e55d580105e6180503503ae2970d150d86e445d5c1b10d3f39c8cdf7496d0c280a57a2fc7ad3ea5142996d56c53cd2e1c6f736fb1a98b9b142438c919e04 SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff
29 -DIST aubio-0.4.6.tar.bz2 363016 BLAKE2B 3847ed02b7d64d9796bd1f5a06044d945f5859ab87a762978bf2b0b6650cc0e19c9b8eec99a793e14dd25c06f66d2bffd453ecca824fbc5f47700fda7f78854b SHA512 0e5cab0c88d51f2fb70c0d85e1c067a7b3758fbffdbd5026686726379aa36203adb63ed3f8e40c83ea02930e0ffc4e6c246803f1d518d448d47a01984678e77d
30 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
31
32 diff --git a/media-libs/aubio/aubio-0.4.1-r1.ebuild b/media-libs/aubio/aubio-0.4.1-r1.ebuild
33 deleted file mode 100644
34 index 59a64870fc8..00000000000
35 --- a/media-libs/aubio/aubio-0.4.1-r1.ebuild
36 +++ /dev/null
37 @@ -1,104 +0,0 @@
38 -# Copyright 1999-2017 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=5
42 -
43 -DISTUTILS_OPTIONAL=1
44 -PYTHON_COMPAT=( python2_7 )
45 -PYTHON_REQ_USE='threads(+)'
46 -
47 -inherit distutils-r1 waf-utils multilib eutils
48 -
49 -DESCRIPTION="Library for audio labelling"
50 -HOMEPAGE="https://aubio.org/"
51 -SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
52 -
53 -LICENSE="GPL-3"
54 -SLOT="0"
55 -KEYWORDS="amd64 ~ppc ppc64 sparc x86"
56 -IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python"
57 -
58 -RDEPEND="
59 - ffmpeg? ( virtual/ffmpeg )
60 - fftw? ( sci-libs/fftw:3.0 )
61 - jack? ( virtual/jack )
62 - libsamplerate? ( media-libs/libsamplerate )
63 - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
64 - sndfile? ( media-libs/libsndfile )"
65 -DEPEND="${RDEPEND}
66 - ${PYTHON_DEPS}
67 - virtual/pkgconfig
68 - app-text/txt2man
69 - doc? ( app-doc/doxygen )"
70 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
71 -
72 -DOCS=( AUTHORS ChangeLog README.md )
73 -PYTHON_SRC_DIR="${S}/python"
74 -
75 -src_prepare() {
76 - sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die
77 - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
78 - has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}/${PN}-0.4.1-ffmpeg29.patch"
79 -}
80 -
81 -src_configure() {
82 - python_setup
83 - waf-utils_src_configure \
84 - --enable-complex \
85 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
86 - $(use_enable double-precision double) \
87 - $(use_enable fftw fftw3f) \
88 - $(use_enable fftw fftw3) \
89 - $(use_enable ffmpeg avcodec) \
90 - $(use_enable jack) \
91 - $(use_enable libsamplerate samplerate) \
92 - $(use_enable sndfile)
93 -
94 - if use python ; then
95 - cd "${PYTHON_SRC_DIR}" || die
96 - distutils-r1_src_configure
97 - fi
98 -}
99 -
100 -src_compile() {
101 - waf-utils_src_compile --notests
102 -
103 - if use doc; then
104 - cd "${S}"/doc || die
105 - doxygen full.cfg || die
106 - fi
107 -
108 - if use python ; then
109 - cd "${PYTHON_SRC_DIR}" || die
110 - distutils-r1_src_compile
111 - fi
112 -}
113 -
114 -src_test() {
115 - waf-utils_src_compile --alltests
116 -
117 - if use python ; then
118 - cd "${PYTHON_SRC_DIR}" || die
119 - distutils-r1_src_test
120 - fi
121 -}
122 -
123 -src_install() {
124 - waf-utils_src_install
125 -
126 - if use python ; then
127 - cd "${PYTHON_SRC_DIR}" || die
128 - DOCS="" distutils-r1_src_install
129 - newdoc README README.python
130 - fi
131 -
132 - if use doc; then
133 - dohtml -r doc/full/html/.
134 - dodoc doc/*.txt
135 - fi
136 -
137 - if use examples; then
138 - # install dist_noinst_SCRIPTS from Makefile.am
139 - dodoc -r examples
140 - fi
141 -}
142
143 diff --git a/media-libs/aubio/aubio-0.4.2-r1.ebuild b/media-libs/aubio/aubio-0.4.2-r1.ebuild
144 deleted file mode 100644
145 index 47feb82207d..00000000000
146 --- a/media-libs/aubio/aubio-0.4.2-r1.ebuild
147 +++ /dev/null
148 @@ -1,105 +0,0 @@
149 -# Copyright 1999-2017 Gentoo Foundation
150 -# Distributed under the terms of the GNU General Public License v2
151 -
152 -EAPI=5
153 -
154 -DISTUTILS_OPTIONAL=1
155 -PYTHON_COMPAT=( python2_7 )
156 -PYTHON_REQ_USE='threads(+)'
157 -
158 -inherit distutils-r1 waf-utils multilib eutils
159 -
160 -DESCRIPTION="Library for audio labelling"
161 -HOMEPAGE="https://aubio.org/"
162 -SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
163 -
164 -LICENSE="GPL-3"
165 -SLOT="0"
166 -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
167 -IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
168 -
169 -RDEPEND="
170 - ffmpeg? (
171 - !libav? ( >=media-video/ffmpeg-2.6:0= )
172 - libav? ( >=media-video/libav-9:0= )
173 - )
174 - fftw? ( sci-libs/fftw:3.0 )
175 - jack? ( virtual/jack )
176 - libsamplerate? ( media-libs/libsamplerate )
177 - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
178 - sndfile? ( media-libs/libsndfile )"
179 -DEPEND="${RDEPEND}
180 - ${PYTHON_DEPS}
181 - virtual/pkgconfig
182 - app-text/txt2man
183 - doc? ( app-doc/doxygen )"
184 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
185 -
186 -DOCS=( AUTHORS ChangeLog README.md )
187 -PYTHON_SRC_DIR="${S}/python"
188 -
189 -src_prepare() {
190 - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
191 -}
192 -
193 -src_configure() {
194 - python_setup
195 - waf-utils_src_configure \
196 - --enable-complex \
197 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
198 - $(use_enable double-precision double) \
199 - $(use_enable fftw fftw3f) \
200 - $(use_enable fftw fftw3) \
201 - $(use_enable ffmpeg avcodec) \
202 - $(use_enable jack) \
203 - $(use_enable libsamplerate samplerate) \
204 - $(use_enable sndfile)
205 -
206 - if use python ; then
207 - cd "${PYTHON_SRC_DIR}" || die
208 - distutils-r1_src_configure
209 - fi
210 -}
211 -
212 -src_compile() {
213 - waf-utils_src_compile --notests
214 -
215 - if use doc; then
216 - cd "${S}"/doc || die
217 - doxygen full.cfg || die
218 - fi
219 -
220 - if use python ; then
221 - cd "${PYTHON_SRC_DIR}" || die
222 - distutils-r1_src_compile
223 - fi
224 -}
225 -
226 -src_test() {
227 - waf-utils_src_compile --alltests
228 -
229 - if use python ; then
230 - cd "${PYTHON_SRC_DIR}" || die
231 - distutils-r1_src_test
232 - fi
233 -}
234 -
235 -src_install() {
236 - waf-utils_src_install
237 -
238 - if use doc; then
239 - dohtml -r doc/full/html/.
240 - dodoc doc/*.txt
241 - fi
242 -
243 - if use examples; then
244 - # install dist_noinst_SCRIPTS from Makefile.am
245 - dodoc -r examples
246 - fi
247 -
248 - if use python ; then
249 - cd "${PYTHON_SRC_DIR}" || die
250 - DOCS="" distutils-r1_src_install
251 - newdoc README README.python
252 - fi
253 -}
254
255 diff --git a/media-libs/aubio/aubio-0.4.6.ebuild b/media-libs/aubio/aubio-0.4.6.ebuild
256 deleted file mode 100644
257 index 9c6af6537ba..00000000000
258 --- a/media-libs/aubio/aubio-0.4.6.ebuild
259 +++ /dev/null
260 @@ -1,111 +0,0 @@
261 -# Copyright 1999-2018 Gentoo Foundation
262 -# Distributed under the terms of the GNU General Public License v2
263 -
264 -EAPI=6
265 -
266 -DISTUTILS_OPTIONAL=1
267 -PYTHON_COMPAT=( python2_7 )
268 -PYTHON_REQ_USE='threads(+)'
269 -
270 -inherit distutils-r1 waf-utils multilib eutils
271 -
272 -DESCRIPTION="Library for audio labelling"
273 -HOMEPAGE="https://aubio.org/"
274 -SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
275 -
276 -LICENSE="GPL-3"
277 -SLOT="0/5"
278 -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
279 -IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
280 -
281 -RDEPEND="
282 - ffmpeg? (
283 - !libav? ( >=media-video/ffmpeg-2.6:0= )
284 - libav? ( >=media-video/libav-9:0= )
285 - )
286 - fftw? ( sci-libs/fftw:3.0 )
287 - jack? ( virtual/jack )
288 - libsamplerate? ( media-libs/libsamplerate )
289 - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
290 - sndfile? ( media-libs/libsndfile )
291 -"
292 -DEPEND="
293 - ${RDEPEND}
294 - ${PYTHON_DEPS}
295 - app-text/txt2man
296 - virtual/pkgconfig
297 - doc? ( app-doc/doxygen )
298 -"
299 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
300 -
301 -DOCS=( AUTHORS ChangeLog README.md )
302 -PYTHON_SRC_DIR="${S}"
303 -PATCHES=( "${FILESDIR}/${PN}-0.4.6-ffmpeg4.patch" )
304 -
305 -src_prepare() {
306 - default
307 - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
308 -}
309 -
310 -src_configure() {
311 - python_setup
312 - waf-utils_src_configure \
313 - --enable-complex \
314 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
315 - $(use_enable double-precision double) \
316 - $(use_enable fftw fftw3f) \
317 - $(use_enable fftw fftw3) \
318 - $(use_enable ffmpeg avcodec) \
319 - $(use_enable jack) \
320 - $(use_enable libsamplerate samplerate) \
321 - $(use_enable sndfile)
322 -
323 - if use python ; then
324 - cd "${PYTHON_SRC_DIR}" || die
325 - distutils-r1_src_configure
326 - fi
327 -}
328 -
329 -src_compile() {
330 - waf-utils_src_compile --notests
331 -
332 - if use doc; then
333 - cd "${S}"/doc || die
334 - emake dirhtml
335 - fi
336 -
337 - if use python ; then
338 - cd "${PYTHON_SRC_DIR}" || die
339 - distutils-r1_src_compile
340 - fi
341 -}
342 -
343 -src_test() {
344 - waf-utils_src_compile --alltests
345 -
346 - if use python ; then
347 - cd "${PYTHON_SRC_DIR}" || die
348 - distutils-r1_src_test
349 - fi
350 -}
351 -
352 -src_install() {
353 - waf-utils_src_install
354 -
355 - if use examples; then
356 - # install dist_noinst_SCRIPTS from Makefile.am
357 - dodoc -r examples
358 - fi
359 -
360 - if use python ; then
361 - cd "${PYTHON_SRC_DIR}" || die
362 - DOCS="" distutils-r1_src_install
363 - newdoc python/README.md README.python
364 - fi
365 -
366 - if use doc; then
367 - dodoc doc/*.txt
368 - docinto html
369 - dodoc -r doc/_build/dirhtml/.
370 - fi
371 -}
372
373 diff --git a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
374 deleted file mode 100644
375 index 86562716d3e..00000000000
376 --- a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
377 +++ /dev/null
378 @@ -1,22 +0,0 @@
379 -Index: aubio-0.4.1/src/io/source_avcodec.c
380 -===================================================================
381 ---- aubio-0.4.1.orig/src/io/source_avcodec.c
382 -+++ aubio-0.4.1/src/io/source_avcodec.c
383 -@@ -167,7 +167,7 @@ aubio_source_avcodec_t * new_aubio_sourc
384 - }
385 -
386 - AVFrame *avFrame = s->avFrame;
387 -- avFrame = avcodec_alloc_frame();
388 -+ avFrame = av_frame_alloc();
389 - if (!avFrame) {
390 - AUBIO_ERR("source_avcodec: Could not allocate frame for (%s)\n", s->path);
391 - }
392 -@@ -415,7 +415,7 @@ void del_aubio_source_avcodec(aubio_sour
393 - }
394 - s->output = NULL;
395 - if (s->avFrame != NULL) {
396 -- avcodec_free_frame( &(s->avFrame) );
397 -+ av_frame_free( &(s->avFrame) );
398 - }
399 - s->avFrame = NULL;
400 - AUBIO_FREE(s);
401
402 diff --git a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
403 deleted file mode 100644
404 index 7df4665655b..00000000000
405 --- a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
406 +++ /dev/null
407 @@ -1,13 +0,0 @@
408 -Index: aubio-0.4.6/src/io/source_avcodec.c
409 -===================================================================
410 ---- aubio-0.4.6.orig/src/io/source_avcodec.c
411 -+++ aubio-0.4.6/src/io/source_avcodec.c
412 -@@ -58,7 +58,7 @@
413 - #include "fmat.h"
414 - #include "source_avcodec.h"
415 -
416 --#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
417 -+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
418 -
419 - struct _aubio_source_avcodec_t {
420 - uint_t hop_size;