summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2019-01-13 14:19:24 +0000
committerThomas Zander <riggs@FreeBSD.org>2019-01-13 14:19:24 +0000
commit09bfac1bf8bcab53c11e6e0e824219a50f205461 (patch)
tree91bd56d92862f388ef98995ec44792713116eb2a
parentUpgrade to v.2.4.5. (diff)
Update to upstream version 0.21.4
Details: - Bugfix release, see upstream changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.4/NEWS - Fix build with openal and lld MFH: 2019Q1
Notes
Notes: svn path=/head/; revision=490137
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/musicpd/distinfo6
-rw-r--r--audio/musicpd/files/patch-src_zeroconf_meson.build20
3 files changed, 24 insertions, 6 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index e1f1172f3718..d0a35b0e691f 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,8 +1,7 @@
# $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}
@@ -141,7 +140,6 @@ 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
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 3ac7996aeda8..89d66371d151 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -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
diff --git a/audio/musicpd/files/patch-src_zeroconf_meson.build b/audio/musicpd/files/patch-src_zeroconf_meson.build
new file mode 100644
index 000000000000..309755061d3f
--- /dev/null
+++ b/audio/musicpd/files/patch-src_zeroconf_meson.build
@@ -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',