Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mpd: mpd-0.17.6.ebuild mpd-0.18.ebuild metadata.xml ChangeLog mpd-0.17.4.ebuild mpd-0.16.8.ebuild mpd-0.17.3.ebuild
Date: Thu, 31 Oct 2013 12:50:54
Message-Id: 20131031125049.8741E20047@flycatcher.gentoo.org
1 angelos 13/10/31 12:50:49
2
3 Modified: metadata.xml ChangeLog
4 Added: mpd-0.17.6.ebuild mpd-0.18.ebuild
5 Removed: mpd-0.17.4.ebuild mpd-0.16.8.ebuild
6 mpd-0.17.3.ebuild
7 Log:
8 Version bump, remove old
9
10 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)
11
12 Revision Changes Path
13 1.26 media-sound/mpd/metadata.xml
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/metadata.xml?rev=1.26&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/metadata.xml?rev=1.26&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/metadata.xml?r1=1.25&r2=1.26
18
19 Index: metadata.xml
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/metadata.xml,v
22 retrieving revision 1.25
23 retrieving revision 1.26
24 diff -u -r1.25 -r1.26
25 --- metadata.xml 12 Sep 2013 12:29:33 -0000 1.25
26 +++ metadata.xml 31 Oct 2013 12:50:49 -0000 1.26
27 @@ -11,8 +11,8 @@
28 <name>Markos Chandras</name>
29 </maintainer>
30 <use>
31 + <flag name="adplug">Enable the AdPlug decoder plugin</flag>
32 <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
33 - <flag name="cue">Support CUE Sheet Parser Library</flag>
34 <flag name="curl">Support for web stream listening</flag>
35 <flag name="faad">Use external faad library for AAC decoding</flag>
36 <flag name="fifo">Support writing audio to a FIFO</flag>
37 @@ -22,7 +22,9 @@
38 <flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
39 <flag name="lame">Support for MP3 streaming via Icecast2</flag>
40 <flag name="lastfmradio">Support listening to last.fm radio stations</flag>
41 + <flag name="libmpdclient">Enable support for remote mpd databases</flag>
42 <flag name="network">Enables network streaming support</flag>
43 + <flag name="opus">Enable Opus codec support</flag>
44 <flag name="pipe">Support writing audio to a pipe</flag>
45 <flag name="recorder">Enables output plugin for recording radio streams</flag>
46 <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
47
48
49
50 1.321 media-sound/mpd/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.321&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.321&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?r1=1.320&r2=1.321
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v
59 retrieving revision 1.320
60 retrieving revision 1.321
61 diff -u -r1.320 -r1.321
62 --- ChangeLog 12 Sep 2013 12:29:33 -0000 1.320
63 +++ ChangeLog 31 Oct 2013 12:50:49 -0000 1.321
64 @@ -1,6 +1,14 @@
65 # ChangeLog for media-sound/mpd
66 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.320 2013/09/12 12:29:33 angelos Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.321 2013/10/31 12:50:49 angelos Exp $
69 +
70 +*mpd-0.18 (31 Oct 2013)
71 +*mpd-0.17.6 (31 Oct 2013)
72 +
73 + 31 Oct 2013; Christoph Mende <angelos@g.o> +mpd-0.17.6.ebuild,
74 + +mpd-0.18.ebuild, -mpd-0.16.8.ebuild, -mpd-0.17.3.ebuild, -mpd-0.17.4.ebuild,
75 + metadata.xml:
76 + Version bump, remove old
77
78 *mpd-0.17.5 (12 Sep 2013)
79
80
81
82
83 1.1 media-sound/mpd/mpd-0.17.6.ebuild
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild?rev=1.1&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild?rev=1.1&content-type=text/plain
87
88 Index: mpd-0.17.6.ebuild
89 ===================================================================
90 # Copyright 1999-2013 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 # $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.6.ebuild,v 1.1 2013/10/31 12:50:49 angelos Exp $
93
94 EAPI=4
95 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
96
97 DESCRIPTION="The Music Player Daemon (mpd)"
98 HOMEPAGE="http://www.musicpd.org"
99 SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
100
101 LICENSE="GPL-2"
102 SLOT="0"
103 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
104 IUSE="+alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
105 fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
106 mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
107 sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
108 wildmidi zeroconf zip"
109
110 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
111 INPUT_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123
112 musepack ogg flac sid vorbis wavpack wildmidi"
113 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
114
115 REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
116 || ( ${INPUT_PLUGINS} )
117 network? ( || ( ${ENCODER_PLUGINS} ) )
118 recorder? ( || ( ${ENCODER_PLUGINS} ) )
119 lastfmradio? ( curl )"
120
121 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
122 dev-libs/glib:2
123 alsa? ( media-sound/alsa-utils
124 media-libs/alsa-lib )
125 ao? ( media-libs/libao[alsa?,pulseaudio?] )
126 audiofile? ( media-libs/audiofile )
127 bzip2? ( app-arch/bzip2 )
128 cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
129 curl? ( net-misc/curl )
130 faad? ( media-libs/faad2 )
131 ffmpeg? ( virtual/ffmpeg )
132 flac? ( media-libs/flac[ogg?] )
133 fluidsynth? ( media-sound/fluidsynth )
134 gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
135 id3tag? ( media-libs/libid3tag )
136 jack? ( media-sound/jack-audio-connection-kit )
137 lame? ( network? ( media-sound/lame ) )
138 libsamplerate? ( media-libs/libsamplerate )
139 mad? ( media-libs/libmad )
140 mikmod? ( media-libs/libmikmod:0 )
141 mms? ( media-libs/libmms )
142 modplug? ( media-libs/libmodplug )
143 mpg123? ( >=media-sound/mpg123-1.12.2 )
144 musepack? ( media-sound/musepack-tools )
145 network? ( >=media-libs/libshout-2
146 !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
147 ogg? ( media-libs/libogg )
148 openal? ( media-libs/openal )
149 pulseaudio? ( media-sound/pulseaudio )
150 sid? ( media-libs/libsidplay:2 )
151 sndfile? ( media-libs/libsndfile )
152 soundcloud? ( >=dev-libs/yajl-2 )
153 soup? ( net-libs/libsoup:2.4 )
154 sqlite? ( dev-db/sqlite:3 )
155 systemd? ( sys-apps/systemd )
156 tcpd? ( sys-apps/tcp-wrappers )
157 twolame? ( media-sound/twolame )
158 vorbis? ( media-libs/libvorbis )
159 wavpack? ( media-sound/wavpack )
160 wildmidi? ( media-sound/wildmidi )
161 zeroconf? ( net-dns/avahi[dbus] )
162 zip? ( dev-libs/zziplib )"
163 DEPEND="${RDEPEND}
164 virtual/pkgconfig"
165
166 pkg_setup() {
167 use network || ewarn "Icecast and Shoutcast streaming needs networking."
168 use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
169
170 enewuser mpd "" "" "/var/lib/mpd" audio
171
172 if use inotify; then
173 CONFIG_CHECK="~INOTIFY_USER"
174 ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
175 linux-info_pkg_setup
176 fi
177 }
178
179 src_prepare() {
180 DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
181 sure that MPD's pid_file is unset."
182
183 cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
184 epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
185 "${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch
186
187 if has_version dev-libs/libcdio-paranoia; then
188 sed -i \
189 -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
190 src/input/cdio_paranoia_input_plugin.c || die
191 fi
192 }
193
194 src_configure() {
195 local mpdconf="--disable-despotify --disable-documentation --disable-ffado
196 --disable-mvp --disable-roar --enable-largefile
197 --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
198
199 if use network; then
200 mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
201 --enable-httpd-output $(use_enable lame lame-encoder)
202 $(use_enable twolame twolame-encoder)
203 $(use_enable audiofile wave-encoder)"
204 else
205 mpdconf+=" --disable-shout --disable-vorbis-encoder
206 --disable-httpd-output --disable-lame-encoder
207 --disable-twolame-encoder --disable-wave-encoder"
208 fi
209
210 append-lfs-flags
211 append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
212
213 econf \
214 $(use_enable alsa) \
215 $(use_enable ao) \
216 $(use_enable audiofile) \
217 $(use_enable bzip2) \
218 $(use_enable cdio cdio-paranoia) \
219 $(use_enable cdio iso9660) \
220 $(use_enable curl) \
221 $(use_enable debug) \
222 $(use_enable faad aac) \
223 $(use_enable ffmpeg) \
224 $(use_enable fifo) \
225 $(use_enable flac) \
226 $(use_enable fluidsynth) \
227 $(use_enable gme) \
228 $(use_enable id3tag id3) \
229 $(use_enable inotify) \
230 $(use_enable ipv6) \
231 $(use_enable jack) \
232 $(use_enable lastfmradio lastfm) \
233 $(use_enable libsamplerate lsr) \
234 $(use_enable mad) \
235 $(use_enable mikmod) \
236 $(use_enable mms) \
237 $(use_enable modplug) \
238 $(use_enable mpg123) \
239 $(use_enable musepack mpc) \
240 $(use_enable openal) \
241 $(use_enable oss) \
242 $(use_enable pipe pipe-output) \
243 $(use_enable pulseaudio pulse) \
244 $(use_enable recorder recorder-output) \
245 $(use_enable sid sidplay) \
246 $(use_enable sndfile sndfile) \
247 $(use_enable soundcloud) \
248 $(use_enable soup) \
249 $(use_enable sqlite) \
250 $(use_enable systemd systemd-daemon) \
251 $(use_enable tcpd libwrap) \
252 $(use_enable vorbis) \
253 $(use_enable wavpack) \
254 $(use_enable wildmidi) \
255 $(use_enable zip zzip) \
256 $(use_with zeroconf zeroconf avahi) \
257 "$(systemd_with_unitdir)" \
258 ${mpdconf}
259 }
260
261 src_install() {
262 emake DESTDIR="${D}" install
263
264 insinto /etc
265 newins doc/mpdconf.dist mpd.conf
266
267 newinitd "${FILESDIR}"/mpd.init mpd
268
269 if use unicode; then
270 sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
271 "${ED}"/etc/mpd.conf || die "sed failed"
272 fi
273
274 insinto /etc/logrotate.d
275 newins "${FILESDIR}"/${PN}.logrotate ${PN}
276
277 use prefix || diropts -m0755 -o mpd -g audio
278 dodir /var/lib/mpd
279 keepdir /var/lib/mpd
280 dodir /var/lib/mpd/music
281 keepdir /var/lib/mpd/music
282 dodir /var/lib/mpd/playlists
283 keepdir /var/lib/mpd/playlists
284
285 readme.gentoo_create_doc
286 }
287
288 pkg_postinst() {
289 readme.gentoo_print_elog
290
291 # also change the homedir if the user has existed before
292 usermod -d "/var/lib/mpd" mpd
293 }
294
295
296
297 1.1 media-sound/mpd/mpd-0.18.ebuild
298
299 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.ebuild?rev=1.1&view=markup
300 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.18.ebuild?rev=1.1&content-type=text/plain
301
302 Index: mpd-0.18.ebuild
303 ===================================================================
304 # Copyright 1999-2013 Gentoo Foundation
305 # Distributed under the terms of the GNU General Public License v2
306 # $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.ebuild,v 1.1 2013/10/31 12:50:49 angelos Exp $
307
308 EAPI=4
309 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
310
311 DESCRIPTION="The Music Player Daemon (mpd)"
312 HOMEPAGE="http://www.musicpd.org"
313 SRC_URI="http://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
314
315 LICENSE="GPL-2"
316 SLOT="0"
317 KEYWORDS="~amd64 ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
318 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
319 fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient
320 libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
321 oss pipe pulseaudio recorder sid sndfile soundcloud sqlite systemd tcpd
322 twolame unicode vorbis wavpack wildmidi zeroconf zip"
323
324 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
325 DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
326 modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
327 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
328
329 REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
330 || ( ${DECODER_PLUGINS} )
331 network? ( || ( ${ENCODER_PLUGINS} ) )
332 recorder? ( || ( ${ENCODER_PLUGINS} ) )"
333
334 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
335 dev-libs/glib:2
336 adplug? ( media-libs/adplug )
337 alsa? ( media-sound/alsa-utils
338 media-libs/alsa-lib )
339 ao? ( media-libs/libao[alsa?,pulseaudio?] )
340 audiofile? ( media-libs/audiofile )
341 bzip2? ( app-arch/bzip2 )
342 cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
343 curl? ( net-misc/curl )
344 faad? ( media-libs/faad2 )
345 ffmpeg? ( virtual/ffmpeg )
346 flac? ( media-libs/flac[ogg?] )
347 fluidsynth? ( media-sound/fluidsynth )
348 gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
349 id3tag? ( media-libs/libid3tag )
350 jack? ( media-sound/jack-audio-connection-kit )
351 lame? ( network? ( media-sound/lame ) )
352 libsamplerate? ( media-libs/libsamplerate )
353 mad? ( media-libs/libmad )
354 mikmod? ( media-libs/libmikmod:0 )
355 mms? ( media-libs/libmms )
356 modplug? ( media-libs/libmodplug )
357 mpg123? ( >=media-sound/mpg123-1.12.2 )
358 musepack? ( media-sound/musepack-tools )
359 network? ( >=media-libs/libshout-2
360 !lame? ( !vorbis? ( media-libs/libvorbis ) ) )
361 ogg? ( media-libs/libogg )
362 openal? ( media-libs/openal )
363 opus? ( media-libs/opus )
364 pulseaudio? ( media-sound/pulseaudio )
365 sid? ( media-libs/libsidplay:2 )
366 sndfile? ( media-libs/libsndfile )
367 soundcloud? ( >=dev-libs/yajl-2 )
368 sqlite? ( dev-db/sqlite:3 )
369 systemd? ( sys-apps/systemd )
370 tcpd? ( sys-apps/tcp-wrappers )
371 twolame? ( media-sound/twolame )
372 vorbis? ( media-libs/libvorbis )
373 wavpack? ( media-sound/wavpack )
374 wildmidi? ( media-sound/wildmidi )
375 zeroconf? ( net-dns/avahi[dbus] )
376 zip? ( dev-libs/zziplib )"
377 DEPEND="${RDEPEND}
378 virtual/pkgconfig"
379
380 pkg_setup() {
381 use network || ewarn "Icecast and Shoutcast streaming needs networking."
382 use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
383
384 enewuser mpd "" "" "/var/lib/mpd" audio
385
386 if use inotify; then
387 CONFIG_CHECK="~INOTIFY_USER"
388 ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
389 linux-info_pkg_setup
390 fi
391 }
392
393 src_prepare() {
394 DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
395 sure that MPD's pid_file is unset."
396
397 cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
398 epatch "${FILESDIR}"/${PN}-0.16.conf.patch
399
400 if has_version dev-libs/libcdio-paranoia; then
401 sed -i \
402 -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
403 src/input/CdioParanoiaInputPlugin.cxx || die
404 fi
405 }
406
407 src_configure() {
408 local mpdconf="--disable-despotify --disable-documentation --disable-roar
409 --enable-largefile --enable-tcp --enable-un
410 --docdir=${EPREFIX}/usr/share/doc/${PF}"
411
412 if use network; then
413 mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
414 --enable-httpd-output $(use_enable lame lame-encoder)
415 $(use_enable twolame twolame-encoder)
416 $(use_enable audiofile wave-encoder)"
417 else
418 mpdconf+=" --disable-shout --disable-vorbis-encoder
419 --disable-httpd-output --disable-lame-encoder
420 --disable-twolame-encoder --disable-wave-encoder"
421 fi
422
423 append-lfs-flags
424 append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
425
426 econf \
427 $(use_enable alsa) \
428 $(use_enable ao) \
429 $(use_enable audiofile) \
430 $(use_enable bzip2) \
431 $(use_enable cdio cdio-paranoia) \
432 $(use_enable cdio iso9660) \
433 $(use_enable curl) \
434 $(use_enable debug) \
435 $(use_enable faad aac) \
436 $(use_enable ffmpeg) \
437 $(use_enable fifo) \
438 $(use_enable flac) \
439 $(use_enable fluidsynth) \
440 $(use_enable gme) \
441 $(use_enable id3tag id3) \
442 $(use_enable inotify) \
443 $(use_enable ipv6) \
444 $(use_enable jack) \
445 $(use_enable libmpdclient) \
446 $(use_enable libsamplerate lsr) \
447 $(use_enable mad) \
448 $(use_enable mikmod) \
449 $(use_enable mms) \
450 $(use_enable modplug) \
451 $(use_enable mpg123) \
452 $(use_enable musepack mpc) \
453 $(use_enable openal) \
454 $(use_enable oss) \
455 $(use_enable pipe pipe-output) \
456 $(use_enable pulseaudio pulse) \
457 $(use_enable recorder recorder-output) \
458 $(use_enable sid sidplay) \
459 $(use_enable sndfile sndfile) \
460 $(use_enable soundcloud) \
461 $(use_enable sqlite) \
462 $(use_enable systemd systemd-daemon) \
463 $(use_enable tcpd libwrap) \
464 $(use_enable vorbis) \
465 $(use_enable wavpack) \
466 $(use_enable wildmidi) \
467 $(use_enable zip zzip) \
468 $(use_with zeroconf zeroconf avahi) \
469 "$(systemd_with_unitdir)" \
470 ${mpdconf}
471 }
472
473 src_install() {
474 emake DESTDIR="${D}" install
475
476 insinto /etc
477 newins doc/mpdconf.dist mpd.conf
478
479 newinitd "${FILESDIR}"/mpd.init mpd
480
481 if use unicode; then
482 sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
483 "${ED}"/etc/mpd.conf || die "sed failed"
484 fi
485
486 insinto /etc/logrotate.d
487 newins "${FILESDIR}"/${PN}.logrotate ${PN}
488
489 use prefix || diropts -m0755 -o mpd -g audio
490 dodir /var/lib/mpd
491 keepdir /var/lib/mpd
492 dodir /var/lib/mpd/music
493 keepdir /var/lib/mpd/music
494 dodir /var/lib/mpd/playlists
495 keepdir /var/lib/mpd/playlists
496
497 readme.gentoo_create_doc
498 }
499
500 pkg_postinst() {
501 readme.gentoo_print_elog
502
503 # also change the homedir if the user has existed before
504 usermod -d "/var/lib/mpd" mpd
505 }