is glurp (the mpd client)  in the OpenBSD ports tree?

http://www.musicpd.org/glurp.shtml


Sam Fourman Jr.


On 10/28/06, Bernd Ahlers <[EMAIL PROTECTED]> wrote:
Tobias Ulmer [Sun, Oct 29, 2006 at 12:52:13AM +0200] wrote:
>> Hmm, do we really need a FLAVOR for shoutcast? Does it hurt if we
>> enable it by default?
>No
>
So how about this diff?

Bernd


Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    1 Aug 2006 10:50:19 -0000       1.3
+++ Makefile    28 Oct 2006 23:05:18 -0000
@@ -2,40 +2,51 @@

 COMMENT=               "music player daemon"

-DISTNAME=              mpd-0.11.5
-PKGNAME=               ${DISTNAME}p0
+DISTNAME=              mpd-0.12.1
 CATEGORIES=            audio

 HOMEPAGE=              http://www.musicpd.org/

 MAINTAINER=            Tobias Ulmer <[EMAIL PROTECTED]>

-# GPL
+# GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes

-WANTLIB=               c m pthread z ossaudio
+WANTLIB=               c m pthread theora z

-MASTER_SITES=          http://mercury.chem.pitt.edu/~shank/
+MASTER_SITES=          ${HOMEPAGE}uploads/files/

 MODULES=               converters/libiconv

-LIB_DEPENDS=           vorbis.>=5,vorbisfile.>=4::audio/libvorbis \
+LIB_DEPENDS=           vorbis,vorbisfile,vorbisenc::audio/libvorbis \
                        audiofile::devel/libaudiofile \
                        ao.>=3::audio/libao \
                        faad::audio/faad \
                        id3tag.>=3::audio/libid3tag \
                        mad.>=2::audio/libmad \
                        ogg.>=5::audio/libogg \
-                       FLAC.>=7::audio/flac \
-                       mikmod.>=2::audio/libmikmod
+                       OggFLAC.>=3,FLAC.>=7::audio/flac \
+                       mikmod.>=2::audio/libmikmod \
+                       mpcdec.>=1::audio/libmpcdec \
+                       shout.>=5::net/libshout \
+                       speex.>=4::audio/speex

 USE_LIBTOOL=           Yes

 CONFIGURE_STYLE=       gnu
-CONFIGURE_ARGS+=       --disable-alsa --with-libFLAC=${LOCALBASE}
+CONFIGURE_ARGS+=       --enable-ao \
+                       --enable-mod \
+                       --enable-shout \
+                       --disable-alsa \
+                       --disable-oss \
+                       --disable-pulse \
+                       --disable-sun \
+                       --bindir=${PREFIX}/sbin
+CONFIGURE_ENV=         CPPFLAGS="-I${LOCALBASE}/include" \
+                       LDFLAGS="-L${LOCALBASE}/lib"

 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd
Index: distinfo
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    13 May 2006 09:52:49 -0000      1.1.1.1
+++ distinfo    27 Oct 2006 14:47:03 -0000
@@ -1,4 +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
+MD5 (mpd-0.12.1.tar.gz) = dc005c64791874b7864f0c28d474534f
+RMD160 (mpd-0.12.1.tar.gz) = 7991972d05eb20b4fad1a3ec2427c5254211e7d0
+SHA1 (mpd-0.12.1.tar.gz) = ad208085e173f98c1a109803099f9ba59bc2bc76
+SIZE (mpd-0.12.1.tar.gz) = 533315
Index: patches/patch-configure
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/mpd/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure     14 Jun 2006 12:37:52 -0000      1.2
+++ patches/patch-configure     28 Oct 2006 20:59:04 -0000
@@ -1,133 +1,57 @@
 $OpenBSD: patch-configure,v 1.2 2006/06/14 12:37:52 bernd Exp $
