From 6dbd1f091530c5cd1e818a17d753875e13ce7765 Mon Sep 17 00:00:00 2001 From: bernd Date: Sat, 13 May 2006 09:52:49 +0000 Subject: [PATCH] Initial import of mpd-0.11.5. Music Player Daemon allows remote access for playing music (mp3, ogg, flac, aac, mod and wav files) and managing playlists. MPD is designed for integrating a computer into a stereo system that provides control for music playback over a local network. It is also makes a great desktop music player and has serveral frontend options. Submitted and maintained by Tobias Ulmer . (Sorry for the delay Tobias!) tested by naddy@ --- audio/mpd/Makefile | 44 +++++++ audio/mpd/distinfo | 4 + audio/mpd/patches/patch-configure | 124 ++++++++++++++++++++ audio/mpd/patches/patch-doc_mpdconf_example | 64 ++++++++++ audio/mpd/patches/patch-src_volume_c | 12 ++ audio/mpd/pkg/DESCR | 6 + audio/mpd/pkg/MESSAGE | 12 ++ audio/mpd/pkg/PLIST | 21 ++++ 8 files changed, 287 insertions(+) create mode 100644 audio/mpd/Makefile create mode 100644 audio/mpd/distinfo create mode 100644 audio/mpd/patches/patch-configure create mode 100644 audio/mpd/patches/patch-doc_mpdconf_example create mode 100644 audio/mpd/patches/patch-src_volume_c create mode 100644 audio/mpd/pkg/DESCR create mode 100644 audio/mpd/pkg/MESSAGE create mode 100644 audio/mpd/pkg/PLIST diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile new file mode 100644 index 00000000000..32b911da451 --- /dev/null +++ b/audio/mpd/Makefile @@ -0,0 +1,44 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ + +COMMENT= "music player daemon" + +DISTNAME= mpd-0.11.5 +CATEGORIES= audio + +HOMEPAGE= http://www.musicpd.org/ + +MAINTAINER= Tobias Ulmer + +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +WANTLIB= c m pthread z ossaudio + +MASTER_SITES= http://mercury.chem.pitt.edu/~shank/ + +MODULES= converters/libiconv + +LIB_DEPENDS= vorbis.5,vorbisfile.4::audio/libvorbis \ + audiofile.0::devel/libaudiofile \ + ao.3::audio/libao \ + faad.0::audio/faad \ + id3tag.3::audio/libid3tag \ + mad.2::audio/libmad \ + ogg.5::audio/libogg \ + FLAC.7::audio/flac \ + mikmod.2::audio/libmikmod + +USE_LIBTOOL= Yes + +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --disable-alsa --with-libFLAC=${LOCALBASE} + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd + ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ + ${PREFIX}/share/examples/mpd/mpd.conf + +.include diff --git a/audio/mpd/distinfo b/audio/mpd/distinfo new file mode 100644 index 00000000000..3e9902453ba --- /dev/null +++ b/audio/mpd/distinfo @@ -0,0 +1,4 @@ +MD5 (mpd-0.11.5.tar.gz) = 1a9a1a9d31f00a43838b3752024f7ebe +RMD160 (mpd-0.11.5.tar.gz) = 4a7dd3473110aa1f860fbd7a760da7fdfe2a9ebf +SHA1 (mpd-0.11.5.tar.gz) = 5661008b3eb799f8d76949a37bc439917dbbb68a +SIZE (mpd-0.11.5.tar.gz) = 1127523 diff --git a/audio/mpd/patches/patch-configure b/audio/mpd/patches/patch-configure new file mode 100644 index 00000000000..cf0306d8fb4 --- /dev/null +++ b/audio/mpd/patches/patch-configure @@ -0,0 +1,124 @@ +$OpenBSD: patch-configure,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +--- configure.orig Tue Nov 2 05:39:55 2004 ++++ configure Tue Apr 4 16:00:51 2006 +@@ -19274,7 +19274,7 @@ fi + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 + echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi +- if test -z `grep -e 'shared_ext.*shrext' $ofile`; then ++ if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then + # Make sure $shared_ext gets set to $shrext + if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then + mv "${ofile}T" "$ofile" +@@ -19357,7 +19357,7 @@ MPD_CFLAGS="" + if test x$CC = xgcc; then + MPD_CFLAGS="-Wall" + fi +-MPD_LIBS="" ++MPD_LIBS="-lossaudio" + + # Check whether --enable-audio or --disable-audio was given. + if test "${enable_audio+set}" = set; then +@@ -22426,8 +22426,8 @@ _ACEOF + fi + + if test "${ac_cv_header_sys_soundcard_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 +-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for soundcard.h" >&5 ++echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6 + if test "${ac_cv_header_sys_soundcard_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +@@ -22435,8 +22435,8 @@ echo "$as_me:$LINENO: result: $ac_cv_hea + echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 +-echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking soundcard.h usability" >&5 ++echo $ECHO_N "checking soundcard.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22444,7 +22444,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -22480,15 +22480,15 @@ echo "$as_me:$LINENO: result: $ac_header + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 +-echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking soundcard.h presence" >&5 ++echo $ECHO_N "checking soundcard.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -22522,25 +22522,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: soundcard.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: soundcard.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: soundcard.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: soundcard.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: soundcard.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: soundcard.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: soundcard.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -22551,8 +22551,8 @@ _ASBOX + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 +-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for soundcard.h" >&5 ++echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6 + if test "${ac_cv_header_sys_soundcard_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else diff --git a/audio/mpd/patches/patch-doc_mpdconf_example b/audio/mpd/patches/patch-doc_mpdconf_example new file mode 100644 index 00000000000..cf0b2ed2d37 --- /dev/null +++ b/audio/mpd/patches/patch-doc_mpdconf_example @@ -0,0 +1,64 @@ +$OpenBSD: patch-doc_mpdconf_example,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +--- doc/mpdconf.example.orig Tue Nov 2 05:03:21 2004 ++++ doc/mpdconf.example Fri Apr 7 18:46:01 2006 +@@ -4,10 +4,10 @@ + + ##################### REQUIRED ########################### + port "6600" +-music_directory "~/music" +-playlist_directory "~/.mpd/playlists" +-log_file "~/.mpd/mpd.log" +-error_file "~/.mpd/mpd.error" ++music_directory "/please-configure-your-music_directory" ++playlist_directory "/var/spool/mpd/playlists" ++log_file "/var/log/mpd/mpd.log" ++error_file "/var/log/mpd/mpd.error" + ########################################################## + + ########################################################## +@@ -35,7 +35,7 @@ error_file "~/.mpd/mpd.error" + # + # Location of DB file + # +-#db_file "~/.mpd/mpd.db" ++db_file "/var/spool/mpd/mpd.db" + # + # The state file (if set) will be a file + # for storing all current information +@@ -44,7 +44,7 @@ error_file "~/.mpd/mpd.error" + # to recreate your last MPD session after + # restart. + # +-#state_file "~/.mpd/mpdstate" ++state_file "/var/spool/mpd/mpdstate" + # + ########################################################## + +@@ -58,9 +58,9 @@ error_file "~/.mpd/mpd.error" + #mixer_control "PCM" + # + # OSS Mixer +-#mixer_type "oss" +-#mixer_device "/dev/mixer" +-#mixer_control "PCM" ++mixer_type "oss" ++mixer_device "/dev/mixer" ++mixer_control "master" + # + # Software Mixer + #mixer_type "software" +@@ -142,12 +142,12 @@ error_file "~/.mpd/mpd.error" + # this value, then mpd will drop root priveleges + # and runs as the user specified. + # +-#user "nobody" ++user "_mpd" + # + # Set this value if you only have one + # address you want to allow connection to. + # +-#bind_to_address "localhost" ++bind_to_address "localhost" + # + # If you want to setup MPD to use + # passwords set them here diff --git a/audio/mpd/patches/patch-src_volume_c b/audio/mpd/patches/patch-src_volume_c new file mode 100644 index 00000000000..03054ae82f3 --- /dev/null +++ b/audio/mpd/patches/patch-src_volume_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_volume_c,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +--- src/volume.c.orig Tue Apr 4 16:03:01 2006 ++++ src/volume.c Tue Apr 4 16:03:09 2006 +@@ -30,7 +30,7 @@ + #include + #include + #ifndef NO_OSS_MIXER +-#include ++#include + #endif + #ifdef HAVE_ALSA + #include diff --git a/audio/mpd/pkg/DESCR b/audio/mpd/pkg/DESCR new file mode 100644 index 00000000000..e278c9ec65a --- /dev/null +++ b/audio/mpd/pkg/DESCR @@ -0,0 +1,6 @@ +Music Player Daemon allows remote access for playing music (mp3, +ogg, flac, aac, mod and wav files) and managing playlists. MPD is +designed for integrating a computer into a stereo system that +provides control for music playback over a local network. It is +also makes a great desktop music player and has serveral frontend +options. diff --git a/audio/mpd/pkg/MESSAGE b/audio/mpd/pkg/MESSAGE new file mode 100644 index 00000000000..0183bb796da --- /dev/null +++ b/audio/mpd/pkg/MESSAGE @@ -0,0 +1,12 @@ +A sample configuration file has been installed to ${SYSCONFDIR}/mpd.conf +and MPD is configured to listen on localhost only. + +Make sure that music_directory points to a valid directory, +otherwise MPD won't start. + +If you wish to have MPD started automatically at boot time, +simply add the follow lines to /etc/rc.local: + +if [ -x ${PREFIX}/bin/mpd ]; then + echo -n ' mpd'; ${PREFIX}/bin/mpd +fi diff --git a/audio/mpd/pkg/PLIST b/audio/mpd/pkg/PLIST new file mode 100644 index 00000000000..7f86d259645 --- /dev/null +++ b/audio/mpd/pkg/PLIST @@ -0,0 +1,21 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +@newgroup _mpd:560 +@newuser _mpd:560:560:daemon:Music Player Daemon:/var/empty:/sbin/nologin +bin/mpd +@man man/man1/mpd.1 +share/doc/mpd/ +share/doc/mpd/COMMANDS +share/doc/mpd/README +share/doc/mpd/UPGRADING +share/examples/mpd/ +share/examples/mpd/mpd.conf +@sample ${SYSCONFDIR}/mpd.conf +@mode 770 +@owner _mpd +@group _mpd +@sample /var/log/mpd/ +@sample /var/spool/mpd/ +@sample /var/spool/mpd/playlists/ +@extraunexec rm -rf /var/log/mpd/* +@extraunexec rm -rf /var/spool/mpd/* +@extraunexec rm -rf /var/spool/mpd/playlists/*