Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef30bb6277fb8711e4c90217e0a1190fc3cae607)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef30bb6277fb8711e4c90217e0a1190fc3cae607)
  • Date: Sat, 11 Dec 2010 20:16:29 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-players/mpd/CONFIGURE | 4 +
audio-players/mpd/DEPENDS | 81 ++++++++++++++++++----
audio-players/mpd/DETAILS | 4 -
audio-players/mpd/HISTORY | 7 +
audio-players/mpd/init.d/mpd | 3
audio-players/mpd/init.d/mpd.conf | 136
++++++++++++++++++++++++--------------
6 files changed, 166 insertions(+), 69 deletions(-)

New commits:
commit ef30bb6277fb8711e4c90217e0a1190fc3cae607
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpd: => 0.16

diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 15394aa..56105dc 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -13,3 +13,7 @@ config_query_option MPD_OPTS "Enable writing to a pipe?" y \
config_query_option MPD_OPTS "Enable HTTP server output?" y \
"--enable-httpd-output" \
"--disable-httpd-output"
+
+config_query_option MPD_OPTS "Enable recorder file output plugin?" n \
+ "--enable-recorder-output" \
+ "--disable-recorder-output"
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index f8af27e..e293595 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,4 +1,5 @@
depends zlib &&
+depends glib2 &&

optional_depends libao \
"--enable-ao" \
@@ -10,6 +11,11 @@ optional_depends libcue \
"--disable-cue" \
"for CUE sheet support" &&

+optional_depends libffado \
+ "--enable-ffado" \
+ "--disable-ffado" \
+ "for libffado (FireWire) support" &&
+
optional_depends liblastfm \
"--enable-lastfm" \
"--disable-lastfm" \
@@ -21,14 +27,21 @@ optional_depends bzip2 \
"for bzip2 archive support" &&

optional_depends zziplib \
- "--enable-zip" \
- "--disable-zip" \
+ "--enable-zzip" \
+ "--disable-zzip" \
"for zip archive support" &&

optional_depends libvorbis \
- "--enable-vorbis-encoder" "" \
+ "--enable-vorbis" \
+ "--disable-vorbis" \
"for Ogg Vorbis support" &&

+if is_depends_enabled $SPELL libvorbis; then
+ config_query_option MPD_OPTS "Enable Ogg Vorbis encoder support?" y \
+ "--enable-vorbis-encoder" \
+ "--disable-vorbis-encoder"
+fi &&
+
optional_depends sidplay-libs \
"--enable-sidplay" \
"--disable-sidplay" \
@@ -40,9 +53,15 @@ optional_depends libmpcdec \
"for musepack support" &&

optional_depends flac \
- "--enable-flac --enable-oggflac" \
- "--disable-flac --disable-oggflac" \
- "for FLAC (and OggFLAC) support" &&
+ "--enable-flac" \
+ "--disable-flac" \
+ "for FLAC support" &&
+
+if is_depends_enabled $SPELL flac && is_depends_enabled flac libogg; then
+ config_query_option MPD_OPTS "Enable OggFLAC support?" y \
+ "--enable-oggflac" \
+ "--disable-oggflac"
+fi &&

optional_depends faad2 \
"--enable-aac" \
@@ -54,6 +73,17 @@ optional_depends audiofile \
"--disable-audiofile" \
"for WAVE, AIFF and AU file support" &&

+if is_depends_enabled $SPELL audiofile; then
+ config_query_option MPD_OPTS "Enable WAVE encoder support?" y \
+ "--enable-wave-encoder" \
+ "--disable-wave-encoder"
+fi &&
+
+optional_depends libsndfile \
+ "--enable-sndfile" \
+ "--disable-sndfile" \
+ "for sndfile support" &&
+
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
@@ -77,7 +107,12 @@ optional_depends pulseaudio \
optional_depends libmad \
"--enable-mad" \
"--disable-mad" \
- "to use libmad (for mp3 files support)" &&
+ "for mp3 files support (libmad)" &&
+
+optional_depends mpg123 \
+ "--enable-mpg123" \
+ "--disable-mpg123" \
+ "for mp3 files support (libmpg123)" &&

optional_depends libid3tag \
"--enable-id3" \
@@ -87,18 +122,18 @@ optional_depends libid3tag \
optional_depends libmikmod \
"--enable-mikmod" \
"--disable-mikmod" \
- "for mod file support (libmikmod, default disabled)" &&
-
-optional_depends fluidsynth \
- "--enable-fluidsynth" \
- "--disable-fluidsynth" \
- "for MIDI support via fluidsynth" &&
+ "for mod file support (libmikmod)" &&