---- configure.orig     Tue Nov  2 05:39:55 2004
-+++ configure  Fri May 26 17:47:58 2006
-@@ -494,7 +494,7 @@ x_libraries=NONE
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
--bindir='${exec_prefix}/bin'
-+bindir='${exec_prefix}/sbin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
- datadir='${prefix}/share'
-@@ -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"
+--- configure.orig     Wed Oct 11 01:57:30 2006
++++ configure  Fri Oct 27 20:00:53 2006
+@@ -23301,7 +23301,7 @@ if test x$enable_iconv = xyes; then
+       oldcppflags=$CPPFLAGS
+       CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS"
+       LIBS="$LIBS $MPD_LIBS $ICONV_LIBS"
+-      CPPFLAGS=$CFLAGS
++      CPPFLAGS=$CPPFLAGS
+       if test "${ac_cv_header_iconv_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for iconv.h" >&5
+ echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6
+@@ -23548,7 +23548,7 @@ if test x$enable_id3 = xyes; then
+       oldcppflags=$CPPFLAGS
+       CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS"
+       LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS"
+-      CPPFLAGS=$CFLAGS
++      CPPFLAGS=$CPPFLAGS
+
+ for ac_header in id3tag.h
+ do
+@@ -23815,7 +23815,7 @@ if test x$enable_mp3 = xyes; then
+       oldcppflags=$CPPFLAGS
+       CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS"
+       LIBS="$LIBS $MPD_LIBS $MAD_LIBS"
+-      CPPFLAGS=$CFLAGS
++      CPPFLAGS=$CPPFLAGS

- # Check whether --enable-audio or --disable-audio was given.
- if test "${enable_audio+set}" = set; then
-@@ -22426,8 +22426,8 @@ _ACEOF
- fi
+ for ac_header in mad.h
+ do
+@@ -24080,7 +24080,7 @@ if test x$enable_mpc = xyes; then
+       oldcppflags=$CPPFLAGS
+       CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I."
+       LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS"
+-      CPPFLAGS=$CFLAGS
++      CPPFLAGS=$CPPFLAGS
+       if test "${ac_cv_header_mpcdec_mpcdec_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5
+ echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6
+@@ -24332,7 +24332,7 @@ if test x$enable_aac = xyes; then
+       oldcppflags=$CPPFLAGS
+       CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
+       LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
+-      CPPFLAGS=$CFLAGS
++      CPPFLAGS=$CPPFLAGS
+       if test "${ac_cv_header_faad_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for faad.h" >&5
+ echo $ECHO_N "checking for faad.h... $ECHO_C" >&6
+@@ -26179,7 +26179,7 @@ fi;
+     LIBOGGFLAC_LIBS="-L$libdir"
+   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 <sys/soundcard.h>
-+#include <soundcard.h>
- _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
+-  LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
++  LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -logg -lFLAC -lm"

- # 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 <sys/soundcard.h>
-+#include <soundcard.h>
- _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
+   if test "x$libOggFLAC_includes" != "x" ; then
+     LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes"
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile_in       27 Oct 2006 17:44:46 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig       Fri Oct 27 19:44:34 2006
++++ doc/Makefile.in    Fri Oct 27 19:44:43 2006
+@@ -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
Index: patches/patch-doc_mpdconf_example
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_mpdconf_example
--- patches/patch-doc_mpdconf_example   14 Jun 2006 12:37:52 -0000      1.2
+++ patches/patch-doc_mpdconf_example   27 Oct 2006 18:07:48 -0000
@@ -1,64 +1,78 @@
 $OpenBSD: patch-doc_mpdconf_example,v 1.2 2006/06/14 12:37:52 bernd Exp $
---- doc/mpdconf.example.orig   Tue Nov  2 05:03:21 2004
-+++ doc/mpdconf.example        Tue Jun 13 17:26:48 2006
-@@ -4,10 +4,10 @@
+--- doc/mpdconf.example.orig   Wed Oct 11 01:56:54 2006
++++ doc/mpdconf.example        Fri Oct 27 20:07:43 2006
+@@ -2,11 +2,11 @@
+ # See the mpd.conf man page for a more detailed description of each parameter.

- ##################### 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"
- ##########################################################
+ ######################## 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"
+ ################################################################

- ##########################################################
-@@ -35,7 +35,7 @@ error_file           "~/.mpd/mpd.error"
- #
- # Location of DB file
+
+@@ -15,13 +15,13 @@ error_file                      "~/.mpd/
+ # 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.
  #
