Hi,
this time with the diff attached. mpd has had sndio support for quite some time now, but not in our ports tree. So here's an update. Our g++ doesn't support constexpr with switch/case statements, therefore use clang. OK? Christopher Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mpd/Makefile,v retrieving revision 1.101 diff -u -p -r1.101 Makefile --- Makefile 30 Dec 2016 08:59:10 -0000 1.101 +++ Makefile 28 Jan 2017 21:27:30 -0000 @@ -2,7 +2,7 @@ BROKEN-hppa = no atomic ops COMMENT = Music Player Daemon -DISTNAME = mpd-0.19.21 +DISTNAME = mpd-0.20.3 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = David Coppa <dco...@openbsd.org> @@ -10,27 +10,26 @@ MAINTAINER = David Coppa <dcoppa@openbs # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB = FLAC ao audiofile avcodec avformat \ +WANTLIB = FLAC audiofile avcodec avformat \ avutil bz2 c cdio cdio_cdda \ - cdio_paranoia curl expat faad glib-2.0 \ - gthread-2.0 icudata icui18n icuuc id3tag \ - intl m mikmod mp3lame mpcdec mpdclient \ + cdio_paranoia curl expat faad iconv \ + icudata icui18n icuuc id3tag \ + iso9660 m mikmod mp3lame mpcdec mpdclient \ ogg opus pthread samplerate shout \ sndfile sndio speex sqlite3 theora \ - vorbis vorbisenc vorbisfile yajl z + vorbis vorbisenc yajl z -MASTER_SITES = http://www.musicpd.org/download/mpd/stable/ +MASTER_SITES = https://www.musicpd.org/download/mpd/0.20/ -MODULES = gcc4 -MODGCC4_ARCHS = * -MODGCC4_LANGS = c++ +MODULES = lang/clang +MODCLANG_ARCHS = * +MODCLANG_LANGS = c++ BUILD_DEPENDS = devel/boost LIB_DEPENDS = audio/faad>=2.6.1p0 \ audio/flac \ audio/lame \ - audio/libao \ audio/libcdio \ audio/libid3tag \ audio/libmikmod \ @@ -40,7 +39,6 @@ LIB_DEPENDS = audio/faad>=2.6.1p0 \ audio/musepack \ audio/opus \ databases/sqlite3 \ - devel/glib2 \ devel/libaudiofile \ devel/libyajl \ graphics/ffmpeg \ @@ -51,6 +49,7 @@ LIB_DEPENDS = audio/faad>=2.6.1p0 \ CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \ --disable-adplug \ + --disable-ao \ --disable-alsa \ --disable-epoll \ --disable-fluidsynth \ @@ -78,7 +77,6 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi --disable-wavpack \ --disable-wildmidi \ --enable-aac \ - --enable-ao \ --enable-audiofile \ --enable-bzip2 \ --enable-cdio-paranoia \ @@ -92,6 +90,7 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi --enable-pipe-output \ --enable-shout \ --enable-sndfile \ + --enable-sndio \ --enable-soundcloud \ --enable-sqlite \ --enable-vorbis \ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mpd/distinfo,v retrieving revision 1.42 diff -u -p -r1.42 distinfo --- distinfo 15 Dec 2016 10:59:12 -0000 1.42 +++ distinfo 28 Jan 2017 21:27:30 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpd-0.19.21.tar.gz) = 0eaygRdVNVXrG9IRkIN+E50fqUIOgFdbaQdqfBySVKM= -SIZE (mpd-0.19.21.tar.gz) = 984489 +SHA256 (mpd-0.20.3.tar.gz) = Ppl6edJcCUuuBqw+EkBsVI4/PUgiLpTANphIbuQ0E3E= +SIZE (mpd-0.20.3.tar.gz) = 1089284 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v retrieving revision 1.21 diff -u -p -r1.21 patch-Makefile_in --- patches/patch-Makefile_in 15 Dec 2016 10:59:12 -0000 1.21 +++ patches/patch-Makefile_in 28 Jan 2017 21:27:30 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-Makefile_in,v 1.21 2016/12/15 10:59:12 dcoppa Exp $ ---- Makefile.in.orig Tue Dec 13 10:54:19 2016 -+++ Makefile.in Thu Dec 15 11:38:58 2016 -@@ -4296,7 +4296,7 @@ FILTER_LIBS = \ +--- Makefile.in.orig Tue Jan 17 22:03:49 2017 ++++ Makefile.in Sat Jan 28 14:36:58 2017 +@@ -4645,7 +4645,7 @@ FILTER_LIBS = \ # Documentation # man_MANS = doc/mpd.1 doc/mpd.conf.5 --doc_DATA = AUTHORS COPYING NEWS README doc/mpdconf.example -+doc_DATA = AUTHORS COPYING NEWS README +-doc_DATA = AUTHORS COPYING NEWS README.md doc/mpdconf.example ++doc_DATA = AUTHORS COPYING NEWS README.md 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: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 15 Dec 2016 10:59:12 -0000 1.31 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-configure,v 1.31 2016/12/15 10:59:12 dcoppa Exp $ - -- Don't reset CPPFLAGS -- XXX: boost/intrusive/detail/array_initializer.hpp:62:7: error: exception handling disabled, use -fexceptions to enable - ---- configure.orig Tue Dec 13 08:55:28 2016 -+++ configure Thu Dec 15 11:38:58 2016 -@@ -12506,7 +12506,7 @@ if test x$enable_aac = xyes; then - oldcppflags=$CPPFLAGS - 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 : - -@@ -17235,6 +17235,7 @@ fi - done - - -+if false; then - if test x$no_exceptions = xyes; then - - -@@ -17300,6 +17301,7 @@ else - fi - - done -+fi - - - Index: patches/patch-doc_mpdconf_example =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v retrieving revision 1.16 diff -u -p -r1.16 patch-doc_mpdconf_example --- patches/patch-doc_mpdconf_example 11 Dec 2016 12:59:40 -0000 1.16 +++ patches/patch-doc_mpdconf_example 28 Jan 2017 21:27:30 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.16 2016/12/11 12:59:40 dcoppa Exp $ ---- doc/mpdconf.example.orig Thu Oct 20 15:02:36 2016 -+++ doc/mpdconf.example Sun Dec 11 12:12:16 2016 +--- doc/mpdconf.example.orig Thu Oct 27 21:00:29 2016 ++++ doc/mpdconf.example Sat Jan 28 21:41:50 2017 @@ -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. @@ -66,7 +66,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1. # # 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 @@ +@@ -84,6 +84,8 @@ # And for Unix Socket #bind_to_address "~/.mpd/socket" # @@ -75,19 +75,20 @@ $OpenBSD: patch-doc_mpdconf_example,v 1. # This setting is the TCP port that is desired for the daemon to get assigned # to. # -@@ -324,6 +326,15 @@ input { - # name "My Null Output" - # mixer_type "none" # optional - #} -+# -+## Default libao output: -+# +@@ -307,11 +309,11 @@ input { + # + # An example of an sndio output. + # +-#audio_output { +-# type "sndio" +-# name "sndio output" +-# mixer_type "software" +-#} +audio_output { -+ type "ao" -+ name "Libao Audio Device" -+ mixer_type "software" -+ driver "sndio" ++ type "sndio" ++ name "sndio output" ++ mixer_type "software" +} # - # If MPD has been compiled with libsamplerate support, this setting specifies - # the sample rate converter to use. Possible values can be found in the + # An example of an OS X output: + # Index: patches/patch-src_command_CommandError_cxx =================================================================== RCS file: patches/patch-src_command_CommandError_cxx diff -N patches/patch-src_command_CommandError_cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_command_CommandError_cxx 28 Jan 2017 21:27:30 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +--- src/command/CommandError.cxx.orig Sat Jan 28 19:32:23 2017 ++++ src/command/CommandError.cxx Sat Jan 28 19:49:37 2017 +@@ -100,13 +100,13 @@ ToAck(std::exception_ptr ep) + return ACK_ERROR_SYSTEM; + } catch (const std::invalid_argument &e) { + return ACK_ERROR_ARG; +-#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204 ++#if defined(__GLIBCXX__) && __GLIBCXX__ < 20160727 + } catch (const std::exception &e) { + #else + } catch (...) { + #endif + try { +-#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204 ++#if defined(__GLIBCXX__) && __GLIBCXX__ < 20160727 + /* workaround for g++ 4.x: no overload for + rethrow_exception(exception_ptr) */ + std::rethrow_if_nested(e); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/mpd/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 27 Nov 2014 19:57:16 -0000 1.10 +++ pkg/PLIST 28 Jan 2017 21:27:30 -0000 @@ -11,7 +11,7 @@ share/doc/mpd/ share/doc/mpd/AUTHORS share/doc/mpd/COPYING share/doc/mpd/NEWS -share/doc/mpd/README +share/doc/mpd/README.md share/examples/mpd/ share/examples/mpd/mpd.conf @sample ${SYSCONFDIR}/mpd.conf -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub 2779 7F73 44FD 0736 B67A C410 69EC 7922 34B4 2566
pgpDcYSR9jC1B.pgp
Description: OpenPGP digital signature