optional_depends libmodplug \
"--enable-modplug" \
"--disable-modplug" \
"for mod file support (libmodplug)" &&

+optional_depends fluidsynth \
+ "--enable-fluidsynth" \
+ "--disable-fluidsynth" \
+ "for MIDI support via fluidsynth" &&
+
optional_depends libsamplerate \
"--enable-lsr" \
"--disable-lsr" \
@@ -115,9 +150,15 @@ optional_depends wavpack \
"for WavPack support" &&

optional_depends lame \
- "--enable-lame-encoder" "" \
+ "--enable-lame-encoder" \
+ "--disable-lame-encoder" \
"for LAME encoder support" &&

+optional_depends twolame \
+ "--enable-twolame-encoder" \
+ "--disable-twolame-encoder" \
+ "for TwoLAME mp2 encoder support" &&
+
optional_depends curl \
"--enable-curl" \
"--disable-curl" \
@@ -133,6 +174,11 @@ optional_depends LIBAVCODEC \
"--disable-ffmpeg" \
"for FFMPEG support" &&

+optional_depends OPENAL \
+ "--enable-openal" \
+ "--disable-openal" \
+ "for OpenAL support" &&
+
optional_depends libmms \
"--enable-mms" \
"--disable-mms" \
@@ -141,4 +187,9 @@ optional_depends libmms \
optional_depends avahi \
"--with-zeroconf=avahi" \
"--with-zeroconf=no" \
- "for Zeroconf service discovery support"
+ "for Zeroconf service discovery support" &&
+
+optional_depends xmlto \
+ "--enable-documentation" \
+ "--disable-documentation" \
+ "to build documentation"
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 4fa3d91..8e0fea7 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.15.15
+ VERSION=0.16
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:d45334b387c55e691c8f7b29a6eb7fc194f685ff8679ce8e9243ed6d5f4b075b477e52726adb81ec3d453e3437a268356f9daef6b034f341ee1f0c007d9dcbfe
+
SOURCE_HASH=sha512:3cd44b081ef6f5e291d006f63015e1ab0b82dddc6a3e421db49e1984146bf9345ee1562acc1005e20f53b3fff7909d5717b340762a4b4e7b1fd01b0d8b2ae579
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index ec001bd..ae8c24b 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,10 @@
+2010-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.16
+ * DEPENDS: corrected flags, added new dependencies
+ * CONFIGURE: added new configure options
+ * init.d/mpd: ``--create-db'' isn't used anymore
+ * init.d/mpd.conf: updated example config file
+
2010-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.15

diff --git a/audio-players/mpd/init.d/mpd b/audio-players/mpd/init.d/mpd
index 0f937de..0589b2b 100644
--- a/audio-players/mpd/init.d/mpd
+++ b/audio-players/mpd/init.d/mpd
@@ -4,8 +4,5 @@ PROGRAM=/usr/bin/mpd
ARGS="/etc/sysconfig/mpd"
RUNLEVEL=3
NEEDS=""
-MPD_DB="$(grep db_file /etc/sysconfig/mpd | cut -d \" -f 2)"
-
-[[ ! -f $MPD_DB ]] && ARGS="$ARGS --create-db"

. /etc/init.d/smgl_init
diff --git a/audio-players/mpd/init.d/mpd.conf
b/audio-players/mpd/init.d/mpd.conf
index 9193262..b14337c 100644
--- a/audio-players/mpd/init.d/mpd.conf
+++ b/audio-players/mpd/init.d/mpd.conf
@@ -49,6 +49,11 @@
#
#state_file "~/.mpd/state"
#
+# The location of the sticker database. This is a database which
+# manages dynamic information attached to songs.
+#
+#sticker_file "~/.mpd/sticker.sql"
+#

###############################################################################


@@ -61,6 +66,13 @@
#
#user "nobody"
#
+# 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).
+# This is useful if MPD needs to be a member of group such as "audio" to
+# have permission to use sound card.
+#
+#group "nogroup"
+#
# 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.
# This setting can deny access to control of the daemon.
@@ -102,6 +114,16 @@
#
#metadata_to_use
"artist,album,title,track,name,genre,date,composer,performer,disc"
#
+# This setting enables automatic update of MPD's database when files in
+# music_directory are changed.
+#
+#auto_update "yes"
+#
+# Limit the depth of the directories being watched, 0 means only watch
+# the music directory itself. There is no limit by default.
+#
+#auto_update_depth "3"
+#

###############################################################################


