Hi ports@, he's a diff to update audio/mpd to the latest 0.18.9, some notes:
- it adds a dependency on gcc 4.8 because code was rewritten c++11-style. There are discussions to reimport mpd 0.17 as audio/mpd017 for architectures not having gcc 4.8 (ie anything besides i386/amd64/macppc/sparc64) - for some reason here mpd inexplicably stops playing after ending a track, and 'mpc play' or telnetting to 6600 and issuing 'play' doesnt resume it, it still seems to think it's playing. I need to kill it and restart it for another track to properly play. Anyone experiencing this ? Tried with/without random/consume modes. Please test this.. Landry
Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mpd/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- Makefile 5 Nov 2013 07:08:52 -0000 1.56 +++ Makefile 19 Mar 2014 08:39:40 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.56 2013/11/05 07:08:52 dcoppa Exp $ COMMENT = Music Player Daemon -DISTNAME = mpd-0.17.6 +DISTNAME = mpd-0.18.9 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = David Coppa <[email protected]> @@ -12,11 +12,13 @@ WANTLIB = FLAC ao audiofile c cdio cdio_cdda cdio_paranoia \ curl glib-2.0 gthread-2.0 id3tag m mad \ mikmod ogg pthread samplerate sndfile sndio \ - stdc++ z + bz2 mpdclient opus z -MASTER_SITES = http://www.musicpd.org/download/mpd/0.17/ +MASTER_SITES = http://www.musicpd.org/download/mpd/stable/ -MODULES = devel/gettext +MODULES = devel/gettext gcc4 +MODGCC4_ARCHS = i386 amd64 powerpc sparc64 +MODGCC4_LANGS = c c++ LIB_DEPENDS = devel/libaudiofile \ audio/libao \ @@ -26,6 +28,8 @@ audio/libid3tag \ audio/libmad \ audio/libmikmod \ + audio/opus \ + audio/libmpdclient \ net/curl \ devel/glib2 @@ -36,6 +40,7 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \ --disable-alsa \ --disable-ffmpeg \ + --disable-fluidsynth \ --disable-gme \ --disable-inotify \ --disable-jack \ @@ -44,11 +49,11 @@ --disable-modplug \ --disable-mpg123 \ --disable-oss \ + --disable-openal \ --disable-pulse \ --disable-roar \ --disable-sidplay \ --disable-soundcloud \ - --disable-soup \ --disable-sqlite \ --disable-systemd-daemon \ --disable-twolame-encoder \ @@ -81,7 +86,7 @@ WANTLIB += vorbisidec .else WANTLIB += theora vorbis vorbisfile vorbisenc speex mp3lame \ - shout faad mp4ff mpcdec + shout faad mpcdec LIB_DEPENDS += audio/libvorbis \ audio/speex \ audio/lame \ @@ -92,7 +97,6 @@ --enable-shout \ --enable-vorbis-encoder .endif - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mpd/distinfo,v retrieving revision 1.19 diff -u -r1.19 distinfo --- distinfo 5 Nov 2013 07:08:52 -0000 1.19 +++ distinfo 19 Mar 2014 08:39:40 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpd-0.17.6.tar.gz) = GngCYHDXN+eDamGruWPNI9VmQN8aaLqCPpAn23vChMs= -SIZE (mpd-0.17.6.tar.gz) = 763311 +SHA256 (mpd-0.18.9.tar.gz) = CFD9URdroYSijiHaMMNQCT7P3XW9D5n6s5wqKmH27lU= +SIZE (mpd-0.18.9.tar.gz) = 803771 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v retrieving revision 1.8 diff -u -r1.8 patch-Makefile_in --- patches/patch-Makefile_in 5 Oct 2012 08:29:39 -0000 1.8 +++ patches/patch-Makefile_in 19 Mar 2014 08:39:40 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.8 2012/10/05 08:29:39 dcoppa Exp $ ---- Makefile.in.orig Sun Sep 30 12:23:42 2012 -+++ Makefile.in Tue Oct 2 14:31:28 2012 -@@ -2433,7 +2433,7 @@ SPARSE_SRC = $(addprefix $(top_srcdir)/,$(filter %.c,$ +--- Makefile.in.orig Tue Feb 18 18:39:35 2014 ++++ Makefile.in Tue Mar 18 22:19:40 2014 +@@ -3209,7 +3209,7 @@ SPARSE_SRC = $(addprefix $(top_srcdir)/,$(filter %.c,$ # Documentation # man_MANS = doc/mpd.1 doc/mpd.conf.5 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-configure,v retrieving revision 1.19 diff -u -r1.19 patch-configure --- patches/patch-configure 19 Sep 2013 15:02:16 -0000 1.19 +++ patches/patch-configure 19 Mar 2014 08:39:40 -0000 @@ -2,18 +2,18 @@ Don't reset CPPFLAGS...stupid configure. ---- configure.orig Sun Aug 4 14:22:05 2013 -+++ configure Thu Sep 19 16:58:31 2013 -@@ -9862,7 +9862,7 @@ if test x$enable_aac = xyes; then +--- configure.orig Tue Feb 18 18:39:33 2014 ++++ configure Tue Mar 18 22:19:40 2014 +@@ -10325,7 +10325,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $FAAD_CFLAGS -I." + CFLAGS="$CFLAGS $FAAD_CFLAGS" LIBS="$LIBS $FAAD_LIBS" - CPPFLAGS=$CFLAGS + CPPFLAGS="$CPPFLAGS $CFLAGS" 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" = xyes; then : -@@ -10126,7 +10126,7 @@ if test x$enable_aac = xyes; then +@@ -10451,7 +10451,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror" LIBS="$LIBS $FAAD_LIBS" @@ -22,12 +22,3 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5 $as_echo_n "checking for broken libfaad headers... " >&6; } -@@ -10172,7 +10172,7 @@ if test x$enable_aac = xyes; then - oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $FAAD_CFLAGS" - LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS" -- CPPFLAGS=$CFLAGS -+ CPPFLAGS="$CPPFLAGS $CFLAGS" - - 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" = xyes; then : Index: patches/patch-doc_mpdconf_example =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v retrieving revision 1.11 diff -u -r1.11 patch-doc_mpdconf_example --- patches/patch-doc_mpdconf_example 19 Sep 2013 15:02:16 -0000 1.11 +++ patches/patch-doc_mpdconf_example 19 Mar 2014 08:39:40 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.11 2013/09/19 15:02:16 dcoppa Exp $ ---- doc/mpdconf.example.orig Thu Aug 1 09:15:41 2013 -+++ doc/mpdconf.example Thu Sep 19 16:58:31 2013 +--- doc/mpdconf.example.orig Wed Dec 11 20:51:53 2013 ++++ doc/mpdconf.example Tue Mar 18 22:19:40 2014 @@ -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. @@ -69,7 +69,7 @@ # This setting is the TCP port that is desired for the daemon to get assigned # to. # -@@ -320,6 +322,14 @@ input { +@@ -324,6 +326,14 @@ input { # name "My Null Output" # mixer_type "none" # optional #} @@ -82,5 +82,5 @@ + 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 + # If MPD has been compiled with libsamplerate support, this setting specifies + # the sample rate converter to use. Possible values can be found in the Index: patches/patch-src_system_ByteOrder_hxx =================================================================== RCS file: patches/patch-src_system_ByteOrder_hxx diff -N patches/patch-src_system_ByteOrder_hxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_system_ByteOrder_hxx 19 Mar 2014 08:39:40 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/system/ByteOrder.hxx.orig Tue Mar 18 23:12:51 2014 ++++ src/system/ByteOrder.hxx Tue Mar 18 22:57:46 2014 +@@ -42,7 +42,7 @@ + # define IS_BIG_ENDIAN true + #else + /* generic compile-time check */ +-# include <endian.h> ++# include <sys/endian.h> + # if __BYTE_ORDER == __LITTLE_ENDIAN + # define IS_LITTLE_ENDIAN true + # define IS_BIG_ENDIAN false
