Date: Mon, 27 Feb 2017 09:07:25 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r434919 - in branches/2017Q1/audio/musicpd: . files Message-ID: <201702270907.v1R97PUN082385@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Mon Feb 27 09:07:25 2017 New Revision: 434919 URL: https://svnweb.freebsd.org/changeset/ports/434919 Log: MFH: r431615 r431620 r432113 r432625 r433762 r434848 Sync port with head - Update to upstream version 0.20.5 - Fixes buffer overflows in http output Approved by: ports-secteam (junovitch) Added: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx - copied unchanged from r434848, head/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx Deleted: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx Modified: branches/2017Q1/audio/musicpd/Makefile branches/2017Q1/audio/musicpd/distinfo branches/2017Q1/audio/musicpd/files/pkg-message.in Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/audio/musicpd/Makefile ============================================================================== --- branches/2017Q1/audio/musicpd/Makefile Mon Feb 27 09:01:46 2017 (r434918) +++ branches/2017Q1/audio/musicpd/Makefile Mon Feb 27 09:07:25 2017 (r434919) @@ -1,8 +1,7 @@ # $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} @@ -15,37 +14,46 @@ 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= RESAMPLER ZEROCONF -OPTIONS_RADIO= 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) @@ -56,8 +64,9 @@ TREMOR_DESC= Tremor decoder (not with SH 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 @@ -111,8 +120,14 @@ 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 @@ -129,6 +144,8 @@ 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 @@ -191,8 +208,8 @@ 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! Modified: branches/2017Q1/audio/musicpd/distinfo ============================================================================== --- branches/2017Q1/audio/musicpd/distinfo Mon Feb 27 09:01:46 2017 (r434918) +++ branches/2017Q1/audio/musicpd/distinfo Mon Feb 27 09:07:25 2017 (r434919) @@ -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 Copied: branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx (from r434848, head/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx Mon Feb 27 09:07:25 2017 (r434919, copy of r434848, head/audio/musicpd/files/patch-src_decoder_plugins_WavpackDecoderPlugin.cxx) @@ -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 <stdexcept> + #include <memory> + ++#include <cstdlib> ++ + #include <assert.h> + + #define ERRORLEN 80 Modified: branches/2017Q1/audio/musicpd/files/pkg-message.in ============================================================================== --- branches/2017Q1/audio/musicpd/files/pkg-message.in Mon Feb 27 09:01:46 2017 (r434918) +++ branches/2017Q1/audio/musicpd/files/pkg-message.in Mon Feb 27 09:07:25 2017 (r434919) @@ -2,11 +2,19 @@ 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" @@ -16,8 +24,6 @@ Then start the server with 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702270907.v1R97PUN082385>