From 87f9f6f4ec11205eaf632034f2159603137ead28 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 13 Dec 2010 03:01:08 +0000 Subject: Version bump Package-Manager: portage-2.1.9.24/cvs/Linux x86_64 --- media-sound/mpd/ChangeLog | 8 +- media-sound/mpd/Manifest | 7 +- media-sound/mpd/files/mpd-0.16.conf.patch | 70 +++++++++++++ media-sound/mpd/metadata.xml | 1 + media-sound/mpd/mpd-0.16.ebuild | 164 ++++++++++++++++++++++++++++++ 5 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 media-sound/mpd/files/mpd-0.16.conf.patch create mode 100644 media-sound/mpd/mpd-0.16.ebuild (limited to 'media-sound') diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 795b9d9d528a..0a5176de2858 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/mpd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.220 2010/11/26 17:27:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.221 2010/12/13 03:01:08 hwoarang Exp $ + +*mpd-0.16 (13 Dec 2010) + + 13 Dec 2010; Markos Chandras +mpd-0.16.ebuild, + +files/mpd-0.16.conf.patch, metadata.xml: + Version bump 26 Nov 2010; Jeroen Roovers mpd-0.15.13.ebuild: Stable for PPC (bug #345245). diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index ba1e4e5be210..44f520416338 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,4 +1,5 @@ AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523 +AUX mpd-0.16.conf.patch 2656 RMD160 c7309ff6465f935f67b6bc268f2847bf4a1d666c SHA1 1cdc8452d8592e62e929211a6bd45b47bce39278 SHA256 328e8dbc0c5f0f13c8517fbd9b0467c94358025b079ce58aa13ac6743415c7a9 AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c5c3288a3318bb61625edfd266ee453c928109 SHA256 b73ec60d2766d86d78f9ba63d3e5973e8ffb3c1f412f450949bbd3e6dfcbf24f AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8 @@ -8,11 +9,13 @@ DIST mpd-0.15.13.tar.bz2 391234 RMD160 1792a565d90e218c949dae54f1c5c00f6a414848 DIST mpd-0.15.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245 SHA1 2ec37cc32469255ea603d15617f100d1f12e766c SHA256 db6dc242722e3178bcbff6b67ced8caccbb8dcddf867b8ab6bab42d6e55982ab DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7 DIST mpd-0.15.9.tar.bz2 390141 RMD160 566440dbc16ac46f20d8d11bfe09ffe43423eb34 SHA1 9dbef302ef44372f2232c1df1af2f3a958ff601d SHA256 4a57a1a0dc71606d0db926b67d5b2c1ed2bfaf94baca7889d4b994a37bf367bb +DIST mpd-0.16.tar.bz2 479757 RMD160 acc2f53f160dedb5222c0dea75afbffad95d46c2 SHA1 ab2fc09474501b5b9396a359027ca4f1ebbd4aa5 SHA256 e2ad191540f204fb165735b1f896e0aeb632c5021fd2038450e6e2ca93cac06b EBUILD mpd-0.15.10.ebuild 4856 RMD160 f29d15928d045d01e082bfd779a627e824ac150a SHA1 1919f9748f195d11a931de60d584bfcc82704248 SHA256 058c537587cce8d3248ed025ae13448065d349c34a24466f443a31b18e2d67b8 EBUILD mpd-0.15.12-r2.ebuild 4662 RMD160 b029a3897719cc08a515b879427792951877943c SHA1 727c82cf181898cf5dd84c976db46cef20d56d00 SHA256 97c6a35bef3b53070088c061e6d4786e98ef1f53d80a17fabaae50db8a6728c1 EBUILD mpd-0.15.13.ebuild 4650 RMD160 8143fad65d5f43eed5aa0d2121689f1c16b1b69a SHA1 99d46cf82de586e48665549dcb2c72be47975b58 SHA256 237f07be37886ad13b203dbfe2e21164e4b2e2f6329fb43e32c8403fb8b9d338 EBUILD mpd-0.15.15.ebuild 4661 RMD160 817c19c8f482b66ed0a05d97ad46d1090f2774e6 SHA1 91796715d9e90212edeb65ab03b423e2223c9c12 SHA256 cf949db80b22ce10cce154d25dc17d88c0a530a37ae59527e443d00a72135319 EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e EBUILD mpd-0.15.9.ebuild 4855 RMD160 9da20eabc1e9701e3fa28dc853450ce4bd229b8d SHA1 c865262ae66b18c3220317a6b012fce9c752a654 SHA256 43c7e2d1796f28a3dee972afb71e9592c29ea1639c849080007f71a09e7d7e7c -MISC ChangeLog 32351 RMD160 747db46b02da22011a9586e8b6684de6f845821c SHA1 877a30d625dc6f3faec23e9fa49ff655333c852f SHA256 c8f868f75f75dddedb9f513829102a19b3d227496326d40c467b3acce948e6ef -MISC metadata.xml 1165 RMD160 299dd7565f872817d7f42729790bff04727569e7 SHA1 43ebac2612e2fcc9c0e3f64ef296905030fbb2f0 SHA256 02537c5f7f51efaa0aa04d74d3315850a1e12334d592bd2fe896bbbb5af20623 +EBUILD mpd-0.16.ebuild 4793 RMD160 1fe182966de068786626b38479cb89519eaad069 SHA1 893e4168712438ed2132f28548027bf92bea4b83 SHA256 c59e5dd6076b1d341fab739f395b1cbe9fb1bdaca67ac3a8752cb98f205c4c29 +MISC ChangeLog 32512 RMD160 e75452fe32cb06ffa43bf2f3afbc6a6afd9f8767 SHA1 22a9e1d56a533fb4e6086ec9b5c722fe05a7d93e SHA256 948b8a7b57a23dba100a6ed622cd51449b4c81312acb45f26261a3bca056316b +MISC metadata.xml 1253 RMD160 96b068253042239245cfc4a874f041605a3fd62f SHA1 5b305be7fa9d338e4d98aeade5cd51828995070a SHA256 1ab306da69f8e05c1b2c56e623dbf27c993c54d349a7b1d40b9f783f2d7b36c8 diff --git a/media-sound/mpd/files/mpd-0.16.conf.patch b/media-sound/mpd/files/mpd-0.16.conf.patch new file mode 100644 index 000000000000..664134569e7e --- /dev/null +++ b/media-sound/mpd/files/mpd-0.16.conf.patch @@ -0,0 +1,70 @@ +Index: mpd-0.16/doc/mpdconf.example +=================================================================== +--- mpd-0.16.orig/doc/mpdconf.example ++++ mpd-0.16/doc/mpdconf.example +@@ -10,14 +10,14 @@ + # be disabled and audio files will only be accepted over ipc socket (using + # file:// protocol) or streaming files over an accepted protocol. + # +-#music_directory "~/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 + # playlist files not created by the server but only if they are in the MPD + # format. This setting defaults to playlist saving being disabled. + # +-#playlist_directory "~/.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 +@@ -25,7 +25,7 @@ + # MPD to accept files over ipc socket (using file:// protocol) or streaming + # files over an accepted protocol. + # +-#db_file "~/.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 +@@ -34,7 +34,7 @@ + # The special value "syslog" makes MPD use the local syslog daemon. This + # setting defaults to logging to syslog, otherwise logging is disabled. + # +-#log_file "~/.mpd/log" ++log_file "/var/lib/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 +@@ -47,7 +47,7 @@ + # it was brought down. This setting is disabled by default and the server + # state will be reset on server start up. + # +-#state_file "~/.mpd/state" ++state_file "/var/lib/mpd/state" + # + # The location of the sticker database. This is a database which + # manages dynamic information attached to songs. +@@ -64,7 +64,7 @@ + # initialization. This setting is disabled by default and MPD is run as the + # current user. + # +-#user "nobody" ++user "mpd" + # + # This setting specifies the group that MPD will run as. If not specified + # primary group of user specified with "user" setting will be used (if set). +@@ -78,10 +78,10 @@ + # This setting can deny access to control of the daemon. + # + # For network +-#bind_to_address "any" ++bind_to_address "localhost" + # + # And for Unix Socket +-#bind_to_address "~/.mpd/socket" ++bind_to_address "/var/lib/mpd/soicket" + # + # 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 0cf5ff3fe264..c41ff694d1c5 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -16,6 +16,7 @@ Support for MP3 streaming via Icecast2 Support listening to last.fm radio stations Support for Microsoft Media Server (MMS) streams via libmms + Enable support for mp3 decoding over media-sound/mpg123. Enables network streaming support Support writing audio to a pipe Build with SID (Commodore 64 Audio) support diff --git a/media-sound/mpd/mpd-0.16.ebuild b/media-sound/mpd/mpd-0.16.ebuild new file mode 100644 index 000000000000..369899c89f41 --- /dev/null +++ b/media-sound/mpd/mpd-0.16.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.ebuild,v 1.1 2010/12/13 03:01:08 hwoarang Exp $ + +EAPI=2 +inherit eutils flag-o-matic multilib + +DESCRIPTION="The Music Player Daemon (mpd)" +HOMEPAGE="http://www.musicpd.org" +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 avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac +fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad +mikmod modplug mpg123 musepack +network ogg oss pipe pulseaudio sid sqlite unicode +vorbis wavpack wildmidi zip" + +RDEPEND="!sys-cluster/mpich2 + >=dev-libs/glib-2.6:2 + aac? ( >=media-libs/faad2-2 ) + alsa? ( media-sound/alsa-utils ) + ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] ) + 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?] ) + fluidsynth? ( media-sound/fluidsynth ) + network? ( >=media-libs/libshout-2 + !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) + id3? ( media-libs/libid3tag ) + jack? ( media-sound/jack-audio-connection-kit ) + lame? ( network? ( media-sound/lame ) ) + libmms? ( >=media-libs/libmms-0.4 ) + libsamplerate? ( media-libs/libsamplerate ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( >=media-sound/musepack-tools-444 ) + ogg? ( media-libs/libogg ) + pulseaudio? ( media-sound/pulseaudio ) + sid? ( >=media-libs/libsidplay-2.1.1-r2:2 ) + sqlite? ( dev-db/sqlite:3 ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + wildmidi? ( media-sound/wildmidi ) + avahi? ( net-dns/avahi ) + zip? ( dev-libs/zziplib )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +pkg_setup() { + use network || ewarn "Icecast and Shoutcast streaming needs networking." + use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." + + enewuser mpd "" "" "/var/lib/mpd" audio +} + +src_prepare() { + cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" + epatch "${FILESDIR}"/${P}.conf.patch +} + +src_configure() { + local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un + ---disable-libOggFLACtest --disable-documentation --disable-ffado + --docdir=${EPREFIX}/usr/share/doc/${PF}" + + if use network; then + mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) + --enable-httpd-output $(use_enable lame lame-encoder)" + if ! use lame && ! use vorbis; then + ewarn "At least one encoder is required, enabling vorbis for you." + mpdconf+=" --enable-vorbis-encoder" + fi + else + mpdconf+=" --disable-shout --disable-vorbis-encoder + --disable-httpd-output --disable-lame-encoder" + fi + + if use flac && use ogg; then + mpdconf+=" --enable-oggflac" + else + mpdconf+=" --disable-oggflac" + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + cd "${S}" + + econf \ + $(use_enable aac) \ + $(use_enable alsa) \ + $(use_enable ao) \ + $(use_enable audiofile) \ + $(use_with avahi zeroconf avahi) \ + $(use_enable bzip2) \ + $(use_enable cdio iso9660) \ + $(use_enable cue) \ + $(use_enable curl) \ + $(use_enable debug) \ + $(use_enable ffmpeg) \ + $(use_enable fifo) \ + $(use_enable flac) \ + $(use_enable fluidsynth) \ + $(use_enable jack) \ + $(use_enable id3) \ + $(use_enable ipv6) \ + $(use_enable lastfmradio lastfm) \ + $(use_enable libmms mms) \ + $(use_enable libsamplerate lsr) \ + $(use_enable mad) \ + $(use_enable mikmod) \ + $(use_enable modplug) \ + $(use_enable mpg123) \ + $(use_enable musepack mpc) \ + $(use_enable oss) \ + $(use_enable pipe pipe-output) \ + $(use_enable profile gprof) \ + $(use_enable pulseaudio pulse) \ + $(use_enable sid sidplay) \ + $(use_enable sqlite) \ + $(use_enable vorbis) \ + $(use_enable wavpack) \ + $(use_enable wildmidi) \ + $(use_enable zip zzip) \ + ${mpdconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + insinto /etc + newins doc/mpdconf.example mpd.conf + + newinitd "${FILESDIR}"/mpd.init mpd + + if use unicode; then + dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ + /etc/mpd.conf || die "dosed failed" + fi + + diropts -m0755 -o mpd -g audio + dodir /var/lib/mpd + keepdir /var/lib/mpd + dodir /var/lib/mpd/music + keepdir /var/lib/mpd/music + dodir /var/lib/mpd/playlists + keepdir /var/lib/mpd/playlists +} + +pkg_postinst() { + elog "If you will be starting mpd via /etc/init.d/mpd, please make" + elog "sure that MPD's pid_file is unset." + + # also change the homedir if the user has existed before + usermod -d "/var/lib/mpd" mpd +} -- cgit v1.2.3-65-gdbad