From 9bc6fac04030dc3e5bb86467d728655e0e2b26fe Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sun, 27 Jan 2013 09:54:39 +0000 Subject: [PATCH] mpd: Sync with gentoo-x86 Package-Manager: portage-2.2.0_alpha161 Manifest-Sign-Key: 84F20B43 --- media-sound/mpd/Manifest | 10 +++++----- media-sound/mpd/metadata.xml | 12 +++++++++--- media-sound/mpd/mpd-9999.ebuild | 20 ++++++++++++++------ 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 05c4bc4..76ed5bf 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -3,12 +3,12 @@ Hash: SHA256 AUX mpd.init 824 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048 SHA512 9b0565b328d3f9081a221c7459137f5ffd0a6d27f747738c3bfdac2c73d68374a296a135be94c8538af0bbe1f0472d3210437494a8ffb61f7a9ad15617ac0f78 WHIRLPOOL a91763b5d5da5a6aca93436a467e636f0fb21aa77cc9d857872a6182e66a5640c702a0175afd9bc811dda301f7acd81ab99727dea8dcf4acfb0ea70d8e49de7a AUX mpdconf.patch 2646 SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653 SHA512 9a6cd76d0327d30063659084e72005c85c7a9541c93bacfec098bce93839040ec6da78da9bd4beb5dcb1625c7b0ac6d0cb3f42ca5e7313f0a05cd46286f0c9a1 WHIRLPOOL 06639909305319b818b8fa008bcaeb29b54b70403a4119d627b3d7eda56bdf3a9b246fb5f68bbabe1f52a65d78fb39058ce87f03aeb98f1fd34dec505f84e353 -EBUILD mpd-9999.ebuild 5692 SHA256 8a0e588de672bad35cde864e02eebd1ab18debf3af686f7ac2a7fe36e6fad1de SHA512 8b4cd7413e14177a82fe62526063fbed9e572ad73c450d0b457e219785e752882993dfa91891efd9e6cef98e0a1a795d73b9c77035c39947138865e0417d00fd WHIRLPOOL c199d88d48dea5f0e1dec289defe060d95c5c0b05b82edebd45a514c8e85911b58e4387e42e10b7326693ca60a45ea20baef96b2606aa64282ff15bfe7147b68 -MISC metadata.xml 1545 SHA256 d9f26ca36d325d136277f6030373416daf6a458cacbc6c6b26de86ec967cda2f SHA512 5f6baf655802c2768553ade65f461d0dff76d3721bb8e8eace838f0e71b4deda55954d1d8beac28337d8b9a076197cc0a0d62e843dd671b1fe75f6119bd38b12 WHIRLPOOL b3190561de883e3536c8ad419317da8d5f995eba6a06ec72261c89268c2baf79f1fe97f0fde879e1e531df43cf0c74bb71f6461fd7c396694e23d8140c26c49f +EBUILD mpd-9999.ebuild 6063 SHA256 cbd64d5e8e051d14f71cb2fa327c0e877a3bbfa20fd5c338a929944a2ba17e69 SHA512 5fe7d067c7a3a8ce154cc6bc56a56ac1ec06202c840e37b4d517557f1392f17cfd7170749088cfe3a8c1015fffe5dc70cbe20171aea2f938a929eba138432d92 WHIRLPOOL f77d062b183ec696dcdc43f6b4cf86de7e11d53f52ef3c958fff031c337cd3163a5bf42ff4dd58b55272869393484ab464ad1ba3a611a49c5d065c815e43a4e4 +MISC metadata.xml 1801 SHA256 3b4ff69fab361615accbbd3328ed1991a4798aee08e17f32eec05244330b583e SHA512 a4b481252e825e90e1ddaa450f16587bd88df290156f6e9210d46b5cf7300d153d11d987ab66c33cd2e706767b39a6be8d278aa15e23fb2dcddeea5a205a5a5f WHIRLPOOL 1907d09d09258ccd7a2addb358240da655c2354c80195633c35de837ecbf820be7a683557a7bc24603611d0d8098cdd74b88449e59683f59ce72e21908b21113 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlAADDAACgkQmWq1bYTyC0MSOwD9G6MCgeJULnv3y8urJyywoPm+ -vkYpy/XBdryKUgtdj3gA/1DLu0Fkniz4//ZRcV0kK+yb1Nke/FxH8JsKXCXR6A/0 -=mHeC +iF4EAREIAAYFAlEE+V8ACgkQmWq1bYTyC0O3ogD7BVU1Y6BdJK4LQAdvXYOYUrAO +noiZfByRNvgNrhJMI2MBAKkrGkRegypGsmFZMixh6JBVxiiDpdRyayKosyf1H3Cu +=Ysaz -----END PGP SIGNATURE----- diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml index 674a09f..ceabc22 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -1,20 +1,25 @@ + sound - kaleb@elwert.org - Kaleb Elwert + angelos@gentoo.org + Christoph Mende + + + hwoarang@gentoo.org + Markos Chandras Use libcdio for ISO9660 parsing support Support for web stream listening Support writing audio to a FIFO Enables Fluidsynth MIDI software synthesis + Enables support for media-libs/game-music-emu for playing various video game music formats. Support for ID3 tags Use the Linux kernel inotify subsystem to notice changes to mpd music library Support for MP3 streaming via Icecast2 Support listening to last.fm radio stations - Enable support for mp3 decoding over media-sound/mpg123 Enables network streaming support Support writing audio to a pipe Enables output plugin for recording radio streams @@ -25,5 +30,6 @@ Support twolame MPEG-2 encoding Enable MIDI support via wildmidi Support for ZIP files + Enable support for mp3 decoding over media-sound/mpg123 diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild index 0206466..a5bcb5a 100644 --- a/media-sound/mpd/mpd-9999.ebuild +++ b/media-sound/mpd/mpd-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.3.ebuild,v 1.2 2013/01/16 08:20:12 ssuominen Exp $ EAPI=4 -inherit autotools eutils flag-o-matic git-2 linux-info multilib systemd user +inherit eutils flag-o-matic linux-info multilib systemd user autotools git-2 DESCRIPTION="The Music Player Daemon (mpd)" HOMEPAGE="http://www.musicpd.org" @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac -fluidsynth +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad +fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip" @@ -37,11 +37,12 @@ RDEPEND="!=media-libs/game-music-emu-0.6.0_pre20120802 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) @@ -90,11 +91,17 @@ src_prepare() { eautoreconf cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" epatch "${FILESDIR}"/${PN}conf.patch + + if has_version dev-libs/libcdio-paranoia; then + sed -i \ + -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ + src/input/CdioParanoiaInputPlugin.cxx || die + fi } src_configure() { local mpdconf="--disable-despotify --disable-documentation --disable-ffado - --disable-gme --disable-mvp --disable-roar --enable-largefile + --disable-mvp --disable-roar --enable-largefile --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}" if use network; then @@ -125,6 +132,7 @@ src_configure() { $(use_enable fifo) \ $(use_enable flac) \ $(use_enable fluidsynth) \ + $(use_enable gme) \ $(use_enable id3tag id3) \ $(use_enable inotify) \ $(use_enable ipv6) \ -- 2.11.4.GIT