diff options
Diffstat (limited to 'media-sound/mpd')
| -rw-r--r-- | media-sound/mpd/ChangeLog | 11 | ||||
| -rw-r--r-- | media-sound/mpd/Manifest | 13 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch | 12 | ||||
| -rw-r--r-- | media-sound/mpd/metadata.xml | 1 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.14_alpha1.ebuild | 41 |
5 files changed, 51 insertions, 27 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 8e78da3480ae..47edb24c1f16 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/mpd # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.133 2008/11/09 08:42:57 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.134 2008/11/10 16:33:06 angelos Exp $ + + 10 Nov 2008; Christoph Mende <angelos@gentoo.org> + +files/mpd-0.14_alpha1-loglevel.patch, mpd-0.14_alpha1.ebuild: + Split id3 support from mad support (USE=id3 now) Removed USE=iconv, added + USE=sysvipc Fixed lame/vorbis/icecast dependencies (bug 246236) Fixed + warning about icecast enabled without encoders (bug 246232) Fixed + USE=ffmpeg Removed ChangeLog from dodoc (bug 246238) Fix loglevel (bug + 246207) Thanks to Daniel Schömer <daniel.schoemer@gmx.net> and Avuton + Olrich <avuton@gmail.com> 09 Nov 2008; Christoph Mende <angelos@gentoo.org> mpd-0.14_alpha1.ebuild: Improve icecast logic and add missing glib dependency diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 6e5cdf202ebc..b8d40d1d084d 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX mpd-0.14_alpha1-loglevel.patch 508 RMD160 451b4f8f065340b8bc9f2b9ee5b54705027be341 SHA1 a0eaf9cfce9e365f1808e717fd6d654d39d7da48 SHA256 e247a19728e9d4ddb77608e1608937b9d886fdd980d363b753795f1d441962d3 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664 AUX mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e DIST mpd-0.13.0.tar.bz2 410927 RMD160 cce5507070c3ccc58f2d8ad6330cd6adff91a747 SHA1 5d69d5ec6da8e4a26797017f682e54789691395c SHA256 84ed71327eb733d7e7521eceee89b235b909456bae923eba100d84b51df14a89 @@ -10,13 +11,13 @@ DIST mpd-0.14_alpha1.tar.bz2 326436 RMD160 c116872c8119ae0961d0034cc071def4fed62 EBUILD mpd-0.13.0.ebuild 3701 RMD160 b075d4030edbac302f6eca50ae5c487ce13f5f2e SHA1 128fee8146368fc1f04f1e35d5f34cab7da6a15e SHA256 d22c19776da3f7823ea64e7532384c14fb4e3ce32ca16c575acb8f923ed0b39e EBUILD mpd-0.13.1.ebuild 3702 RMD160 55da67178ab6d17b4a1f990e7258c5b1a469dc6e SHA1 dc7c90d83abab447f84183fb46c56293ae03d155 SHA256 1f904c1a9fea3e8d17b14aab80eccb9acf5a986754669b9aafdce4d80173b118 EBUILD mpd-0.13.2.ebuild 3701 RMD160 ccea9e368d68fd8d9eeb64ed39b23905613177c0 SHA1 5edade24e22f98f9d23710939ea5daf0c6004b76 SHA256 066c46f41dd6edf49aa01f8ebf57af52148d16c2f586864b68ddcf0e4b462146 -EBUILD mpd-0.14_alpha1.ebuild 4061 RMD160 48cb7d92bb7ada9d1bd7bdcdbf074735b65f6ea7 SHA1 c03c6bf6747b98cd349a8c25391c0e4062ca0f11 SHA256 8920a62a0531c591646ab0253202f1d42f212df14a45fcb17bd543804783b09f -MISC ChangeLog 20264 RMD160 1b22064fb791e22408a8d8c9d481e1cfc3d2f566 SHA1 54b4a9832479b3043222c96e89c7136e12d57306 SHA256 41effd6508065cd49a72b97f1b9ce1869f1914c6f3a93212e5aa30484044d0ff -MISC metadata.xml 339 RMD160 4cacc5b8dde301314d9d4455ed0fe88d376091ab SHA1 99d4b79763665d2e64dc14ea76b2c189f7210be9 SHA256 a9a824502f0043532587486fe4bc620d920e008c56b7e3e344f3a11256bb51d0 +EBUILD mpd-0.14_alpha1.ebuild 4020 RMD160 9118305b81da1a2a892c8eaefdfa25412ee81b68 SHA1 0fcc5ffdf518946614c00ae637944483a5ccd51b SHA256 1eb48c914da25acce742fcbb7306c8dfd9318e491d8b40ba62ed4f261591a0d8 +MISC ChangeLog 20772 RMD160 cf32e870a87010e27aea405a9382fc91933bb35c SHA1 cd1ea3bd47d6881df137e705538fb0ecb886e6d8 SHA256 52e25a771871b3346e365c2d0c5178e0c79b30c001b55c3f731132a032f646d1 +MISC metadata.xml 385 RMD160 be2001d9b9400c5b6a277d9d651dc6c513a110a6 SHA1 79fdb8b82643ebf3250f320af394c1451e72e6c3 SHA256 4f06e5aeb5dd3503b96d9ac1b0b50d03db319e5ec550fd8ecc3720ef66d05e7b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkWopkACgkQKhnDs22gwa9PwACfWSFJiYSid5QKjv8uWAG7Xzc+ -ZNAAnjkxOzITIEpOxjif4fM07h1FZsBR -=rooA +iEYEARECAAYFAkkYYkkACgkQKhnDs22gwa9QnQCeJ6xvhHtFh52A6f+luP+FmMmn +yKkAoJiBpGMVoeiR4XNemo6nr35dCUb5 +=AQH/ -----END PGP SIGNATURE----- diff --git a/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch b/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch new file mode 100644 index 000000000000..7d0740eabd45 --- /dev/null +++ b/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch @@ -0,0 +1,12 @@ +diff -pru mpd-0.14~alpha1.orig/src/log.c mpd-0.14~alpha1/src/log.c +--- mpd-0.14~alpha1.orig/src/log.c 2008-11-09 20:01:02.000000000 +0100 ++++ mpd-0.14~alpha1/src/log.c 2008-11-09 20:01:16.000000000 +0100 +@@ -159,7 +159,7 @@ void setup_log_output(bool use_stdout) + #define log_func(func,level) \ + mpd_printf void func(const char *fmt, ...) \ + { \ +- if ((int)log_threshold <= level) { \ ++ if ((int)log_threshold >= level) { \ + va_list args; \ + va_start(args, fmt); \ + g_logv(NULL, level, fmt, args); \ diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml index d0fadb22eb23..ae184a7e6aa4 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -8,5 +8,6 @@ </maintainer> <use> <flag name="icecast">Enable support for Icecast2</flag> + <flag name="id3">Support for ID3 tags</flag> </use> </pkgmetadata> diff --git a/media-sound/mpd/mpd-0.14_alpha1.ebuild b/media-sound/mpd/mpd-0.14_alpha1.ebuild index 1edbe02ebe2b..dd5ebb87c651 100644 --- a/media-sound/mpd/mpd-0.14_alpha1.ebuild +++ b/media-sound/mpd/mpd-0.14_alpha1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_alpha1.ebuild,v 1.2 2008/11/09 08:42:57 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_alpha1.ebuild,v 1.3 2008/11/10 16:33:06 angelos Exp $ EAPI=1 -inherit eutils +inherit flag-o-matic eutils DESCRIPTION="The Music Player Daemon (mpd)" HOMEPAGE="http://www.musicpd.org" @@ -13,7 +13,7 @@ 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 curl ffmpeg flac icecast iconv ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf" +IUSE="aac alsa ao audiofile curl ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio sysvipc unicode vorbis wavpack zeroconf" DEPEND="!sys-cluster/mpich2 >=dev-libs/glib-2.4:2 @@ -21,22 +21,22 @@ DEPEND="!sys-cluster/mpich2 alsa? ( media-sound/alsa-utils ) ao? ( >=media-libs/libao-0.8.4 ) audiofile? ( media-libs/audiofile ) - zeroconf? ( net-dns/avahi ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) - icecast? ( media-libs/libshout ) - iconv? ( virtual/libiconv ) + icecast? ( lame? ( media-libs/libshout ) ) + id3? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) - lame? ( media-sound/lame ) + lame? ( icecast? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad - media-libs/libid3tag ) + mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) musepack? ( media-libs/libmpcdec ) ogg? ( media-libs/libogg ) pulseaudio? ( media-sound/pulseaudio ) - vorbis? ( media-libs/libvorbis ) + zeroconf? ( net-dns/avahi ) + vorbis? ( media-libs/libvorbis + icecast? ( media-libs/libshout ) ) wavpack? ( media-sound/wavpack )" S="${WORKDIR}/${PN}-${PV/_/~}" @@ -48,9 +48,9 @@ pkg_setup() { die "Missing libOggFLAC library." fi - if use shoutcast && ! use lame && ! use vorbis; then - ewarn "USE=shoutcast enabled but lame and vorbis disabled," - ewarn "disabling shoutcast" + if use icecast && ! use lame && ! use vorbis; then + ewarn "USE=icecast enabled but lame and vorbis disabled," + ewarn "disabling icecast" fi enewuser mpd "" "" "/var/lib/mpd" audio @@ -59,7 +59,8 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed" + epatch "${FILESDIR}"/mpdconf.patch \ + "${FILESDIR}"/${P}-loglevel.patch } src_compile() { @@ -85,27 +86,27 @@ src_compile() { myconf+=" --disable-shout_ogg --disable-shout_mp3" fi + append-lfs-flags + econf \ $(use_enable aac) \ $(use_enable alsa) \ $(use_enable ao) \ $(use_enable audiofile) \ $(use_enable curl) + $(use_enable ffmpeg) \ $(use_enable flac) \ - $(use_enable flac libFLACtest) \ + $(use_enable id3) \ $(use_enable ipv6) \ $(use_enable jack) \ $(use_enable libsamplerate lsr) \ $(use_enable mad mp3) \ - $(use_enable mad id3) \ $(use_enable mikmod mod) \ - $(use_enable mikmod libmikmodtest) \ $(use_enable musepack mpc) \ $(use_enable oss) \ - $(use_enable ogg oggtest) \ $(use_enable pulseaudio pulse) \ + $(use_enable sysvipc un) \ $(use_enable vorbis oggvorbis) \ - $(use_enable vorbis vorbistest) \ $(use_enable wavpack) \ ${myconf} @@ -120,7 +121,7 @@ src_install() { emake install DESTDIR="${D}" || die rm -rf "${D}"/usr/share/doc/mpd/ - dodoc AUTHORS ChangeLog INSTALL README TODO UPGRADING + dodoc AUTHORS NEWS README TODO UPGRADING dodoc doc/COMMANDS doc/mpdconf.example insinto /etc |