[arch-commits] Commit in mpd/repos (3 files)
Giovanni Scafora
giovanni at archlinux.org
Tue Jan 20 18:59:34 UTC 2009
Date: Tuesday, January 20, 2009 @ 13:59:33
Author: giovanni
Revision: 24764
Merged revisions 24095,24098,24672,24674,24762 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/mpd/trunk
........
r24095 | andrea | 2009-01-13 09:51:49 -0800 (mar, 13 gen 2009) | 1 line
upgpkg: mpd 0.14-1
........
r24098 | andrea | 2009-01-13 10:54:03 -0800 (mar, 13 gen 2009) | 1 line
upgpkg: mpd 0.14-2
........
r24672 | andrea | 2009-01-19 13:54:44 -0800 (lun, 19 gen 2009) | 1 line
upgpkg: mpd 0.14.1-1
........
r24674 | andrea | 2009-01-19 14:07:19 -0800 (lun, 19 gen 2009) | 1 line
upgpkg: mpd 0.14.1-2
........
r24762 | giovanni | 2009-01-20 10:36:00 -0800 (mar, 20 gen 2009) | 1 line
upgpkg: mpd 0.14.1-3
........
Modified:
mpd/repos/extra-i686/ (properties)
mpd/repos/extra-i686/PKGBUILD
Deleted:
mpd/repos/extra-i686/mpd.conf.example
------------------+
PKGBUILD | 46 ++++++---
mpd.conf.example | 256 -----------------------------------------------------
2 files changed, 30 insertions(+), 272 deletions(-)
Property changes on: mpd/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /mpd/trunk:1-5699
+ /mpd/trunk:1-24763
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-01-20 18:37:34 UTC (rev 24763)
+++ extra-i686/PKGBUILD 2009-01-20 18:59:33 UTC (rev 24764)
@@ -3,29 +3,43 @@
# Contributor: Ben <ben at benmazer.net>
pkgname=mpd
-pkgver=0.13.2
-pkgrel=1
+pkgver=0.14.1
+pkgrel=3
pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
arch=('i686' 'x86_64')
-license=("GPL")
+license=('GPL')
url="http://musicpd.org"
depends=('libid3tag' 'libmad' 'flac>=1.1.3' 'audiofile' 'faad2>=2.6.1' 'libmikmod'
- 'alsa-lib' 'libshout' 'libmpcdec>=1.2.5' 'libsamplerate' 'libao')
+ 'alsa-lib' 'libshout' 'libmpcdec>=1.2.5' 'libsamplerate' 'libao' 'ffmpeg'
+ 'wavpack')
install=mpd.install
-source=(http://musicpd.org/uploads/files/mpd-${pkgver}.tar.gz
- mpd mpd.conf.example)
-md5sums=('33d0c7b08e2c9e2a6ad55703cb0d18d0' 'b1fd15de359db08e4b9ae4b199640f0e'\
- 'b3e370377d39d17427c50f04a0cdea6e')
+source=(http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.gz
+ 'mpd')
+md5sums=('7bb77277b784024faca1a6c922fcf80e'
+ 'b1fd15de359db08e4b9ae4b199640f0e')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --disable-jack --enable-ao -with-zeroconf=no
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-jack \
+ --enable-ao \
+ --with-zeroconf=no
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${pkgdir} install
- install -D ../mpd ${startdir}/pkg/etc/rc.d/mpd
- install -Dm644 ../mpd.conf.example ${startdir}/pkg/etc/mpd.conf.example
- mkdir -p ${startdir}/pkg/var/lib/mpd/playlists
- mkdir -p ${startdir}/pkg/var/log/mpd
- mkdir -p ${startdir}/pkg/var/run/mpd
+ # set ours dirs in mpd.conf file
+ sed -i 's|music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
+ sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
+ sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
+ sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
+ sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
+ sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
+ sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
+ sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
+
+ install -Dm644 doc/mpdconf.example ${pkgdir}/etc/mpd.conf.example || return 1
+
+ install -D ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd || return 1
+ install -d ${pkgdir}/var/lib/mpd/playlists ${pkgdir}/var/log/mpd ${pkgdir}/var/run/mpd
}
Deleted: extra-i686/mpd.conf.example
===================================================================
--- extra-i686/mpd.conf.example 2009-01-20 18:37:34 UTC (rev 24763)
+++ extra-i686/mpd.conf.example 2009-01-20 18:59:33 UTC (rev 24764)
@@ -1,256 +0,0 @@
-# An example configuration file for MPD
-# See the mpd.conf man page for a more detailed description of each parameter.
-
-######################## REQUIRED PATHS ########################
-#music_directory "~/music"
-#playlist_directory "~/playlists"
-#db_file "~/mpd.db"
-#log_file "~/mpd.log"
-#error_file "~/mpd.error"
-
-#music_directory "path_to_your_music_collection"
-playlist_directory "/var/lib/mpd/playlists"
-db_file "/var/lib/mpd/mpd.db"
-log_file "/var/log/mpd/mpd.log"
-error_file "/var/log/mpd/mpd.error"
-
-# Note: ~ is the home directory of user set in the "user" option
-################################################################
-
-
-######################## OPTIONAL PATHS ########################
-#
-# If you wish to use mpd --kill to stop MPD, then you must
-# specify a file here in which to store MPD's process ID.
-#
-#pid_file "~/.mpd/mpd.pid"
-pid_file "/var/run/mpd/mpd.pid"
-#
-# If specified, MPD will save its current state (playlist,
-# current song, playing/paused, etc.) at exit. This will be
-# used to restore the session the next time it is run.
-#
-#state_file "~/.mpd/mpdstate"
-state_file "/var/lib/mpd/mpdstate"
-#
-################################################################
-
-
-######################## DAEMON OPTIONS ########################
-#
-# If started as root, MPD will drop root privileges and run as
-# this user instead. Otherwise, MPD will run as the user it was
-# started by. If left unspecified, MPD will not drop root
-# privileges at all (not recommended).
-
-user "mpd"
-
-# The address and port to listen on.
-#
-bind_to_address "127.0.0.1"
-#bind_to_address "any"
-#port "6600"
-#
-# Controls the amount of information that is logged. Can be
-# "default", "secure", or "verbose".
-#
-#log_level "default"
-#
-################################################################
-
-
-########################## PERMISSIONS #########################
-#
-# MPD can require that users specify a password before using it.
-# You may specify one ore more here, along with what users who
-# log in with that password are allowed to do.
-#
-#password "password at read,add,control,admin"
-#
-# Specifies what permissions a user who has not logged in with a
-# password has. By default, all users have full access to MPD
-# if no password is specified above, or no access if one or
-# more passwords are specified.
-#
-#default_permissions "read,add,control,admin"
-#
-################################################################
-
-
-########################## AUDIO OUTPUT ########################
-#
-# MPD supports many audio output types, as well as playing
-# through multiple audio outputs at the same time. You can
-# specify one or more here. If you don't specify any, MPD will
-# automatically scan for a usable audio output.
-#
-# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs>
-# for examples of other audio outputs.
-#
-# An example of an ALSA output:
-#
-#audio_output {
-# type "alsa"
-# name "My ALSA Device"
-# device "hw:0,0" # optional
-# format "44100:16:2" # optional
-#}
-#
-# An example of an OSS output:
-#
-#audio_output {
-# type "oss"
-# name "My OSS Device"
-# device "/dev/dsp" # optional
-# format "44100:16:2" # optional
-#}
-#
-# An example of a shout output (for streaming to Icecast):
-#
-#audio_output {
-# type "shout"
-# name "My Shout Stream"
-# host "localhost"
-# port "8000"
-# mount "/mpd.ogg"
-# password "hackme"
-# quality "5.0"
-# bitrate "128"
-# format "44100:16:1"
-# user "source" # optional
-# description "My Stream Description" # optional
-# genre "jazz" # optional
-# public "no" # optional
-#}
-#
-# Force all decoded audio to be converted to this format before
-# being passed to the audio outputs.
-#
-#audio_output_format "44100:16:2"
-#
-################################################################
-
-
-############################# MIXER ############################
-#
-# MPD needs to know what mixer settings to change when you
-# adjust the volume. If you don't specify one here, MPD will
-# pick one based on which ones it was compiled with support for.
-#
-# An example for controlling an ALSA mixer:
-#
-#mixer_type "alsa"
-#mixer_device "default"
-#mixer_control "PCM"
-#
-# An example for controlling an OSS mixer:
-#
-#mixer_type "oss"
-#mixer_device "/dev/mixer"
-#mixer_control "PCM"
-#
-# If you want MPD to adjust the volume of audio sent to the
-# audio outputs, you can tell it to use the software mixer:
-#
-#mixer_type "software"
-#
-################################################################
-
-
-######################### NORMALIZATION ########################
-#
-# Specifies the type of ReplayGain to use. Can be "album" or
-# "track". ReplayGain will not be used if not specified. See
-# <http://www.replaygain.org> for more details.
-#
-#replaygain "album"
-#
-# Sets the pre-amp used for files that have ReplayGain tags.
-#
-#replaygain_preamp "0"
-#
-# Enable on the fly volume normalization. This will cause the
-# volume of all songs played to be adjusted so that they sound
-# as though they are of equal loudness.
-#
-#volume_normalization "no"
-#
-################################################################
-
-
-########################### BUFFERING ##########################
-#
-# The size of the buffer containing decoded audio. You probably
-# shouldn't change this.
-#
-#audio_buffer_size "2048"
-#
-# How much of the buffer to fill before beginning to play.
-#
-#buffer_before_play "0%"
-#
-# Similar options for the HTTP stream buffer. If you hear
-# skipping while playing HTTP streams, you may wish to increase
-# these.
-#
-#http_buffer_size "128"
-#http_prebuffer_size "25%"
-#
-################################################################
-
-
-########################### HTTP PROXY #########################
-#
-# Specifies the HTTP proxy to use for playing HTTP streams.
-#
-#http_proxy_host "proxy.isp.com"
-#http_proxy_port "8080"
-#http_proxy_user "user"
-#http_proxy_password "password"
-#
-################################################################
-
-
-############################# LIMITS ###########################
-#
-# These are various limits to prevent MPD from using too many
-# resources. You should only change them if they start
-# restricting your usage of MPD.
-#
-#connection_timeout "60"
-#max_connections "5"
-#max_playlist_length "16384"
-#max_command_list_size "2048"
-#max_output_buffer_size "8192"
-#
-################################################################
-
-
-###################### CHARACTER ENCODINGS #####################
-#
-# If file or directory names do not display correctly, then you
-# may need to change this. In most cases it should be either
-# "ISO-8859-1" or "UTF-8". You must recreate your database
-# after changing this (use mpd --create-db).
-#
-#filesystem_charset "ISO-8859-1"
-#
-# The encoding that ID3v1 tags should be converted from.
-#
-#id3v1_encoding "ISO-8859-1"
-#
-################################################################
-
-
-######################### OTHER OPTIONS ########################
-#
-# The metadata types MPD will recognize.
-#
-#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"
-#
-# Enable this if you wish to use your MPD created playlists in
-# other music players.
-#
-#save_absolute_paths_in_playlists "no"
-#
-################################################################
More information about the arch-commits
mailing list