diff options
| -rw-r--r-- | media-sound/mpd/ChangeLog | 10 | ||||
| -rw-r--r-- | media-sound/mpd/files/0.15_beta1-mpdconf.patch (renamed from media-sound/mpd/files/0.15_alpha1-mpdconf.patch) | 25 | ||||
| -rw-r--r-- | media-sound/mpd/metadata.xml | 4 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.13.2.ebuild | 22 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.15_beta1.ebuild (renamed from media-sound/mpd/mpd-0.15_alpha1.ebuild) | 113 |
5 files changed, 84 insertions, 90 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 768e7e1fe94c..ca3aeb9c0552 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/mpd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.163 2009/05/13 19:55:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.164 2009/05/15 03:47:30 ssuominen Exp $ + +*mpd-0.15_beta1 (15 May 2009) + + 15 May 2009; Samuli Suominen <ssuominen@gentoo.org> + -files/0.15_alpha1-mpdconf.patch, -mpd-0.15_alpha1.ebuild, + +files/0.15_beta1-mpdconf.patch, +mpd-0.15_beta1.ebuild, + metadata.xml: + Version bump wrt #268881. 13 May 2009; Samuli Suominen <ssuominen@gentoo.org> mpd-0.15_alpha1.ebuild: diff --git a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch b/media-sound/mpd/files/0.15_beta1-mpdconf.patch index 8407f79135bd..b0fface1ba16 100644 --- a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch +++ b/media-sound/mpd/files/0.15_beta1-mpdconf.patch @@ -1,7 +1,6 @@ -diff --git a/doc/mpdconf.example b/doc/mpdconf.example -index e231296..77f6d11 100644 ---- a/doc/mpdconf.example -+++ b/doc/mpdconf.example +diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.example +--- mpd-0.15~beta1.orig/doc/mpdconf.example 2009-04-30 17:35:31.000000000 +0300 ++++ mpd-0.15~beta1/doc/mpdconf.example 2009-05-15 05:39:38.000000000 +0300 @@ -1,4 +1,4 @@ -# An example configuration file for MPD +# A default Gentoo configuration file for MPD @@ -13,7 +12,7 @@ index e231296..77f6d11 100644 # file:// protocol) or streaming files over an accepted protocol. # -#music_directory "~/music" -+music_directory "/var/lib/mpd/music" ++music_directory "/var/lib/mpd/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use @@ -21,7 +20,7 @@ index e231296..77f6d11 100644 # format. This setting defaults to playlist saving being disabled. # -#playlist_directory "~/.mpd/playlists" -+playlist_directory "/var/lib/mpd/playlists" ++playlist_directory "/var/lib/mpd/playlists" # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the @@ -30,7 +29,7 @@ index e231296..77f6d11 100644 # files over an accepted protocol. # -#db_file "~/.mpd/database" -+db_file "/var/lib/mpd/database" ++db_file "/var/lib/mpd/database" # # These settings are the locations for the daemon log files for the daemon. # These logs are great for troubleshooting, depending on your log_level @@ -39,14 +38,14 @@ index e231296..77f6d11 100644 # setting defaults to logging to syslog, otherwise logging is disabled. # -#log_file "~/.mpd/log" -+log_file "/var/log/mpd/mpd.log" ++log_file "/var/log/mpd/mpd.log" # # This setting sets the location of the file which stores the process ID # for use of mpd --kill and some init scripts. This setting is disabled by # default and the pid file will not be stored. # -#pid_file "~/.mpd/pid" -+pid_file "/var/run/mpd/mpd.pid" ++pid_file "/var/run/mpd/mpd.pid" # # This setting sets the location of the file which contains information about # most variables to get MPD back into the same general shape it was in before @@ -54,7 +53,7 @@ index e231296..77f6d11 100644 # state will be reset on server start up. # -#state_file "~/.mpd/state" -+state_file "/var/lib/mpd/state" ++state_file "/var/lib/mpd/state" # ############################################################################### @@ -63,7 +62,7 @@ index e231296..77f6d11 100644 # current user. # -#user "nobody" -+user "mpd" ++user "mpd" # # This setting sets the address for the daemon to listen on. Careful attention # should be paid if this is assigned to anything other then the default, any. @@ -71,11 +70,11 @@ index e231296..77f6d11 100644 # # For network -#bind_to_address "any" -+bind_to_address "localhost" ++bind_to_address "localhost" # # And for Unix Socket -#bind_to_address "~/.mpd/socket" -+bind_to_address "/var/lib/mpd/socket" ++bind_to_address "/var/lib/mpd/socket" # # This setting is the TCP port that is desired for the daemon to get assigned # to. diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml index 35f0117b1607..5d61f3d304cf 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -8,16 +8,16 @@ </maintainer> <use> <flag name="cdio">Use libcdio for CD support</flag> + <flag name="cue">Support CUE Sheet Parser Library</flag> <flag name="curl">Support for web stream listening</flag> <flag name="fifo">Support writing audio to a FIFO</flag> <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis</flag> - <flag name="gprof">Build with profiling support</flag> - <flag name="http-stream">Support streaming via built-in HTTP server</flag> <flag name="icecast">Support for Icecast2 streaming</flag> <flag name="id3">Support for ID3 tags</flag> <flag name="lame">Support for MP3 streaming via Icecast2</flag> <flag name="lastfmradio">Support listening to last.fm radio stations</flag> <flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag> + <flag name="network">Enables network streaming support</flag> <flag name="pipe">Support writing audio to a pipe</flag> <flag name="sid">Build with SID (Commodore 64 Audio) support</flag> <flag name="zip">Support for ZIP files</flag> diff --git a/media-sound/mpd/mpd-0.13.2.ebuild b/media-sound/mpd/mpd-0.13.2.ebuild index 0b0679f57267..04c3ad91b670 100644 --- a/media-sound/mpd/mpd-0.13.2.ebuild +++ b/media-sound/mpd/mpd-0.13.2.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.11 2009/04/14 18:06:00 angelos Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.12 2009/05/15 03:47:30 ssuominen Exp $ +EAPI=2 inherit eutils DESCRIPTION="The Music Player Daemon (mpd)" @@ -15,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="aac alsa ao audiofile avahi flac icecast iconv ipv6 jack libsamplerate mp3 mikmod musepack ogg oss pulseaudio unicode vorbis" -DEPEND="!sys-cluster/mpich2 +RDEPEND="!sys-cluster/mpich2 aac? ( >=media-libs/faad2-2.0_rc2 ) alsa? ( media-sound/alsa-utils ) ao? ( >=media-libs/libao-0.8.4 ) @@ -34,22 +33,19 @@ DEPEND="!sys-cluster/mpich2 ogg? ( media-libs/libogg ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND}" pkg_setup() { enewuser mpd "" "" "/var/lib/mpd" audio } -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PV}-mpdconf.patch || die "epatch for config file failed" +src_prepare() { + epatch "${FILESDIR}"/${PV}-mpdconf.patch } -src_compile() { +src_configure() { local myconf - myconf="" - if use avahi; then myconf="${myconf} --with-zeroconf=avahi" else @@ -87,9 +83,7 @@ src_compile() { $(use_enable pulseaudio pulse) \ $(use_enable vorbis oggvorbis) \ $(use_enable vorbis vorbistest) \ - ${myconf} || die "could not configure" - - emake || die "emake failed" + ${myconf} } src_install() { diff --git a/media-sound/mpd/mpd-0.15_alpha1.ebuild b/media-sound/mpd/mpd-0.15_beta1.ebuild index df8542ae945a..cae1a0e8cb35 100644 --- a/media-sound/mpd/mpd-0.15_alpha1.ebuild +++ b/media-sound/mpd/mpd-0.15_beta1.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_alpha1.ebuild,v 1.3 2009/05/13 19:55:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_beta1.ebuild,v 1.1 2009/05/15 03:47:30 ssuominen Exp $ EAPI=2 - inherit flag-o-matic eutils DESCRIPTION="The Music Player Daemon (mpd)" @@ -13,27 +12,27 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug doc +fifo +ffmpeg flac fluidsynth gprof http-stream icecast +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad mikmod modplug musepack ogg oss pipe pulseaudio sid sqlite unicode vorbis wavpack zeroconf zip" +IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug doc +fifo +ffmpeg flac +fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad mikmod modplug musepack network ogg oss pipe pulseaudio sid sqlite unicode vorbis wavpack zeroconf zip" RDEPEND="!sys-cluster/mpich2 >=dev-libs/glib-2.4:2 - aac? ( >=media-libs/faad2-2.0_rc2 ) + aac? ( >=media-libs/faad2-2 ) alsa? ( media-sound/alsa-utils ) ao? ( >=media-libs/libao-0.8.4 ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) + cue? ( >=media-libs/libcue-0.13 ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) - flac? ( media-libs/flac - ogg? ( media-libs/flac[ogg] ) ) + flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) - icecast? ( lame? ( media-libs/libshout ) - vorbis? ( media-libs/libshout ) ) + network? ( >=media-libs/libshout-2 ) id3? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( icecast? ( media-sound/lame ) ) - libmms? ( media-libs/libmms ) + libmms? ( >=media-libs/libmms-0.4 ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) @@ -47,94 +46,88 @@ RDEPEND="!sys-cluster/mpich2 wavpack? ( media-sound/wavpack ) zeroconf? ( net-dns/avahi ) zip? ( dev-libs/zziplib )" - #midi? ( media-libs/wildmidi ) DEPEND="${RDEPEND} dev-util/pkgconfig doc? ( app-doc/doxygen app-text/xmlto )" -S="${WORKDIR}/${P/_/~}" +S=${WORKDIR}/${P/_/~} pkg_setup() { - if use icecast || use http-stream; then - if ! use lame && ! use vorbis; then - eerror "Icecast or http-stream output streaming is enabled," - eerror "but there is no encoding enabled (lame and" - eerror "vorbis are both disabled)." - fi + if ! use network; then + ewarn "Icecast and Shoutcast HTTP streaming needs network." fi if use lastfmradio && ! use curl; then eerror "Cannot enable lastfmradio without curl." fi - if use fluidsynth; then - ewarn "Use of fluidsynth USE is highly discouraged by upstream." - #ewarn "Use wildmidi unless you know better." - fi - + use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." enewuser mpd "" "" "/var/lib/mpd" audio } src_prepare() { - cp doc/mpdconf.example doc/mpdconf.dist + cp -f doc/mpdconf.example doc/mpdconf.dist epatch "${FILESDIR}"/${PV}-mpdconf.patch } src_configure() { - if use icecast || use http-stream; then - myconf="$(use_enable lame lame-encoder) $(use_enable vorbis vorbis-encoder)" + append-lfs-flags + # OggFLACtest is for <=flac-1.2.2 + local mpdconf="--disable-dependency-tracking --enable-tcp + --enable-un --disable-wildmidi --disable-mvp + --disable-libOggFLACtest --disable-werror" + + if use network; then + mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) + --enable-httpd-output $(use_enable lame lame-encoder)" else - myconf="--disable-lame-encoder --disable-vorbis-encoder" + mpdconf+=" --disable-shout --disable-vorbis-encoder + --disable-httpd-output --disable-lame-encoder" fi - if use ogg && use flac; then - myconf+=" --enable-oggflac --enable-libOggFLACtest" + if use flac && use ogg; then + myconf+=" --enable-oggflac" else - myconf+=" --disable-oggflac --disable-libOggFLACtest" + myconf+=" --disable-oggflag" fi - append-lfs-flags - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ + $(use_enable ipv6) \ + $(use_enable cue) \ + $(use_enable sqlite) \ $(use_enable curl) \ + $(use_enable lastfmradio lastfm) \ + $(use_enable libmms mms) \ + $(use_enable bzip2) \ + $(use_enable zip) \ $(use_enable cdio iso9660) \ - $(use_enable debug) \ - $(use_enable doc documentation) \ - $(use_enable fluidsynth) \ - $(use_enable fifo) \ + $(use_enable id3) \ + $(use_enable audiofile) \ $(use_enable ffmpeg) \ $(use_enable flac) \ - $(use_enable gprof) \ - $(use_enable http-stream httpd-output) \ - $(use_enable id3) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable modplug) \ - $(use_enable libmms mms) \ - $(use_enable libsamplerate lsr) \ $(use_enable mad) \ $(use_enable mikmod) \ + $(use_enable modplug) \ $(use_enable musepack mpc) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sqlite sqlite) \ $(use_enable vorbis) \ + $(use_enable sid sidplay) \ + $(use_enable fluidsynth) \ $(use_enable wavpack) \ - $(use_enable zip) \ + $(use_enable libsamplerate lsr) \ + $(use_enable alsa) \ + $(use_enable ao) \ + $(use_enable fifo) \ + $(use_enable pipe pipe-output) \ + $(use_enable jack) \ + $(use_enable oss) \ + $(use_enable pulseaudio pulse) \ + $(use_enable aac) \ + $(use_enable doc documentation) \ + $(use_enable debug) \ + $(use_enable profile gprof) \ $(use_with zeroconf zeroconf avahi) \ - --enable-tcp \ - --enable-un \ - ${myconf} - #$(use_enable midi wildmidi) \ + ${mpdconf} } src_install() { @@ -144,7 +137,7 @@ src_install() { keepdir /var/run/mpd emake DESTDIR="${D}" install || die "emake install failed" - rm -rf "${D}"/usr/share/doc/mpd/ + rm -rf "${D}"/usr/share/doc/mpd dodoc AUTHORS NEWS README TODO UPGRADING dodoc doc/mpdconf.dist |