@@ -177,11 +199,12 @@ input {
#audio_output {
# type "alsa"
# name "My ALSA Device"
-# device "hw:0,0" # optional
-# format "44100:16:2" # optional
-# mixer_device "default" # optional
-# mixer_control "PCM" # optional
-# mixer_index "0" # optional
+## device "hw:0,0" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "default" # optional
+## mixer_control "PCM" # optional
+## mixer_index "0" # optional
#}
#
# An example of an OSS output:
@@ -189,10 +212,11 @@ input {
#audio_output {
# type "oss"
# name "My OSS Device"
-# device "/dev/dsp" # optional
-# format "44100:16:2" # optional
-# mixer_device "/dev/mixer" # optional
-# mixer_control "PCM" # optional
+## device "/dev/dsp" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "/dev/mixer" # optional
+## mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
@@ -208,12 +232,25 @@ input {
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
-# protocol "icecast2" # optional
-# user "source" # optional
-# description "My Stream Description" # optional
-# genre "jazz" # optional
-# public "no" # optional
-# timeout "2" # optional
+## protocol "icecast2" # optional
+## user "source" # optional
+## description "My Stream Description" # optional
+## genre "jazz" # optional
+## public "no" # optional
+## timeout "2" # optional
+## mixer_type "software" # optional
+#}
+#
+# An example of a recorder output:
+#
+#audio_output {
+# type "recorder"
+# name "My recorder"
+# encoder "vorbis" # optional, vorbis or lame
+# path "/var/lib/mpd/recorder/mpd.ogg"
+## quality "5.0" # do not define if bitrate is
defined
+# bitrate "128" # do not define if quality is
defined
+# format "44100:16:1"
#}
#
# An example of a httpd output (built-in HTTP streaming server):
@@ -223,9 +260,11 @@ input {
# name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame
# port "8000"
-# quality "5.0" # do not define if bitrate is
defined
+# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6
+## quality "5.0" # do not define if bitrate is
defined
# bitrate "128" # do not define if quality is
defined
# format "44100:16:1"
+# max_clients "0" # optional 0=no limit
#}
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
@@ -233,8 +272,8 @@ input {
#audio_output {
# type "pulse"
# name "My Pulse Output"
-# server "remote_server" # optional
-# sink "remote_server_sink" # optional
+## server "remote_server" # optional
+## sink "remote_server_sink" # optional
#}
#
## Example "pipe" output:
@@ -255,6 +294,7 @@ input {
#audio_output {
# type "null"
# name "My Null Output"
+# mixer_type "none" # optional
#}
#
# This setting will change all decoded audio to be converted to the specified
@@ -273,38 +313,11 @@ input {

###############################################################################


-# Volume control mixer
########################################################
-#
-# These are the global volume control settings. By default, this setting will
-# be detected to the available audio output device, with preference going to
-# hardware mixing. Hardware and software mixers for individual audio_output
-# sections cannot yet be mixed.
-#
-# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this
-# setting is used other sound applications will be affected by the volume
-# being controlled by MPD.
-#
-#mixer_type "hardware"
-#
-# An example for controlling all mixers through software. This will control
-# all controls, even if the mixer is not supported by the device and will not
-# affect any other sound producing applications.
-#
-#mixer_type "software"
-#
-# This example will not allow MPD to touch the mixer at all and will disable
-# all volume controls.
-#
-#mixer_type "disabled"
-#
-###############################################################################
-
-
# Normalization automatic volume adjustments
##################################
#
# This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "album" or "track". See <http://www.replaygain.org> for more
-# details. This setting is disabled by default.
+# the argument "off", "album" or "track". See <http://www.replaygain.org>
+# for more details. This setting is off by default.
#
#replaygain "album"
#
@@ -357,8 +370,7 @@ input {
# Character Encoding
##########################################################
#
# If file or directory names do not display correctly for your locale then
you
-# may need to modify this setting. After modification of this setting mpd
-# --create-db must be run to change the database.
+# may need to modify this setting.
#
#filesystem_charset "UTF-8"
#
@@ -367,3 +379,29 @@ input {
#id3v1_encoding "ISO-8859-1"
#

###############################################################################
+
+
+# SIDPlay decoder
#############################################################
+#
+# songlength_database:
+# Location of your songlengths file, as distributed with the HVSC.
+# The sidplay plugin checks this for matching MD5 fingerprints.
+# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
+#
+# default_songlength:
+# This is the default playing time in seconds for songs not in the
+# songlength database, or in case you're not using a database.
+# A value of 0 means play indefinitely.
+#
+# filter:
+# Turns the SID filter emulation on or off.
+#
+#decoder {
+# plugin "sidplay"
+# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt"
+# default_songlength "120"
+# filter "true"
+#}
+#
+###############################################################################
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef30bb6277fb8711e4c90217e0a1190fc3cae607), Vlad Glagolev, 12/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page