svn commit: r431615 - in head/audio/musicpd: . files

[Thomas Zander]

Author: riggs
Date: Mon Jan 16 06:29:59 2017
New Revision: 431615
URL: https://svnweb.freebsd.org/changeset/ports/431615

Log:
  Update to upstream release 0.20.2; fix build
  
  Detailed log:
  - Update to upstream release 0.20.2
  - Transfer maintainer'ship from crees to riggs
  - Port now requires C++14
  - Fix build on stable/11 (--disable-libwrap)
  - New non-default OPTIONs:
    - SMB: support for libsmbclient
    - SNDIO: support for sndio
    - SOXR: support soxr resampler
    - YAJL: SoundCloud support via devel/yajl
  
  PR:		216120
  Submitted by:	riggs (maintainer)
  Approved by:	crees (previous maintainer)

Added:
  head/audio/musicpd/files/patch-src_util_VarSize.hxx   (contents, props changed)
Deleted:
  head/audio/musicpd/files/patch-src_decoder_plugins_WildmidiDecoderPlugin.cxx
Modified:
  head/audio/musicpd/Makefile
  head/audio/musicpd/distinfo

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Mon Jan 16 03:14:54 2017	(r431614)
+++ head/audio/musicpd/Makefile	Mon Jan 16 06:29:59 2017	(r431615)
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.19.15
-PORTREVISION=	8
+PORTVERSION=	0.20.2
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
 
-MAINTAINER=	crees at FreeBSD.org
+MAINTAINER=	riggs at FreeBSD.org
 COMMENT=	Remote-controllable music daemon
 
 LICENSE=	GPLv2
@@ -15,7 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libicudata.so:devel/icu
 
-USES=		gmake pkgconfig compiler:c++11-lib tar:xz
+USES=		gmake pkgconfig compiler:c++14-lang tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
@@ -25,14 +24,17 @@ 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_ZEROCONF=	AVAHI MDNSRESPONDER
@@ -44,7 +46,14 @@ OPTIONS_MULTI_FILE_FORMAT=	AAC ADPLUG FF
 	   VORBIS WAV WAVPACK WILDMIDI
 
 OPTIONS_GROUP=	PLAYBACK
-OPTIONS_GROUP_PLAYBACK=	AO CURL HTTPD JACK OPENAL OSS PIPE PULSEAUDIO SHOUTCAST
+OPTIONS_GROUP_PLAYBACK=	AO HTTPD JACK OPENAL OSS PIPE PULSEAUDIO \
+			SHOUTCAST SNDIO
+
+OPTIONS_GROUP=	ACCESS
+OPTIONS_GROUP_ACCESS=	CDPARANOIA CURL MMS SMB YAJL
+
+OPTIONS_RADIO=	RESAMPLER
+OPTIONS_RADIO_RESAMPLER=	SAMPLERATE SOXR
 
 ADPLUG_DESC=	AdPlug support
 GME_DESC=	GME support (video game music files)
@@ -55,6 +64,7 @@ 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
 
@@ -110,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
@@ -128,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

Modified: head/audio/musicpd/distinfo
==============================================================================
--- head/audio/musicpd/distinfo	Mon Jan 16 03:14:54 2017	(r431614)
+++ head/audio/musicpd/distinfo	Mon Jan 16 06:29:59 2017	(r431615)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465643698
-SHA256 (mpd-0.19.15.tar.xz) = 0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b
-SIZE (mpd-0.19.15.tar.xz) = 704000
+TIMESTAMP = 1484486662
+SHA256 (mpd-0.20.2.tar.xz) = 552a87d71c2981baeddf28c1856a7e071ea0236dd38bc75ec25d58529605ff77
+SIZE (mpd-0.20.2.tar.xz) = 768816

Added: head/audio/musicpd/files/patch-src_util_VarSize.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/musicpd/files/patch-src_util_VarSize.hxx	Mon Jan 16 06:29:59 2017	(r431615)
@@ -0,0 +1,10 @@
+--- src/util/VarSize.hxx.orig	2015-03-17 11:18:04 UTC
++++ src/util/VarSize.hxx
+@@ -36,6 +36,7 @@
+ #include <type_traits>
+ #include <utility>
+ #include <new>
++#include <cstdlib>
+ 
+ /**
+  * Allocate and construct a variable-size object.  That is useful for