Index: head/audio/musicpd/Makefile =================================================================== --- head/audio/musicpd/Makefile (revision 490136) +++ head/audio/musicpd/Makefile (revision 490137) @@ -1,255 +1,253 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.21.3 -PORTREVISION= 3 +PORTVERSION= 0.21.4 CATEGORIES= audio ipv6 MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} MAINTAINER= riggs@FreeBSD.org COMMENT= Remote-controllable music daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu USES= compiler:c++14-lang gnome meson pkgconfig tar:xz USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} MESON_ARGS= -Dauto_features=disabled \ -Dbzip2=enabled \ -Dhttpd=true \ -Dicu=enabled \ -Doss=enabled \ -Dpipe=true \ -Dzlib=enabled CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS README.md NEWS SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 SQLITE3 \ PROXYDB LAME VORBISENC ZZIP OPTIONS_RADIO= RESAMPLER ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR OPTIONS_MULTI= FILE_FORMAT OPTIONS_MULTI_FILE_FORMAT= \ ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \ GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \ OPUS SIDPLAY2 SNDFILE TWOLAME \ VORBIS WAVPACK WILDMIDI OPTIONS_GROUP= ACCESS PLAYBACK OPTIONS_GROUP_ACCESS= CDPARANOIA CURL MMS QOBUZ SMB SOUNDCLOUD TIDAL YAJL OPTIONS_GROUP_PLAYBACK= AO JACK OPENAL PULSEAUDIO \ SHOUTCAST SNDIO ADPLUG_DESC= AdPlug support FAAD_DESC= AAC/MP4 decoding via libfaad GME_DESC= GME support (video game music files) ISO9660_DESC= Direct support for ISO 9660 images PROXYDB_DESC= Proxy database support via libmpdclient LAME_DESC= Support for MP3 Icecast Streams QOBUZ_DESC= Streaming service support: Qobuz SIDPLAY2_DESC= Sidplay support (C64 mono and stereo files) SOUNDCLOUD_DESC=Streaming service support: SoundCloud TIDAL_DESC= Streaming service support: TIDAL TWOLAME_DESC= TwoLAME support (mp2) VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) YAJL_DESC= JSON support via libyajl ZZIP_DESC= Support for zzip archives OPTIONS_DEFAULT=AUDIOFILE CURL FFMPEG FLAC ID3TAG MAD SNDFILE \ VORBIS VORBISENC # Decoder plugins ADPLUG_MESON_ON= -Dadplug=enabled ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug AUDIOFILE_MESON_ON= -Daudiofile=enabled AUDIOFILE_LIB_DEPENDS= libaudiofile.so:audio/libaudiofile FAAD_MESON_ON= -Dfaad=enabled FAAD_LIB_DEPENDS= libfaad.so:audio/faad FFMPEG_MESON_ON= -Dffmpeg=enabled FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FLAC_MESON_ON= -Dflac=enabled FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLUIDSYNTH_MESON_ON= -Dfluidsynth=enabled FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth GME_MESON_ON= -Dgme=enabled GME_LIB_DEPENDS= libgme.so:audio/libgme MAD_MESON_ON= -Dmad=enabled MAD_LIB_DEPENDS= libmad.so:audio/libmad MIKMOD_MESON_ON= -Dmikmod=enabled MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MODPLUG_MESON_ON= -Dmodplug=enabled MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MPG123_MESON_ON= -Dmpg123=enabled MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MUSEPACK_MESON_ON= -Dmpcdec=enabled MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack OPUS_MESON_ON= -Dopus=enabled OPUS_LIB_DEPENDS= libopus.so:audio/opus \ libogg.so:audio/libogg SIDPLAY2_MESON_ON= -Dsidplay=enabled SIDPLAY2_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2 SIDPLAY2_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders SNDFILE_MESON_ON= -Dsndfile=enabled SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile VORBIS_MESON_ON= -Dvorbis=enabled VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis WAVPACK_MESON_ON= -Dwavpack=enabled WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WILDMIDI_MESON_ON= -Dwildmidi=enabled WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi # Encoder plugins VORBISENC_MESON_ON= -Dvorbisenc=enabled VORBISENC_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis LAME_MESON_ON= -Dlame=enabled LAME_LIB_DEPENDS= libmp3lame.so:audio/lame TWOLAME_MESON_ON= -Dtwolame=enabled TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame # Filter plugins SAMPLERATE_MESON_ON= -Dlibsamplerate=enabled SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SOXR_MESON_ON= -Dsoxr=enabled SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr # Output plugins AO_MESON_ON= -Dao=enabled AO_LIB_DEPENDS= libao.so:audio/libao JACK_MESON_ON= -Djack=enabled JACK_LIB_DEPENDS= libjack.so:audio/jack OPENAL_MESON_ON= -Dopenal=enabled OPENAL_USES= openal -OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 PULSEAUDIO_MESON_ON= -Dpulse=enabled PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio SHOUTCAST_MESON_ON= -Dshout=enabled SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_IMPLIES= VORBIS SNDIO_MESON_ON= -Dsndio=enabled SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio # Input plugins CDPARANOIA_MESON_ON= -Dcdio_paranoia=enabled CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia CURL_MESON_ON= -Dcurl=enabled CURL_LIB_DEPENDS= libcurl.so:ftp/curl MMS_MESON_ON= -Dmms=enabled MMS_LIB_DEPENDS= libmms.so:net/libmms SMB_MESON_ON= -Dsmbclient=enabled SMB_USES= samba:lib # Archive plugins ZZIP_MESON_ON= -Dzzip=enabled ZZIP_LIB_DEPENDS= libzzip.so:devel/zziplib ISO9660_MESON_ON= -Diso9660=enabled ISO9660_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia # Database plugins SQLITE3_MESON_ON= -Dsqlite=enabled SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PROXYDB_MESON_ON= -Dlibmpdclient=enabled PROXYDB_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient # Tag plugins ID3TAG_MESON_ON= -Did3tag=enabled ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag # Network support IPV6_MESON_ON= -Dipv6=enabled # Commercial service support QOBUZ_MESON_ON= -Dqobuz=enabled QOBUZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt QOBUZ_IMPLIES= CURL YAJL SOUNDCLOUD_MESON_ON= -Dsoundcloud=enabled SOUNDCLOUD_IMPLIES= CURL YAJL TIDAL_MESON_ON= -Dtidal=enabled TIDAL_IMPLIES= CURL YAJL # Misc library suppore AVAHI_MESON_ON= -Dzeroconf=avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder YAJL_MESON_ON= -Dyajl=enabled YAJL_LIB_DEPENDS= libyajl.so:devel/yajl MPDUSER?= mpd MPDGROUP?= mpd USERS= ${MPDUSER} GROUPS= ${MPDGROUP} .include # Note that since the build system switch to meson, mpd fails to link with # GNU ld 2.17 in base. Also, meson does not allow to set the linker via # environment variables yet. # For gcc-based platforms, gcc and ld from ports are used due to the c++14 # requirement. For clang, we set the linker explicitly in meson.build. .if ${ARCH} == armv6 #lld may use movt/movw, doesn't work on armv6 BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils MPD_CLANG_LD= ${LOCALBASE}/bin/ld .else MPD_CLANG_LD= lld .endif post-patch: # Insert selected linker for clang @${REINPLACE_CMD} -e 's|%%MPD_CLANG_LD%%|${MPD_CLANG_LD}|' \ ${WRKSRC}/meson.build # 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 mpd.conf; 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}/_build/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: head/audio/musicpd/distinfo =================================================================== --- head/audio/musicpd/distinfo (revision 490136) +++ head/audio/musicpd/distinfo (revision 490137) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542528753 -SHA256 (mpd-0.21.3.tar.xz) = 6cf60e644870c6063a008d833a6c876272b7679a400b83012ed209c15ce06e2a -SIZE (mpd-0.21.3.tar.xz) = 664992 +TIMESTAMP = 1547301787 +SHA256 (mpd-0.21.4.tar.xz) = 247112eabf1b818a4052db7f0f5917ab00831ebc60a1ec3bf1154da4dc16a5c7 +SIZE (mpd-0.21.4.tar.xz) = 663648 Index: head/audio/musicpd/files/patch-src_zeroconf_meson.build =================================================================== --- head/audio/musicpd/files/patch-src_zeroconf_meson.build (nonexistent) +++ head/audio/musicpd/files/patch-src_zeroconf_meson.build (revision 490137) @@ -0,0 +1,20 @@ +--- src/zeroconf/meson.build.orig 2019-01-04 18:22:21 UTC ++++ src/zeroconf/meson.build +@@ -30,10 +30,14 @@ if zeroconf_option == 'bonjour' + if not compiler.has_header('dns_sd.h') + error('dns_sd.h not found') + endif +- +- bonjour_dep = declare_dependency(link_args: ['-framework', 'dnssd']) ++ ++ if is_darwin ++ bonjour_dep = declare_dependency(link_args: ['-framework', 'dnssd']) ++ else ++ bonjour_dep = declare_dependency(link_args: ['-ldns_sd']) ++ endif + conf.set('HAVE_BONJOUR', true) +- ++ + zeroconf = static_library( + 'zeroconf_bonjour', + 'ZeroconfGlue.cxx', Property changes on: head/audio/musicpd/files/patch-src_zeroconf_meson.build ___________________________________________________________________ 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