| 1 |
angelos 10/09/10 07:55:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mpd-0.15.12-r1.ebuild |
| 5 |
Log: |
| 6 |
Tweak default pid/log paths (bug #331723), fix init script dependencies (bug #331725), reduce init script noise (bug #331727) and convert init script to s-s-d (bug #331729) |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.208 media-sound/mpd/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.208&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?rev=1.208&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/ChangeLog?r1=1.207&r2=1.208 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v |
| 19 |
retrieving revision 1.207 |
| 20 |
retrieving revision 1.208 |
| 21 |
diff -u -r1.207 -r1.208 |
| 22 |
--- ChangeLog 26 Aug 2010 19:30:28 -0000 1.207 |
| 23 |
+++ ChangeLog 10 Sep 2010 07:55:07 -0000 1.208 |
| 24 |
@@ -1,6 +1,14 @@ |
| 25 |
# ChangeLog for media-sound/mpd |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.207 2010/08/26 19:30:28 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.208 2010/09/10 07:55:07 angelos Exp $ |
| 29 |
+ |
| 30 |
+*mpd-0.15.12-r1 (06 Sep 2010) |
| 31 |
+ |
| 32 |
+ 06 Sep 2010; <angelos@g.o> +mpd-0.15.12-r1.ebuild, |
| 33 |
+ +files/mpd.conf.patch, +files/mpd.init: |
| 34 |
+ Tweak default pid/log paths (bug #331723), fix init script dependencies |
| 35 |
+ (bug #331725), reduce init script noise (bug #331727) and convert init |
| 36 |
+ script to s-s-d (bug #331729) |
| 37 |
|
| 38 |
26 Aug 2010; Jeroen Roovers <jer@g.o> mpd-0.15.12.ebuild: |
| 39 |
Marked ~hppa (bug #333941). |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 media-sound/mpd/mpd-0.15.12-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.15.12-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mpd/mpd-0.15.12-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: mpd-0.15.12-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2010 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.12-r1.ebuild,v 1.1 2010/09/10 07:55:07 angelos Exp $ |
| 53 |
|
| 54 |
EAPI=2 |
| 55 |
inherit eutils flag-o-matic multilib |
| 56 |
|
| 57 |
DESCRIPTION="The Music Player Daemon (mpd)" |
| 58 |
HOMEPAGE="http://www.musicpd.org" |
| 59 |
SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd" |
| 64 |
IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac |
| 65 |
fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad |
| 66 |
mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode |
| 67 |
vorbis wavpack wildmidi zip" |
| 68 |
|
| 69 |
RDEPEND="!sys-cluster/mpich2 |
| 70 |
>=dev-libs/glib-2.6:2 |
| 71 |
aac? ( >=media-libs/faad2-2 ) |
| 72 |
alsa? ( media-sound/alsa-utils ) |
| 73 |
ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] ) |
| 74 |
audiofile? ( media-libs/audiofile ) |
| 75 |
bzip2? ( app-arch/bzip2 ) |
| 76 |
cdio? ( dev-libs/libcdio ) |
| 77 |
cue? ( >=media-libs/libcue-0.13 ) |
| 78 |
curl? ( net-misc/curl ) |
| 79 |
ffmpeg? ( media-video/ffmpeg ) |
| 80 |
flac? ( media-libs/flac[ogg?] ) |
| 81 |
fluidsynth? ( media-sound/fluidsynth ) |
| 82 |
network? ( >=media-libs/libshout-2 |
| 83 |
!lame? ( !vorbis? ( media-libs/libvorbis ) ) ) |
| 84 |
id3? ( media-libs/libid3tag ) |
| 85 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 86 |
lame? ( network? ( media-sound/lame ) ) |
| 87 |
libmms? ( >=media-libs/libmms-0.4 ) |
| 88 |
libsamplerate? ( media-libs/libsamplerate ) |
| 89 |
mad? ( media-libs/libmad ) |
| 90 |
mikmod? ( media-libs/libmikmod ) |
| 91 |
modplug? ( media-libs/libmodplug ) |
| 92 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 93 |
ogg? ( media-libs/libogg ) |
| 94 |
pulseaudio? ( media-sound/pulseaudio ) |
| 95 |
sid? ( >=media-libs/libsidplay-2.1.1-r2:2 ) |
| 96 |
sqlite? ( dev-db/sqlite:3 ) |
| 97 |
vorbis? ( media-libs/libvorbis ) |
| 98 |
wavpack? ( media-sound/wavpack ) |
| 99 |
wildmidi? ( media-sound/wildmidi ) |
| 100 |
avahi? ( net-dns/avahi ) |
| 101 |
zip? ( dev-libs/zziplib )" |
| 102 |
DEPEND="${RDEPEND} |
| 103 |
dev-util/pkgconfig" |
| 104 |
|
| 105 |
pkg_setup() { |
| 106 |
use network || ewarn "Icecast and Shoutcast streaming needs networking." |
| 107 |
use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." |
| 108 |
|
| 109 |
enewuser mpd "" "" "/var/lib/mpd" audio |
| 110 |
} |
| 111 |
|
| 112 |
src_prepare() { |
| 113 |
cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" |
| 114 |
epatch "${FILESDIR}"/mpd.conf.patch |
| 115 |
} |
| 116 |
|
| 117 |
src_configure() { |
| 118 |
local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un |
| 119 |
--disable-wildmidi --disable-libOggFLACtest --disable-documentation |
| 120 |
--docdir=${EPREFIX}/usr/share/doc/${PF}" |
| 121 |
|
| 122 |
if use network; then |
| 123 |
mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) |
| 124 |
--enable-httpd-output $(use_enable lame lame-encoder)" |
| 125 |
if ! use lame && ! use vorbis; then |
| 126 |
ewarn "At least one encoder is required, enabling vorbis for you." |
| 127 |
mpdconf+=" --enable-vorbis-encoder" |
| 128 |
fi |
| 129 |
else |
| 130 |
mpdconf+=" --disable-shout --disable-vorbis-encoder |
| 131 |
--disable-httpd-output --disable-lame-encoder" |
| 132 |
fi |
| 133 |
|
| 134 |
if use flac && use ogg; then |
| 135 |
mpdconf+=" --enable-oggflac" |
| 136 |
else |
| 137 |
mpdconf+=" --disable-oggflac" |
| 138 |
fi |
| 139 |
|
| 140 |
append-lfs-flags |
| 141 |
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" |
| 142 |
|
| 143 |
cd "${S}" |
| 144 |
|
| 145 |
econf \ |
| 146 |
$(use_enable ipv6) $(use_enable cue) \ |
| 147 |
$(use_enable sqlite) $(use_enable curl) \ |
| 148 |
$(use_enable lastfmradio lastfm) $(use_enable libmms mms) \ |
| 149 |
$(use_enable bzip2) $(use_enable zip) \ |
| 150 |
$(use_enable cdio iso9660) $(use_enable id3) \ |
| 151 |
$(use_enable audiofile) $(use_enable ffmpeg) \ |
| 152 |
$(use_enable flac) $(use_enable mad) \ |
| 153 |
$(use_enable mikmod) $(use_enable modplug) \ |
| 154 |
$(use_enable musepack mpc) $(use_enable vorbis) \ |
| 155 |
$(use_enable sid sidplay) $(use_enable fluidsynth) \ |
| 156 |
$(use_enable wavpack) $(use_enable libsamplerate lsr) \ |
| 157 |
$(use_enable alsa) $(use_enable ao) \ |
| 158 |
$(use_enable fifo) $(use_enable pipe pipe-output) \ |
| 159 |
$(use_enable jack) $(use_enable oss) \ |
| 160 |
$(use_enable pulseaudio pulse) $(use_enable aac) \ |
| 161 |
$(use_enable debug) $(use_enable profile gprof) \ |
| 162 |
$(use_with avahi zeroconf avahi) $(use_enable wildmidi) \ |
| 163 |
${mpdconf} |
| 164 |
} |
| 165 |
|
| 166 |
src_install() { |
| 167 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 168 |
|
| 169 |
insinto /etc |
| 170 |
newins doc/mpdconf.example mpd.conf |
| 171 |
|
| 172 |
newinitd "${FILESDIR}"/mpd-r1.rc mpd |
| 173 |
|
| 174 |
if use unicode; then |
| 175 |
dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ |
| 176 |
/etc/mpd.conf || die "dosed failed" |
| 177 |
fi |
| 178 |
|
| 179 |
diropts -m0755 -o mpd -g audio |
| 180 |
dodir /var/lib/mpd |
| 181 |
keepdir /var/lib/mpd |
| 182 |
dodir /var/lib/mpd/music |
| 183 |
keepdir /var/lib/mpd/music |
| 184 |
dodir /var/lib/mpd/playlists |
| 185 |
keepdir /var/lib/mpd/playlists |
| 186 |
} |
| 187 |
|
| 188 |
pkg_postinst() { |
| 189 |
elog "If you will be starting mpd via /etc/init.d/mpd, please make" |
| 190 |
elog "sure that MPD's pid_file is unset." |
| 191 |
|
| 192 |
# also change the homedir if the user has existed before |
| 193 |
usermod -d "/var/lib/mpd" mpd |
| 194 |
} |
Archives