Update mpd to version 0.16.1 This thing has about 17 billion features, so please test.
Worksforme on i386/amd64 Index: Makefile =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- Makefile 27 Dec 2010 14:50:22 -0000 1.36 +++ Makefile 16 Jan 2011 03:41:16 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.36 2010/12/27 14:50:22 ajacoutot Exp $ COMMENT = Music Player Daemon -DISTNAME = mpd-0.15.12 -REVISION = 5 +DISTNAME = mpd-0.16.1 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = Tobias Ulmer <tobi...@tmux.org> @@ -14,7 +13,7 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB = c m pthread ogg z stdc++ sndio curl glib-2.0 gthread-2.0 -WANTLIB += audiofile ao samplerate FLAC id3tag mad mikmod +WANTLIB += audiofile ao samplerate FLAC id3tag mad mikmod sndfile MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=musicpd/} @@ -51,7 +50,19 @@ CONFIGURE_ARGS += --enable-ao \ --disable-modplug \ --disable-sidplay \ --disable-ffmpeg \ - --enable-mpc + --enable-mpc \ + --disable-libwrap \ + --enable-lsr \ + --enable-audiofile \ + --disable-gme \ + --enable-mad \ + --disable-mpg123 \ + --enable-sndfile \ + --disable-twolame-encoder + +# we lack SO_PASSCRED +# CONFIGURE_ARGS += mpd_cv_have_struct_ucred=yes + # OggFLAC and tremor tests, initgroups(3) CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include -D_BSD_SOURCE" @@ -76,7 +87,9 @@ LIB_DEPENDS += audio/libvorbis \ net/libshout \ audio/faad>=2.6.1p0 \ audio/libmpcdec -CONFIGURE_ARGS += --enable-aac +CONFIGURE_ARGS += --enable-aac \ + --enable-shout \ + --enable-vorbis-encoder .endif USE_LIBTOOL = Yes Index: distinfo =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 23 Aug 2010 14:46:55 -0000 1.10 +++ distinfo 16 Jan 2011 02:08:33 -0000 @@ -1,5 +1,5 @@ -MD5 (mpd-0.15.12.tar.gz) = W9YcISTUOIsTmLMvLHFDig== -RMD160 (mpd-0.15.12.tar.gz) = QUgnNCADCYPdKuKiN6qiOc9kO9M= -SHA1 (mpd-0.15.12.tar.gz) = fZObgk2YmjG+NmA/jVA+N3RJxj8= -SHA256 (mpd-0.15.12.tar.gz) = p2oa1OAxLL2EwJ9S0/eLpcEvLrmRRSSJsEsXlkrftBc= -SIZE (mpd-0.15.12.tar.gz) = 483928 +MD5 (mpd-0.16.1.tar.gz) = 0wuOoqxislfjcj85qDSp+w== +RMD160 (mpd-0.16.1.tar.gz) = hNcbIi3ggN7Kg4J5Vj4udWnJiC4= +SHA1 (mpd-0.16.1.tar.gz) = f7Y6jTyfa6fS5cupBWgyWGU8iD0= +SHA256 (mpd-0.16.1.tar.gz) = KqU4YO1YKH7PuExCRi+9iTNVJeEqN2D7hcwI7DY26NE= +SIZE (mpd-0.16.1.tar.gz) = 617328 Index: patches/patch-Makefile_in =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile_in --- patches/patch-Makefile_in 23 Aug 2010 14:46:55 -0000 1.2 +++ patches/patch-Makefile_in 16 Jan 2011 03:25:52 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/08/23 14:46:55 jasper Exp $ ---- Makefile.in.orig Wed Jul 21 02:42:27 2010 -+++ Makefile.in Sun Aug 22 18:45:03 2010 -@@ -1447,7 +1447,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) +--- Makefile.in.orig Mon Jan 10 02:58:36 2011 ++++ Makefile.in Sun Jan 16 04:25:26 2011 +@@ -2241,7 +2241,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 + DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml @ENABLE_DOCUMENTATION_TRUE@protocoldir = $(docdir)/protocol @ENABLE_DOCUMENTATION_TRUE@protocol_DATA = $(wildcard doc/protocol/*.html) Index: patches/patch-configure =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/patches/patch-configure,v retrieving revision 1.12 diff -u -p -r1.12 patch-configure --- patches/patch-configure 23 Aug 2010 14:46:55 -0000 1.12 +++ patches/patch-configure 16 Jan 2011 02:45:26 -0000 @@ -2,18 +2,9 @@ $OpenBSD: patch-configure,v 1.12 2010/08 Don't reset CPPFLAGS...stupid configure. ---- configure.orig Wed Jul 21 02:42:27 2010 -+++ configure Sun Aug 22 18:45:03 2010 -@@ -8990,7 +8990,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 $CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default" - if test "x$ac_cv_header_mpc_mpcdec_h" = x""yes; then : - old_mpcdec=no -@@ -9214,7 +9214,7 @@ if test x$enable_aac = xyes; then +--- configure.orig Sun Jan 16 03:41:13 2011 ++++ configure Sun Jan 16 03:45:17 2011 +@@ -8759,7 +8759,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -22,7 +13,7 @@ Don't reset CPPFLAGS...stupid configure. ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default" if test "x$ac_cv_header_faad_h" = x""yes; then : -@@ -9468,7 +9468,7 @@ if test x$enable_aac = xyes; then +@@ -9013,7 +9013,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror" LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -31,7 +22,7 @@ Don't reset CPPFLAGS...stupid configure. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5 $as_echo_n "checking for broken libfaad headers... " >&6; } -@@ -9514,7 +9514,7 @@ if test x$enable_aac = xyes; then +@@ -9059,7 +9059,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $FAAD_CFLAGS" LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS" @@ -40,3 +31,12 @@ Don't reset CPPFLAGS...stupid configure. ac_fn_c_check_header_mongrel "$LINENO" "mp4ff.h" "ac_cv_header_mp4ff_h" "$ac_includes_default" if test "x$ac_cv_header_mp4ff_h" = x""yes; then : +@@ -10370,7 +10370,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 $CFLAGS" + ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default" + if test "x$ac_cv_header_mpc_mpcdec_h" = x""yes; then : + old_mpcdec=no Index: patches/patch-doc_mpdconf_example =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/patches/patch-doc_mpdconf_example,v retrieving revision 1.6 diff -u -p -r1.6 patch-doc_mpdconf_example --- patches/patch-doc_mpdconf_example 12 Jan 2010 18:58:26 -0000 1.6 +++ patches/patch-doc_mpdconf_example 16 Jan 2011 04:25:54 -0000 @@ -1,6 +1,6 @@ $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 +--- doc/mpdconf.example.orig Mon Jan 10 02:58:08 2011 ++++ doc/mpdconf.example Sun Jan 16 05:25:15 2011 @@ -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. @@ -49,18 +49,18 @@ $OpenBSD: patch-doc_mpdconf_example,v 1. -#state_file "~/.mpd/state" +state_file "/var/spool/mpd/mpdstate" # - ############################################################################### - -@@ -59,7 +59,7 @@ + # The location of the sticker database. This is a database which + # manages dynamic information attached to songs. +@@ -64,7 +64,7 @@ # initialization. This setting is disabled by default and MPD is run as the # current user. # -#user "nobody" +user "_mpd" # - # 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 @@ + # 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). +@@ -83,6 +83,8 @@ # And for Unix Socket #bind_to_address "~/.mpd/socket" # @@ -69,26 +69,18 @@ $OpenBSD: patch-doc_mpdconf_example,v 1. # This setting is the TCP port that is desired for the daemon to get assigned # to. # -@@ -257,6 +259,13 @@ input { +@@ -296,6 +298,14 @@ input { # name "My Null Output" + # mixer_type "none" # optional #} - # ++# +## Default libao output: +# +audio_output { + type "ao" + name "Libao Audio Device" ++ mixer_type "software" +} -+# + # # 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. - # --#mixer_type "software" -+mixer_type "software" - # - # This example will not allow MPD to touch the mixer at all and will disable - # all volume controls. Index: patches/patch-src_output_ao_plugin_c =================================================================== RCS file: /srv/boron/data/vcs/cvs/openbsd/ports/audio/mpd/patches/patch-src_output_ao_plugin_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_output_ao_plugin_c --- patches/patch-src_output_ao_plugin_c 3 Jun 2010 16:06:07 -0000 1.1 +++ patches/patch-src_output_ao_plugin_c 16 Jan 2011 03:33:30 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-src_output_ao_plugin_c,v 1.1 2010/06/03 16:06:07 pea Exp $ ---- src/output/ao_plugin.c.orig Fri May 14 23:58:27 2010 -+++ src/output/ao_plugin.c Fri May 14 23:58:58 2010 -@@ -169,6 +169,7 @@ ao_output_open(void *data, struct audio_format *audio_ +--- src/output/ao_plugin.c.orig Mon Jan 10 02:58:09 2011 ++++ src/output/ao_plugin.c Sun Jan 16 04:33:17 2011 +@@ -168,6 +168,7 @@ ao_output_open(void *data, struct audio_format *audio_ + GError **error) + { ao_sample_format format; ++ memset(&format, 0, sizeof(format)); struct ao_data *ad = (struct ao_data *)data; -+ memset(&format, 0, sizeof(format)); - /* support for 24 bit samples in libao is currently dubious, - and until we have sorted that out, resample everything to - 16 bit */ + switch (audio_format->format) {
