cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.15.7.

Browse Source 
Most awesomely, mpd can now stream natively without a icecast server.
ok and help from MAINTAINER Tobias Ulmer <tobiasu at tmux dot org>.
This commit is contained in:
wcmaier 2010-01-12 18:58:26 +00:00
parent fb5a1ed649
commit 61313b5109
9 changed files with 112 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
audio/mpd/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.19 2010/01/12 18:51:07 wcmaier Exp $
# $OpenBSD: Makefile,v 1.20 2010/01/12 18:58:26 wcmaier Exp $
COMMENT = Music Player Daemon
DISTNAME = mpd-0.13.2
PKGNAME = ${DISTNAME}p4
DISTNAME = mpd-0.15.7
CATEGORIES = audio
HOMEPAGE = http://www.musicpd.org/
MAINTAINER = Tobias Ulmer <tobiasu@tmux.org>
@ -13,21 +12,23 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pthread ogg z
WANTLIB = c m pthread ogg z intl stdc++ sndio
MASTER_SITES = ${HOMEPAGE}uploads/files/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=musicpd/}
MODULES = converters/libiconv
LIB_DEPENDS = audiofile::devel/libaudiofile \
ao::audio/libao \
samplerate::audio/libsamplerate \
faad.>=2::audio/faad \
FLAC::audio/flac \
id3tag::audio/libid3tag \
mad::audio/libmad \
mikmod::audio/libmikmod \
mpcdec::audio/libmpcdec
curl::net/curl \
glib-2.0,gthread-2.0::devel/glib2 \
mp3lame::audio/lame
FLAVORS = tremor
FLAVOR ?=
@ -37,11 +38,19 @@ CONFIGURE_ARGS += --enable-ao \
--disable-alsa \
--disable-oss \
--disable-pulse \
--disable-sun \
--disable-jack \
--enable-mod \
--enable-mikmod \
--enable-curl \
--disable-wavpack \
--bindir=${PREFIX}/sbin \
--with-zeroconf=no
--with-zeroconf=no \
--disable-cue \
--disable-sqlite \
--disable-mms \
--disable-modplug \
--disable-sidplay \
--disable-ffmpeg \
--disable-mpc
# OggFLAC and tremor tests, initgroups(3)
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -D_BSD_SOURCE"

10
audio/mpd/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mpd-0.13.2.tar.gz) = M9DHsI4snipq1VcDyw0Y0A==
RMD160 (mpd-0.13.2.tar.gz) = 0h4/aFisj7dp1CePmIwX/hWAvFM=
SHA1 (mpd-0.13.2.tar.gz) = dEgA47ZnoNEUGAKbjtafdBTgbpw=
SHA256 (mpd-0.13.2.tar.gz) = HxVm5XTvUbsVSXU93uUZcgD+QJS+5JyynIps1k0YSjE=
SIZE (mpd-0.13.2.tar.gz) = 556468
MD5 (mpd-0.15.7.tar.gz) = xLNAdhEIburVvNyrOPs9IA==
RMD160 (mpd-0.15.7.tar.gz) = IxSGCJVN/LvL3TVGCxThjTsomU8=
SHA1 (mpd-0.15.7.tar.gz) = AF2Iiaqi5PFU8jK1Ygty1NilSjo=
SHA256 (mpd-0.15.7.tar.gz) = Jzl7+is0hUkFkeTM5m+72zLA2lsc2+VnmgDIETdxgEg=
SIZE (mpd-0.15.7.tar.gz) = 480712

