Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
Date: Thu, 02 Jun 2022 15:07:39
Message-Id: 1654181818.7d0d6669b10193e155bf9c8cf30eab47bc4b6ea6.ionen@gentoo
1 commit: 7d0d6669b10193e155bf9c8cf30eab47bc4b6ea6
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 13:24:15 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 14:56:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0d6669
7
8 media-sound/xmms2: drop 0.8_p20201016-r2
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 media-sound/xmms2/Manifest | 3 -
13 media-sound/xmms2/files/xmms2-0.8-rtvg.patch | 31 ---
14 .../files/xmms2-0.8_p20161122-cpp-client.patch | 16 --
15 .../xmms2/files/xmms2-0.8_p20161122-faad.patch | 16 --
16 .../xmms2/files/xmms2-0.8_p20161122-mac-4.patch | 38 ----
17 .../xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch | 127 -----------
18 media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild | 237 ---------------------
19 7 files changed, 468 deletions(-)
20
21 diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
22 index e49b5778f52a..39e87419b578 100644
23 --- a/media-sound/xmms2/Manifest
24 +++ b/media-sound/xmms2/Manifest
25 @@ -1,4 +1 @@
26 -DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
27 -DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
28 DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
29 -DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
30
31 diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
32 deleted file mode 100644
33 index e0a970c91869..000000000000
34 --- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
35 +++ /dev/null
36 @@ -1,31 +0,0 @@
37 -Add knob to disable valgrind at test runtime.
38 -
39 -When valgrind is installed in system but is not
40 -working we should still be able to run tests.
41 -
42 -Bug: https://bugs.gentoo.org/424377
43 ---- a/waftools/unittest.py
44 -+++ b/waftools/unittest.py
45 -@@ -64,7 +64,8 @@ def generate_coverage(bld):
46 -
47 - def configure(conf):
48 - conf.load("waf_unit_test")
49 -- conf.find_program("valgrind", var="VALGRIND", mandatory=False)
50 -+ if conf.options.enable_valgrind is True:
51 -+ conf.find_program("valgrind", var="VALGRIND", mandatory=False)
52 - conf.find_program("lcov", var="LCOV", mandatory=False)
53 - conf.find_program("genhtml", var="GENHTML", mandatory=False)
54 -
55 ---- a/wscript
56 -+++ b/wscript
57 -@@ -501,6 +501,10 @@ def options(opt):
58 - dest='ldconfig', help="Run ldconfig after install even if not root")
59 - opt.add_option('--without-ldconfig', action='store_false',
60 - dest='ldconfig', help="Don't run ldconfig after install")
61 -+ opt.add_option('--with-valgrind', action='store_true', default=None,
62 -+ dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
63 -+ opt.add_option('--without-valgrind', action='store_false', default=None,
64 -+ dest='enable_valgrind', help="Don't run testsuite under valgrind.")
65 -
66 - opt.sub_options("src/xmms")
67 - for o in optional_subdirs + subdirs:
68
69 diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
70 deleted file mode 100644
71 index df1d1c616576..000000000000
72 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
73 +++ /dev/null
74 @@ -1,16 +0,0 @@
75 -https://github.com/xmms2/xmms2-devel/pull/5
76 -
77 -From: Sergei Trofimovich <slyfox@g.o>
78 -Date: Thu, 6 Dec 2018 07:19:08 +0000
79 -Subject: [PATCH] OTHER: fix c++ client dangling reference
80 ---- a/src/include/xmmsclient/xmmsclient++/mainloop.h
81 -+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
82 -@@ -41,7 +41,7 @@ namespace Xmms
83 - * @note The constructor should only initialize the
84 - * mainloop, not start it!
85 - */
86 -- MainloopInterface( xmmsc_connection_t* conn ) :
87 -+ MainloopInterface( xmmsc_connection_t*& conn ) :
88 - running_( false ), conn_( conn ) { }
89 -
90 - /** Destructor. Should also stop the loop.
91
92 diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
93 deleted file mode 100644
94 index 2a206b913fe4..000000000000
95 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
96 +++ /dev/null
97 @@ -1,16 +0,0 @@
98 -This line has stopped working since security fixes in the faad 2.9.0
99 -release. XMMS2 upstream were informed via IRC but have yet to act on
100 -it. I've run XMMS2 with this patch for months without issue.
101 -
102 --- Chewi
103 -
104 ---- a/src/plugins/faad/faad.c
105 -+++ b/src/plugins/faad/faad.c
106 -@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
107 - * and durations calculations... So we cheat and tell libfaad2 we're feeding
108 - * it frame 1.
109 - */
110 -- NeAACDecPostSeekReset (data->decoder, 1);
111 -
112 - /* FIXME: Because for HE AAC files some versions of libfaad return the wrong
113 - * samplerate in init, we have to do one read and let it decide the real
114
115 diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
116 deleted file mode 100644
117 index 9785b4198d51..000000000000
118 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
119 +++ /dev/null
120 @@ -1,38 +0,0 @@
121 -https://github.com/xmms2/xmms2-devel/pull/2
122 -
123 -From: Jérôme Carretero <cJ@××××××××.eu>
124 -Date: Tue, 24 Oct 2017 18:43:26 -0400
125 -Subject: [PATCH] plugins: mac: support newer mac API version
126 ---- a/src/plugins/mac/mac.cpp
127 -+++ b/src/plugins/mac/mac.cpp
128 -@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
129 - gchar *name;
130 -
131 - field_name = pTagField->GetFieldName ();
132 -- name = (gchar *)GetUTF8FromUTF16 (field_name);
133 -
134 -+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
135 -+ name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
136 -+#else
137 -+ name = (gchar *)GetUTF8FromUTF16 (field_name);
138 -+#endif
139 - memset (field_value, 0, 255);
140 - int size = 255;
141 - p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
142 ---- a/src/plugins/mac/source_adapter.h
143 -+++ b/src/plugins/mac/source_adapter.h
144 -@@ -38,7 +38,13 @@ public:
145 - ~CSourceAdapter () {};
146 -
147 - // open / close
148 -- int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
149 -+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
150 -+ int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
151 -+#else
152 -+ int Open (const wchar_t * pName)
153 -+#endif
154 -+ { return ERROR_SUCCESS; }
155 -+
156 - int Close () { return ERROR_SUCCESS; }
157 -
158 - // read / write
159
160 diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
161 deleted file mode 100644
162 index b338e57cdfca..000000000000
163 --- a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
164 +++ /dev/null
165 @@ -1,127 +0,0 @@
166 -Lazy migration from audio4 that's missing in ffmpeg5, may not be
167 -entirely right but tested to play at least .tta/.wma properly.
168 -
169 -https://github.com/xmms2/xmms2-devel/pull/11
170 -
171 -Bug: https://bugs.gentoo.org/834398
172 -Signed-off-by: Ionen Wolkens <ionen@g.o>
173 ---- a/src/plugins/avcodec/avcodec.c
174 -+++ b/src/plugins/avcodec/avcodec.c
175 -@@ -32,4 +32,5 @@
176 - typedef struct {
177 - AVCodecContext *codecctx;
178 -+ AVPacket packet;
179 -
180 - guchar *buffer;
181 -@@ -150,4 +151,5 @@
182 - data->buffer_size = AVCODEC_BUFFER_SIZE;
183 - data->codecctx = NULL;
184 -+ data->packet.size = 0;
185 -
186 - data->read_out_frame = av_frame_alloc ();
187 -@@ -155,6 +157,4 @@
188 - xmms_xform_private_data_set (xform, data);
189 -
190 -- avcodec_register_all ();
191 --
192 - mimetype = xmms_xform_indata_get_str (xform,
193 - XMMS_STREAM_TYPE_MIMETYPE);
194 -@@ -467,43 +467,35 @@
195 - xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
196 - {
197 -- int got_frame = 0;
198 -- gint bytes_read = 0;
199 -- AVPacket packet;
200 -+ int rc = 0;
201 -
202 -- av_init_packet (&packet);
203 -- packet.data = data->buffer;
204 -- packet.size = data->buffer_length;
205 --
206 -- /* clear buffers and reset fields to defaults */
207 -- av_frame_unref (data->read_out_frame);
208 --
209 -- bytes_read = avcodec_decode_audio4 (
210 -- data->codecctx, data->read_out_frame, &got_frame, &packet);
211 --
212 -- /* The DTS decoder of ffmpeg is buggy and always returns
213 -- * the input buffer length, get frame length from header */
214 -- /* FIXME: Is ^^^^ still true? */
215 -- if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
216 -- bytes_read = ((int)data->buffer[5] << 12) |
217 -- ((int)data->buffer[6] << 4) |
218 -- ((int)data->buffer[7] >> 4);
219 -- bytes_read = (bytes_read & 0x3fff) + 1;
220 -+ if (data->packet.size == 0) {
221 -+ av_init_packet (&data->packet);
222 -+ data->packet.data = data->buffer;
223 -+ data->packet.size = data->buffer_length;
224 -+
225 -+ rc = avcodec_send_packet(data->codecctx, &data->packet);
226 -+ if (rc == AVERROR_EOF)
227 -+ rc = 0;
228 -+ }
229 -+
230 -+ if (rc == 0) {
231 -+ rc = avcodec_receive_frame(data->codecctx, data->read_out_frame);
232 -+ if (rc < 0) {
233 -+ data->packet.size = 0;
234 -+ data->buffer_length = 0;
235 -+ if (rc == AVERROR(EAGAIN)) rc = 0;
236 -+ else if (rc == AVERROR_EOF) rc = 1;
237 -+ }
238 -+ else
239 -+ rc = 1;
240 - }
241 -
242 -- if (bytes_read < 0 || bytes_read > data->buffer_length) {
243 -+ if (rc < 0) {
244 -+ data->packet.size = 0;
245 - XMMS_DBG ("Error decoding data!");
246 - return -1;
247 - }
248 -
249 -- if (bytes_read < data->buffer_length) {
250 -- data->buffer_length -= bytes_read;
251 -- g_memmove (data->buffer,
252 -- data->buffer + bytes_read,
253 -- data->buffer_length);
254 -- } else {
255 -- data->buffer_length = 0;
256 -- }
257 --
258 -- return got_frame ? 1 : 0;
259 -+ return rc;
260 - }
261 -
262 ---- a/src/plugins/avcodec/wscript
263 -+++ b/src/plugins/avcodec/wscript
264 -@@ -2,5 +2,5 @@
265 -
266 - ## Code fragments for configuration
267 --avcodec_decode_audio4_fragment = """
268 -+avcodec_send_packet_fragment = """
269 - #ifdef HAVE_LIBAVCODEC_AVCODEC_H
270 - # include "libavcodec/avcodec.h"
271 -@@ -10,9 +10,7 @@
272 - int main(void) {
273 - AVCodecContext *ctx;
274 -- AVFrame *frame;
275 -- int got_frame;
276 - AVPacket *pkt;
277 -
278 -- avcodec_decode_audio4 (ctx, frame, &got_frame, pkt);
279 -+ avcodec_send_packet (ctx, pkt);
280 -
281 - return 0;
282 -@@ -44,7 +42,7 @@
283 - # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
284 - # * libav: commit 0eea212, lavc 53.25.0, release 0.8
285 -- conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
286 -- uselib_store="avcodec_decode_audio4",
287 -- msg="Checking for function avcodec_decode_audio4", mandatory=True)
288 -+ conf.check_cc(fragment=avcodec_send_packet_fragment, uselib="avcodec",
289 -+ uselib_store="avcodec_send_packet",
290 -+ msg="Checking for function avcodec_send_packet", mandatory=True)
291 -
292 - # non-mandatory function avcodec_free_frame since
293
294 diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
295 deleted file mode 100644
296 index 0edb6f31cd7f..000000000000
297 --- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
298 +++ /dev/null
299 @@ -1,237 +0,0 @@
300 -# Copyright 1999-2022 Gentoo Authors
301 -# Distributed under the terms of the GNU General Public License v2
302 -
303 -EAPI=8
304 -
305 -PYTHON_COMPAT=( python3_{8..10} )
306 -inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
307 -
308 -XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb"
309 -S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59"
310 -WAF_VER="2.0.22"
311 -
312 -DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
313 -HOMEPAGE="https://github.com/XMMS2"
314 -SRC_URI="
315 - https://github.com/xmms2/xmms2-devel/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz
316 - https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz
317 - https://waf.io/waf-${WAF_VER}.tar.bz2"
318 -S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
319 -
320 -LICENSE="GPL-2+ LGPL-2.1+"
321 -SLOT="0"
322 -KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
323 -
324 -# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
325 -# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
326 -XMMS2_OPTIONALS=(
327 - cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
328 - :nycli perl :pixmaps python server:s4 test:tests
329 - # disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore
330 -)
331 -XMMS2_PLUGINS=(
332 - aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer
333 - ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
334 - gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug
335 - mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls
336 - pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
337 - :wave wavpack :xml xml:rss,xspf zeroconf:daap
338 - # disabled: coreaudio,gvfs,nms,sc68,sun,waveout
339 -)
340 -
341 -IUSE="
342 - ${XMMS2_OPTIONALS[@]%:*}
343 - ${XMMS2_PLUGINS[@]%:*}
344 - +server valgrind"
345 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
346 -RESTRICT="!test? ( test ) !server? ( test )"
347 -
348 -COMMON_DEPEND="
349 - dev-libs/glib:2
350 - sys-libs/readline:=
351 - server? (
352 - aac? ( media-libs/faad2 )
353 - airplay? ( dev-libs/openssl:= )
354 - alsa? ( media-libs/alsa-lib )
355 - ao? ( media-libs/libao )
356 - cdda? (
357 - dev-libs/libcdio-paranoia:=
358 - dev-libs/libcdio:=
359 - media-libs/libdiscid
360 - )
361 - curl? ( net-misc/curl )
362 - ffmpeg? ( media-video/ffmpeg:= )
363 - flac? ( media-libs/flac )
364 - fluidsynth? ( media-sound/fluidsynth:= )
365 - gme? ( media-libs/game-music-emu )
366 - ices? (
367 - media-libs/libogg
368 - media-libs/libshout
369 - media-libs/libvorbis
370 - )
371 - jack? ( virtual/jack )
372 - mac? ( media-sound/mac )
373 - mad? ( media-libs/libmad )
374 - mms? (
375 - media-libs/libmms
376 - media-video/ffmpeg:=
377 - )
378 - modplug? ( media-libs/libmodplug )
379 - mp3? ( media-sound/mpg123 )
380 - musepack? ( media-sound/musepack-tools )
381 - ofa? (
382 - dev-libs/expat
383 - media-libs/libofa
384 - sci-libs/fftw:3.0=
385 - )
386 - opus? (
387 - media-libs/libogg
388 - media-libs/opus
389 - media-libs/opusfile
390 - )
391 - pulseaudio? ( media-sound/pulseaudio )
392 - samba? ( net-fs/samba )
393 - sid? ( media-libs/libsidplay:2 )
394 - sndfile? ( media-libs/libsndfile )
395 - speex? (
396 - media-libs/libogg
397 - media-libs/speex
398 - )
399 - tremor? ( media-libs/tremor )
400 - vocoder? (
401 - media-libs/libsamplerate
402 - sci-libs/fftw:3.0=
403 - )
404 - vorbis? ( media-libs/libvorbis )
405 - wavpack? ( media-sound/wavpack )
406 - xml? ( dev-libs/libxml2 )
407 - zeroconf? (
408 - net-dns/avahi[mdnsresponder-compat]
409 - net-misc/curl
410 - )
411 - )
412 - python? ( virtual/libcrypt:= )"
413 -RDEPEND="
414 - ${COMMON_DEPEND}
415 - perl? (
416 - dev-lang/perl
417 - dev-perl/glib-perl
418 - virtual/perl-Carp
419 - virtual/perl-IO
420 - virtual/perl-Scalar-List-Utils
421 - )
422 - python? (
423 - ${PYTHON_DEPS}
424 - $(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
425 - )"
426 -DEPEND="
427 - ${COMMON_DEPEND}
428 - cxx? ( dev-libs/boost )
429 - test? ( dev-util/cunit )"
430 -BDEPEND="
431 - ${PYTHON_DEPS}
432 - virtual/pkgconfig
433 - perl? ( dev-perl/Pod-Parser )
434 - python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
435 - test? ( valgrind? ( dev-util/valgrind ) )"
436 -
437 -PATCHES=(
438 - "${FILESDIR}"/${PN}-0.8-rtvg.patch
439 - "${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch
440 - "${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch
441 - "${FILESDIR}"/${PN}-0.8_p20161122-faad.patch
442 - "${FILESDIR}"/${P}-ffmpeg5.patch
443 -)
444 -
445 -src_prepare() {
446 - rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die
447 - mv ../waf-${WAF_VER}/waf{,lib} . || die
448 -
449 - default
450 -
451 - sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
452 - -i src/plugins/fluidsynth/fluidsynth.c || die
453 -}
454 -
455 -src_configure() {
456 - local waf=(
457 - ./waf configure
458 - --prefix="${EPREFIX}"/usr
459 - --libdir="${EPREFIX}"/usr/$(get_libdir)
460 - --boost-includes="${ESYSROOT}"/usr/include # needed for prefix
461 - --with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})"
462 - --with-target-platform="${CHOST}"
463 - )
464 -
465 - xmms2_flag() {
466 - local IFS=:
467 - set -- ${1#+}
468 -
469 - if [[ ${1} ]]; then
470 - usev ${1} ,${2:-${1}}
471 - else
472 - echo ,${2}
473 - fi
474 - }
475 -
476 - local flag optionals plugins
477 -
478 - if use server; then
479 - for flag in "${XMMS2_PLUGINS[@]}"; do
480 - plugins+=$(xmms2_flag ${flag})
481 - done
482 - else
483 - waf+=( --without-xmms2d )
484 - fi
485 -
486 - for flag in "${XMMS2_OPTIONALS[@]}"; do
487 - optionals+=$(xmms2_flag ${flag})
488 - done
489 -
490 - waf+=(
491 - # pass even if empty to avoid automagic
492 - --with-optionals=${optionals:1}
493 - --with-plugins=${plugins:1}
494 - )
495 -
496 - if use perl; then
497 - perl_set_version
498 - waf+=( --with-perl-archdir="${ARCH_LIB}" )
499 - fi
500 -
501 - if use valgrind; then
502 - if valgrind true &>/dev/null; then
503 - waf+=( --with-valgrind )
504 - else
505 - ewarn "valgrind was disabled due to failing a basic sanity check" #807271
506 - fi
507 - fi
508 -
509 - tc-export AR CC CXX
510 -
511 - echo "${waf[*]}"
512 - "${waf[@]}" || die
513 -}
514 -
515 -src_compile() {
516 - ./waf build -j$(makeopts_jobs) --verbose --notests || die
517 -}
518 -
519 -src_test() {
520 - ./waf --alltests || die
521 -}
522 -
523 -src_install() {
524 - ./waf install --destdir="${D}" --without-ldconfig --notests || die
525 -
526 - einstalldocs
527 -
528 - use python && python_optimize
529 -
530 - # to avoid editing waftools/man.py (use find given not always installed)
531 - find "${ED}" -name '*.gz' -exec gzip -d {} + || die
532 -}
533 -
534 -pkg_postinst() {
535 - use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
536 -}