Index: branches/2017Q1/audio/musicpd/Makefile =================================================================== --- branches/2017Q1/audio/musicpd/Makefile (revision 434918) +++ branches/2017Q1/audio/musicpd/Makefile (revision 434919) @@ -1,225 +1,242 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.19.15 -PORTREVISION= 9 +PORTVERSION= 0.20.5 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} MAINTAINER= riggs@FreeBSD.org COMMENT= Remote-controllable music daemon LICENSE= GPLv2 LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu -USES= gmake pkgconfig compiler:c++11-lib tar:xz +USES= compiler:c++14-lang gmake pkgconfig tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} -CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar \ - --disable-libwrap +CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/sidplay/builders +#Workaround (transient?) link error with libwrap +CONFIGURE_ARGS+=--disable-libwrap + BROKEN_powerpc64= Does not build on powerpc64 -PORTDOCS= AUTHORS README COPYING NEWS +PORTDOCS= AUTHORS README.md COPYING NEWS SUB_FILES= pkg-message -OPTIONS_DEFINE= ID3TAG IPV6 ARCHIVE SAMPLERATE SQLITE3 \ - CDPARANOIA LAME MMS VORBISENC DOCS +OPTIONS_DEFINE= ID3TAG IPV6 ARCHIVE SQLITE3 \ + LAME VORBISENC DOCS -OPTIONS_RADIO= ZEROCONF +OPTIONS_RADIO= RESAMPLER ZEROCONF + OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER +OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR + OPTIONS_MULTI= FILE_FORMAT OPTIONS_MULTI_FILE_FORMAT= AAC ADPLUG FFMPEG FLAC FLUIDSYNTH \ GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \ OPUS SIDPLAY2 SNDFILE TREMOR TWOLAME \ VORBIS WAV WAVPACK WILDMIDI -OPTIONS_GROUP= PLAYBACK -OPTIONS_GROUP_PLAYBACK= AO CURL HTTPD JACK OPENAL OSS PIPE PULSEAUDIO SHOUTCAST +OPTIONS_GROUP= ACCESS PLAYBACK +OPTIONS_GROUP_ACCESS= CDPARANOIA CURL MMS SMB YAJL + +OPTIONS_GROUP_PLAYBACK= AO HTTPD JACK OPENAL OSS PIPE PULSEAUDIO \ + SHOUTCAST SNDIO + ADPLUG_DESC= AdPlug support GME_DESC= GME support (video game music files) LAME_DESC= Support for MP3 Icecast Streams PIPE_DESC= Support for writing PCM audio to a pipe SIDPLAY2_DESC= Sidplay support (C64 mono and stereo files) TREMOR_DESC= Tremor decoder (not with SHOUTCAST; use VORBIS) TWOLAME_DESC= TwoLAME support (mp2) VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) +YAJL_DESC= SoundCloud support via libyajl -OPTIONS_DEFAULT=ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL +OPTIONS_DEFAULT=HTTPD ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL AAC_CONFIGURE_ENABLE=aac AAC_LIB_DEPENDS=libfaad.so:audio/faad ADPLUG_CONFIGURE_ENABLE=adplug ADPLUG_LIB_DEPENDS=libadplug.so:audio/libadplug AO_CONFIGURE_ENABLE=ao AO_LIB_DEPENDS=libao.so:audio/libao CDPARANOIA_CONFIGURE_ENABLE=cdio-paranoia CDPARANOIA_LIB_DEPENDS=libcdda_paranoia.so:audio/cdparanoia CURL_CONFIGURE_ENABLE=curl CURL_LIB_DEPENDS=libcurl.so:ftp/curl FFMPEG_CONFIGURE_ENABLE=ffmpeg FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FLAC_CONFIGURE_ENABLE=flac FLAC_LIB_DEPENDS=libFLAC.so:audio/flac FLUIDSYNTH_CONFIGURE_ENABLE=fluidsynth FLUIDSYNTH_LIB_DEPENDS=libfluidsynth.so:audio/fluidsynth GME_CONFIGURE_ENABLE=gme GME_LIB_DEPENDS=libgme.so:audio/libgme HTTPD_CONFIGURE_ENABLE=httpd-output ID3TAG_CONFIGURE_ENABLE=id3 ID3TAG_LIB_DEPENDS=libid3tag.so:audio/libid3tag IPV6_CONFIGURE_ENABLE=ipv6 JACK_CONFIGURE_ENABLE=jack JACK_LIB_DEPENDS=libjack.so:audio/jack LAME_CONFIGURE_ENABLE=lame-encoder LAME_LIB_DEPENDS=libmp3lame.so:audio/lame MAD_CONFIGURE_ENABLE=mad MAD_LIB_DEPENDS=libmad.so:audio/libmad MIKMOD_CONFIGURE_ENABLE=mikmod MIKMOD_LIB_DEPENDS=libmikmod.so:audio/libmikmod MMS_CONFIGURE_ENABLE=mms MMS_LIB_DEPENDS=libmms.so:net/libmms MODPLUG_CONFIGURE_ENABLE=modplug MODPLUG_LIB_DEPENDS=libmodplug.so:audio/libmodplug MPG123_CONFIGURE_ENABLE=mpg123 MPG123_LIB_DEPENDS=libmpg123.so:audio/mpg123 MUSEPACK_CONFIGURE_ENABLE=mpc MUSEPACK_LIB_DEPENDS=libmpcdec.so:audio/musepack OPENAL_CONFIGURE_ENABLE=openal OPENAL_LIB_DEPENDS=libopenal.so:audio/openal OPUS_CONFIGURE_ENABLE=opus OPUS_LIB_DEPENDS=libopus.so:audio/opus OSS_CONFIGURE_ENABLE=oss PIPE_CONFIGURE_ENABLE=pipe-output PULSEAUDIO_CONFIGURE_ENABLE=pulse PULSEAUDIO_LIB_DEPENDS=libpulse.so:audio/pulseaudio SAMPLERATE_CONFIGURE_ENABLE=lsr SAMPLERATE_LIB_DEPENDS=libsamplerate.so:audio/libsamplerate SIDPLAY2_CONFIGURE_ENABLE=sidplay SIDPLAY2_LIB_DEPENDS=libsidplay2.so:audio/libsidplay2 +SMB_CONFIGURE_enable=smbclient +SMB_LIB_DEPENDS=libsmbclient.so:net/samba-libsmbclient SNDFILE_CONFIGURE_ENABLE=sndfile SNDFILE_LIB_DEPENDS=libsndfile.so:audio/libsndfile +SNDIO_CONFIGURE_ENABLE=sndio +SNDIO_LIB_DEPENDS=libsndio.so:audio/sndio +SOXR_CONFIGURE_ENABLE=soxr +SOXR_LIB_DEPENDS=libsoxr.so:audio/libsoxr SQLITE3_CONFIGURE_ENABLE=sqlite SQLITE3_LIB_DEPENDS=libsqlite3.so:databases/sqlite3 TREMOR_CONFIGURE_WITH=tremor TREMOR_LIB_DEPENDS=libvorbisidec.so:audio/libtremor TWOLAME_CONFIGURE_ENABLE=twolame-encoder TWOLAME_LIB_DEPENDS=libtwolame.so:audio/twolame VORBISENC_CONFIGURE_ENABLE=vorbis-encoder VORBISENC_LIB_DEPENDS=libvorbisenc.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis VORBIS_LIB_DEPENDS=libvorbis.so:audio/libvorbis WAV_CONFIGURE_ENABLE=audiofile WAV_LIB_DEPENDS=libaudiofile.so:audio/libaudiofile WAVPACK_CONFIGURE_ENABLE=wavpack WAVPACK_LIB_DEPENDS=libwavpack.so:audio/wavpack WILDMIDI_CONFIGURE_ENABLE=wildmidi WILDMIDI_LIB_DEPENDS=libWildMidi.so:audio/wildmidi +YAJL_CONFIGURE_ENABLE=yajl +YAJL_LIB_DEPENDS=libyajl.so:devel/yajl MPDUSER?= mpd MPDGROUP?= mpd USERS= ${MPDUSER} GROUPS= ${MPDGROUP} .include .ifdef MPDCONF IGNORE=Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists .endif .if exists(${PREFIX}/etc/mpd.conf) MSG=does not expect ${PREFIX}/etc/mpd.conf to exist. .if !exists(${PREFIX}/etc/musicpd.conf) IGNORE=${MSG} Move it to ${PREFIX}/etc/musicpd.conf. .else IGNORE=${MSG} You also have musicpd.conf-- check carefully to see which one you want, and remove mpd.conf. .endif .endif .if ${PORT_OPTIONS:MARCHIVE} CONFIGURE_ARGS+=--enable-bzip2 \ --enable-zzip \ --enable-iso9660 LIB_DEPENDS+= libzzip.so:devel/zziplib \ libcdio_paranoia.so:sysutils/libcdio-paranoia .else CONFIGURE_ARGS+=--disable-bzip2 \ --disable-zzip \ --disable-iso9660 .endif .if ${PORT_OPTIONS:MAVAHI} CONFIGURE_ARGS+=--with-zeroconf=avahi LIB_DEPENDS+= libavahi-client.so:net/avahi-app .else CONFIGURE_ARGS+=--with-zeroconf=no .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} CONFIGURE_ARGS+=--with-zeroconf=bonjour LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder .else CONFIGURE_ARGS+=--with-zeroconf=no .endif # libshout streaming support will be disabled by configure script when built # also with tremor since the latter does not support vorbis encoding .if ${PORT_OPTIONS:MSHOUTCAST} . if ${PORT_OPTIONS:MTREMOR} IGNORE= shoutcast and tremor do not coexist; use vorbis instead . endif LIB_DEPENDS+= libshout.so:audio/libshout CONFIGURE_ARGS+=--enable-vorbis-encoder \ --enable-shout .else CONFIGURE_ARGS+=--disable-shout .endif post-patch: -# Replace ~/ with /var/mpd and make musicpd run as mpd by default - @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd,g' \ +# Replace ~/ with /var/mpd/ and make musicpd run as mpd by default + @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd/,g' \ -e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \ ${WRKSRC}/doc/mpdconf.example # Uncomment OSS audio output part from MPDCONF; dragons! start=$$(expr $$(${SED} -n '/^# type *"oss"/=' \ ${WRKSRC}/doc/mpdconf.example) - 1); \ finish=$$(for n in $$(${JOT} 10 $$start); do \ [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \ "#}" ] && ${ECHO_CMD} $$n || true; done); \ ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \ ${WRKSRC}/doc/mpdconf.example # Fix man pages for executable names @${REINPLACE_CMD} -e 's/^\(\.B m\)pd/\1usicpd/' \ -e 's#^\(\.BI \)/etc/mpd.conf#\1${PREFIX}/etc/${PORTNAME}.conf#' \ -e 's#^mpd.conf#${PORTNAME}.conf#' \ -e 's#^mpd(1)#musicpd(1)#' \ ${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \ ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \ ${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1 ${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \ ${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5 ${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ ${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample .include Index: branches/2017Q1/audio/musicpd/distinfo =================================================================== --- branches/2017Q1/audio/musicpd/distinfo (revision 434918) +++ branches/2017Q1/audio/musicpd/distinfo (revision 434919) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465643698 -SHA256 (mpd-0.19.15.tar.xz) = 0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b -SIZE (mpd-0.19.15.tar.xz) = 704000 +TIMESTAMP = 1488034173 +SHA256 (mpd-0.20.5.tar.xz) = 525573be27443ae26868b21a61e88c03909e72f1212ddaa725a0389a28d88987 +SIZE (mpd-0.20.5.tar.xz) = 771276 Index: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx =================================================================== --- branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx (revision 434918) +++ branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx (nonexistent) @@ -1,11 +0,0 @@ ---- src/decoder/plugins/WildmidiDecoderPlugin.cxx.orig 2014-10-24 22:28:53 UTC -+++ src/decoder/plugins/WildmidiDecoderPlugin.cxx -@@ -94,7 +94,7 @@ wildmidi_file_decode(Decoder &decoder, P - - DecoderCommand cmd; - do { -- char buffer[4096]; -+ int8_t buffer[4096]; - int len; - - info = WildMidi_GetInfo(wm); Property changes on: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx =================================================================== --- branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx (nonexistent) +++ branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx (revision 434919) @@ -0,0 +1,11 @@ +--- src/decoder/plugins/WavpackDecoderPlugin.cxx.orig 2017-01-27 07:46:51 UTC ++++ src/decoder/plugins/WavpackDecoderPlugin.cxx +@@ -34,6 +34,8 @@ + #include + #include + ++#include ++ + #include + + #define ERRORLEN 80 Property changes on: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q1/audio/musicpd/files/pkg-message.in =================================================================== --- branches/2017Q1/audio/musicpd/files/pkg-message.in (revision 434918) +++ branches/2017Q1/audio/musicpd/files/pkg-message.in (revision 434919) @@ -1,31 +1,37 @@ **************************************************************** The musicpd package has been successfully installed. -In order to run the MPD server, you need to edit +In order to run the MPD server, you need to edit the provided +sample configuration file %%PREFIX%%/etc/musicpd.conf -and add the following line to /etc/rc.conf: +Edit the variables in the section "Files and directories" +according to your local environment. Ensure that the referenced +directories exist and owned by the 'mpd' user, except for the +variable music_directory. It is sufficient for the 'mpd' user +to have read permissions to the referenced directory. +To enable the service at boot time, add the following line to +/etc/rc.conf: + musicpd_enable="YES" Then start the server with service musicpd start or reboot. -The example configuration of MPD server requires music files to -be stored in the /var/mpd/music directory. NOTE: The musicpd server is pretty useless without a client. You might want to install one of the following ports too: Command line: musicpc, ncmpc (Curses), ncmpcpp (Curses) GNOME / GTK: glurp, gmpc KDE / Qt: quimup, qmpdlient Web: phpmp **************************************************************** Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 434918) +++ branches/2017Q1 (revision 434919) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r431615,431620,432113,432625,433762,434848