--#db_file              "~/.mpd/mpd.db"
-+db_file                       "/var/spool/mpd/mpd.db"
+-#pid_file                        "~/.mpd/mpd.pid"
++pid_file                        "/var/spool/mpd/mpd.pid"
  #
- # 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.
+ # 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/spool/mpd/mpdstate"
+-#state_file                      "~/.mpd/mpdstate"
++state_file                      "/var/spool/mpd/mpdstate"
  #
- ##########################################################
+ ################################################################

-@@ -58,9 +58,9 @@ error_file           "~/.mpd/mpd.error"
- #mixer_control                "PCM"
+@@ -33,11 +33,11 @@ error_file                      "~/.mpd/
+ # started by.  If left unspecified, MPD will not drop root
+ # privileges at all (not recommended).
+ #
+-#user                            "nobody"
++user                            "_mpd"
+ #
+ # The address and port to listen on.
+ #
+-#bind_to_address                 "any"
++bind_to_address                 "localhost"
+ #port                            "6600"
+ #
+ # Controls the amount of information that is logged.  Can be
+@@ -94,6 +94,12 @@ error_file                      "~/.mpd/
+ #        format                  "44100:16:2" # optional
+ #}
+ #
++
++audio_output {
++      type                    "ao"
++      name                    "Libao Audio Device"
++}
++
+ # An example of a shout output (for streaming to Icecast):
+ #
+ #audio_output {
+@@ -136,12 +142,12 @@ error_file                      "~/.mpd/
+ #
+ #mixer_type                      "oss"
+ #mixer_device                    "/dev/mixer"
+-#mixer_control                   "PCM"
++#mixer_control                   "vol"
  #
- # OSS Mixer
--#mixer_type           "oss"
--#mixer_device                 "/dev/mixer"
--#mixer_control                "PCM"
-+mixer_type            "oss"
-+mixer_device          "/dev/mixer"
-+mixer_control         "vol"
- #
- # 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"
+ # If you want MPD to adjust the volume of audio sent to the
+ # audio outputs, you can tell it to use the software mixer:
  #
- # Set this value if you only have one
- # address you want to allow connection to.
+-#mixer_type                      "software"
++mixer_type                      "software"
  #
--#bind_to_address      "localhost"
-+bind_to_address       "localhost"
- #
- # If you want to setup MPD to use
- # passwords set them here
+ ################################################################
+
Index: patches/patch-src_volume_c
===================================================================
RCS file: patches/patch-src_volume_c
diff -N patches/patch-src_volume_c
--- patches/patch-src_volume_c  14 Jun 2006 12:37:52 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_volume_c,v 1.2 2006/06/14 12:37:52 bernd Exp $
---- src/volume.c.orig  Tue Nov  2 05:03:22 2004
-+++ src/volume.c       Tue Jun 13 17:26:31 2006
-@@ -30,7 +30,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #ifndef NO_OSS_MIXER
--#include <sys/soundcard.h>
-+#include <soundcard.h>
- #endif
- #ifdef HAVE_ALSA
- #include <alsa/asoundlib.h>
-@@ -67,7 +67,7 @@ int volume_alsaSet = -1;
- int prepOssMixer(char * device) {
-       int devmask = 0;
-
--      if((volume_ossFd = open(device,O_RDONLY))<0) {
-+      if((volume_ossFd = open(device,O_RDWR))<0) {
-               WARNING("unable to open oss mixer \"%s\"\n",device);
-               return -1;
-       }
Index: pkg/PLIST
===================================================================
RCS file: /home/OpenBSD/cvs/ports/audio/mpd/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   14 Jun 2006 12:37:52 -0000      1.2
+++ pkg/PLIST   27 Oct 2006 17:45:38 -0000
@@ -2,6 +2,7 @@
 @newgroup _mpd:560
 @newuser _mpd:560:560:daemon:Music Player Daemon:/var/empty:/sbin/nologin
 @man man/man1/mpd.1
[EMAIL PROTECTED] man/man5/mpd.conf.5
 sbin/mpd
 share/doc/mpd/
 share/doc/mpd/COMMANDS



Reply via email to