12
audio/mpd/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2010/01/12 18:58:26 wcmaier Exp $
--- Makefile.in.orig Wed Nov 18 20:48:14 2009
+++ Makefile.in Thu Dec 17 16:11:52 2009
@@ -1525,7 +1525,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC)
# Documentation
#
man_MANS = doc/mpd.1 doc/mpd.conf.5
-doc_DATA = AUTHORS COPYING NEWS README UPGRADING doc/mpdconf.example
+doc_DATA = AUTHORS COPYING NEWS README UPGRADING
DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml doc/sticker.xml
@ENABLE_DOCUMENTATION_TRUE@protocoldir = $(docdir)/protocol
@ENABLE_DOCUMENTATION_TRUE@protocol_DATA = $(wildcard doc/protocol/*.html)

11
audio/mpd/patches/patch-configure
View File

@ -1,11 +0,0 @@
--- configure.orig Tue Jun 17 07:46:22 2008
+++ configure Wed Jul 9 12:26:44 2008
@@ -26288,7 +26288,7 @@ fi
LIBFLAC_LIBS="-L$libdir"
fi
- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"

12
audio/mpd/patches/patch-doc_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2008/07/15 08:40:49 bernd Exp $
--- doc/Makefile.in.orig Tue Jun 17 07:46:21 2008
+++ doc/Makefile.in Wed Jul 9 12:27:25 2008
@@ -121,7 +121,7 @@ am__quote = @am__quote@
install_sh = @install_sh@
man_MANS = mpd.1 mpd.conf.5
docdir = $(prefix)/share/doc/$(PACKAGE)
-doc_DATA = COMMANDS mpdconf.example
+doc_DATA = COMMANDS
EXTRA_DIST = $(man_MANS) $(doc_DATA)
subdir = doc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

130
audio/mpd/patches/patch-doc_mpdconf_example
View File

@ -1,78 +1,94 @@
$OpenBSD: patch-doc_mpdconf_example,v 1.5 2008/07/15 08:40:49 bernd Exp $
--- doc/mpdconf.example.orig Mon Jun 16 04:48:07 2008
+++ doc/mpdconf.example Wed Jul 9 12:26:44 2008
@@ -2,11 +2,11 @@
# See the mpd.conf man page for a more detailed description of each parameter.
######################## REQUIRED PATHS ########################
-music_directory "~/music"
-playlist_directory "~/.mpd/playlists"
-db_file "~/.mpd/mpd.db"
-log_file "~/.mpd/mpd.log"
-error_file "~/.mpd/mpd.error"
+music_directory "/please-configure-your-music_directory"
+playlist_directory "/var/spool/mpd/playlists"
+db_file "/var/spool/mpd/mpd.db"
+log_file "/var/log/mpd/mpd.log"
+error_file "/var/log/mpd/mpd.error"
################################################################
@@ -15,13 +15,13 @@ error_file "~/.mpd/mpd.error"
# 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.
$OpenBSD: patch-doc_mpdconf_example,v 1.6 2010/01/12 18:58:26 wcmaier Exp $
--- doc/mpdconf.example.orig Wed Nov 18 20:47:54 2009
+++ doc/mpdconf.example Thu Dec 17 16:13:38 2009
@@ -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.
#
-#pid_file "~/.mpd/mpd.pid"
-#music_directory "~/music"
+music_directory "/please-configure-your-music_directory"
#
# 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/spool/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/spool/mpd/mpd.db"
#
# 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,20 +34,20 @@
# 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/log/mpd/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
# default and the pid file will not be stored.
#
-#pid_file "~/.mpd/pid"
+pid_file "/var/spool/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.
# This setting sets the location of the file which contains information about
# most variables to get MPD back into the same general shape it was in before
# it was brought down. This setting is disabled by default and the server
# state will be reset on server start up.
#
-#state_file "~/.mpd/mpdstate"
-#state_file "~/.mpd/state"
+state_file "/var/spool/mpd/mpdstate"
#
################################################################
###############################################################################
@@ -33,11 +33,11 @@ error_file "~/.mpd/mpd.error"
# started by. If left unspecified, MPD will not drop root
# privileges at all (not recommended).
@@ -59,7 +59,7 @@
# initialization. This setting is disabled by default and MPD is run as the
# current user.
#
-#user "nobody"
-#user "nobody"
+user "_mpd"
#
# The address and port to listen on.
# 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.
@@ -71,6 +71,8 @@
# And for Unix Socket
#bind_to_address "~/.mpd/socket"
#
-#bind_to_address "any"
+bind_to_address "localhost"
#port "6600"
+#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
# Controls the amount of information that is logged. Can be
@@ -108,6 +108,12 @@ error_file "~/.mpd/mpd.error"
# format "44100:16:2" # optional
@@ -257,6 +259,13 @@ input {
# name "My Null Output"
#}
#
+
+## Default libao output:
+#
+audio_output {
+ type "ao"
+ name "Libao Audio Device"
+}
+
# An example of a shout output (for streaming to Icecast):
+#
# This setting will change all decoded audio to be converted to the specified
# format before being passed to the audio outputs. By default, this setting is
# disabled.
@@ -290,7 +299,7 @@ input {
# all controls, even if the mixer is not supported by the device and will not
# affect any other sound producing applications.
#
#audio_output {
@@ -157,12 +163,12 @@ error_file "~/.mpd/mpd.error"
-#mixer_type "software"
+mixer_type "software"
#
#mixer_type "oss"
#mixer_device "/dev/mixer"
-#mixer_control "PCM"
+#mixer_control "vol"
#
# 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"
+mixer_type "software"
#
################################################################
# This example will not allow MPD to touch the mixer at all and will disable
# all volume controls.

21
audio/mpd/patches/patch-src_inputPlugins_aac_plugin_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_inputPlugins_aac_plugin_c,v 1.2 2008/09/15 22:04:17 jakemsr Exp $
--- src/inputPlugins/aac_plugin.c.orig Sun Jan 27 15:13:31 2008
+++ src/inputPlugins/aac_plugin.c Wed Jul 16 01:41:56 2008
@@ -237,7 +237,7 @@ static float getAacFloatTotalTime(char *file)
size_t fileread, tagsize;
faacDecHandle decoder;
faacDecConfigurationPtr config;
- unsigned long sampleRate;
+ unsigned int sampleRate;
unsigned char channels;
InputStream inStream;
long bread;
@@ -293,7 +293,7 @@ static int aac_decode(OutputBuffer * cb, DecoderContro
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
long bread;
- unsigned long sampleRate;
+ unsigned int sampleRate;
unsigned char channels;
int eof = 0;
unsigned int sampleCount;

12
audio/mpd/patches/patch-src_inputPlugins_mp4_plugin_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_inputPlugins_mp4_plugin_c,v 1.2 2008/09/15 22:04:17 jakemsr Exp $
--- src/inputPlugins/mp4_plugin.c.orig Sun Jan 27 15:13:31 2008
+++ src/inputPlugins/mp4_plugin.c Wed Jul 16 01:44:57 2008
@@ -100,7 +100,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderContro
faacDecConfigurationPtr config;
unsigned char *mp4Buffer;
unsigned int mp4BufferSize;
- unsigned long sampleRate;
+ unsigned int sampleRate;
unsigned char channels;
long sampleId;
long numSamples;

6
audio/mpd/pkg/PLIST
View File

@ -1,11 +1,13 @@
@comment $OpenBSD: PLIST,v 1.4 2008/07/15 08:40:49 bernd Exp $
@comment $OpenBSD: PLIST,v 1.5 2010/01/12 18:58:26 wcmaier Exp $
@newgroup _mpd:560
@newuser _mpd:560:560:daemon:Music Player Daemon:/var/empty:/sbin/nologin
@man man/man1/mpd.1
@man man/man5/mpd.conf.5
@bin sbin/mpd
share/doc/mpd/
share/doc/mpd/COMMANDS
share/doc/mpd/AUTHORS
share/doc/mpd/COPYING
share/doc/mpd/NEWS
share/doc/mpd/README
share/doc/mpd/UPGRADING
share/examples/mpd/