Mon Jul 15 13:47:14 2019 UTC ()
musicpd: Update to 0.21.11

changes in pkgsrc:

* switch from libmad to libmpg123 for mp3 decoding.
  it's more actively maintained.
* switch from libaudiofile to libsndfile for lossless formats.
  it's more actively maintained.
* add more options, and try to clarify existing options to
  make it obvious what is being enabled.
* enable ffmpeg by default so playing m4a files works
* fix cdparanoia support

ver 0.21.11 (2019/07/03)
* input
  - tidal: deprecated because Tidal has changed the protocol
* decoder
  - wildmidi: log error if library initialization fails
* output
  - alsa: fix busy loop while draining
  - alsa: fix missing drain call
  - alsa: improve xrun-avoiding silence generator
  - alsa: log when generating silence due to slow decoder
  - alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
* protocol
  - fix "list" with multiple "group" levels


(nia)
diff -r1.187 -r1.188 pkgsrc/audio/musicpd/Makefile
diff -r1.100 -r1.101 pkgsrc/audio/musicpd/distinfo
diff -r1.33 -r1.34 pkgsrc/audio/musicpd/options.mk
diff -r1.7 -r1.8 pkgsrc/audio/musicpd/files/mpd.conf
cvs diff -r1.187 -r1.188 pkgsrc/audio/musicpd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2019/07/01 04:07:57 1.187
+++ pkgsrc/audio/musicpd/Makefile 2019/07/15 13:47:14 1.188
@@ -1,67 +1,85 @@ @@ -1,67 +1,85 @@
1# $NetBSD: Makefile,v 1.187 2019/07/01 04:07:57 ryoon Exp $ 1# $NetBSD: Makefile,v 1.188 2019/07/15 13:47:14 nia Exp $
2 2
3DISTNAME= mpd-0.21.10 3DISTNAME= mpd-0.21.11
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5PKGREVISION= 1 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= http://www.musicpd.org/download/mpd/0.21/ 6MASTER_SITES= https://www.musicpd.org/download/mpd/0.21/
8#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} 
9EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
10 8
11MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://musicpd.org/ 10HOMEPAGE= https://www.musicpd.org/
13COMMENT= Remote controllable audio player 11COMMENT= Remote controllable audio player
14LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
15 13
16TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 14TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
17 15
18CONFLICTS= mpd-[0-9]* 16CONFLICTS= mpd-[0-9]*
19 17
20USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
21USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
22MESON_ARGS+= -Ddocumentation=true 20MESON_ARGS+= -Ddocumentation=true
23 21
 22# worrying libraries with limited maintainance:
 23# - audiofile, many CVEs, no activity since 2016
 24# using sndfile instead
 25# - mad, no release since 2004
 26# using mpg123 instead
 27MESON_ARGS+= -Dmad=disabled
 28MESON_ARGS+= -Daudiofile=disabled
 29
 30# not available in pkgsrc?
 31MESON_ARGS+= -Dnfs=disabled
 32MESON_ARGS+= -Diso9660=disabled
 33MESON_ARGS+= -Dsndio=disabled
 34
24# c++14 35# c++14
25GCC_REQD+= 6 36GCC_REQD+= 6
26 37
27CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 38CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
28 39
29.include "options.mk" 40.include "options.mk"
30 41
31EGDIR= ${PREFIX}/share/examples/mpd 42EGDIR= ${PREFIX}/share/examples/mpd
32CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf 43CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
33RCD_SCRIPTS= mpd 44RCD_SCRIPTS= mpd
34 45
35FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q} 46FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO}
36 47
37SUBST_CLASSES+= paths 48SUBST_CLASSES+= paths
38SUBST_STAGE.paths= pre-configure 49SUBST_STAGE.paths= pre-configure
39SUBST_FILES.paths= mpd.conf 50SUBST_FILES.paths= mpd.conf
40SUBST_MESSAGE.paths= Fixing path to sound device in example config. 51SUBST_MESSAGE.paths= Fixing path to sound device in example config.
41SUBST_VARS.paths+= DEVOSSAUDIO 52SUBST_VARS.paths+= DEVOSSAUDIO
42 53
43SUBST_CLASSES+= sphinx 54SUBST_CLASSES+= sphinx
44SUBST_STAGE.sphinx= pre-configure 55SUBST_STAGE.sphinx= pre-configure
45SUBST_FILES.sphinx= doc/meson.build 56SUBST_FILES.sphinx= doc/meson.build
46SUBST_MESSAGE.sphinx= Fixing sphinx binary name. 57SUBST_MESSAGE.sphinx= Fixing sphinx binary name.
47SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX}," 58SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
48 59
49LDFLAGS+= ${LIBOSSAUDIO} 60LDFLAGS+= ${LIBOSSAUDIO}
50 61
51INSTALLATION_DIRS= ${EGDIR} 62INSTALLATION_DIRS= ${EGDIR}
52 63
53post-extract: 64post-extract:
54 ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf 65 ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf
55 66
56post-install: 67post-install:
57 ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR} 68 ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
58 ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR} 69 ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
59 70
60.include "../../devel/py-meson/build.mk" 71.include "../../devel/py-meson/build.mk"
 72BUILDLINK_ABI_DEPENDS.flac+= flac>=1.2
 73.include "../../audio/flac/buildlink3.mk"
 74.include "../../audio/libopus/buildlink3.mk"
 75.include "../../audio/mpg123/buildlink3.mk"
 76.include "../../databases/sqlite3/buildlink3.mk"
61.include "../../devel/boost-libs/buildlink3.mk" 77.include "../../devel/boost-libs/buildlink3.mk"
62.include "../../textproc/icu/buildlink3.mk" 78.include "../../devel/pcre/buildlink3.mk"
63.include "../../audio/libmad/buildlink3.mk" 
64.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 79.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
65 80.include "../../security/libgcrypt/buildlink3.mk"
 81.include "../../textproc/expat/buildlink3.mk"
 82.include "../../textproc/icu/buildlink3.mk"
66.include "../../mk/oss.buildlink3.mk" 83.include "../../mk/oss.buildlink3.mk"
 84.include "../../mk/pthread.buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"
cvs diff -r1.100 -r1.101 pkgsrc/audio/musicpd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/distinfo 2019/06/11 10:21:43 1.100
+++ pkgsrc/audio/musicpd/distinfo 2019/07/15 13:47:14 1.101
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.100 2019/06/11 10:21:43 wiz Exp $ 1$NetBSD: distinfo,v 1.101 2019/07/15 13:47:14 nia Exp $
2 2
3SHA1 (mpd-0.21.10.tar.xz) = f4c086264c5889b34844ae5bdbfbd037c6de7dac 3SHA1 (mpd-0.21.11.tar.xz) = ae7c9ce111bdb7fdfe6316083fda56ad0a676438
4RMD160 (mpd-0.21.10.tar.xz) = 610cc56e2f6d74f9fb66505ebbb1ba5cff7ff23d 4RMD160 (mpd-0.21.11.tar.xz) = b9c77baa7b138a9a9e25007e16d6269fe35c4090
5SHA512 (mpd-0.21.10.tar.xz) = 42272ab5f767c5a6b907f5dd922ca35abc759dfbb4769a235261fdf0433a0f70494f503255403d41dfd34902bd6aff21f48291b24fd5bc260a5fdef53800c991 5SHA512 (mpd-0.21.11.tar.xz) = 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
6Size (mpd-0.21.10.tar.xz) = 670952 bytes 6Size (mpd-0.21.11.tar.xz) = 671444 bytes
7SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6 7SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6
cvs diff -r1.33 -r1.34 pkgsrc/audio/musicpd/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/options.mk 2019/01/06 14:47:20 1.33
+++ pkgsrc/audio/musicpd/options.mk 2019/07/15 13:47:14 1.34
@@ -1,168 +1,239 @@ @@ -1,168 +1,239 @@
1# $NetBSD: options.mk,v 1.33 2019/01/06 14:47:20 wiz Exp $ 1# $NetBSD: options.mk,v 1.34 2019/07/15 13:47:14 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
4PKG_SUPPORTED_OPTIONS= adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth game-music-emu id3 libao lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shine shout sqlite3 tremor twolame vorbis wavpack zziplib 4PKG_SUPPORTED_OPTIONS= adplug avahi bzip2 cdparanoia chromaprint curl dbus faad ffmpeg fluidsynth id3 libao libgme lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug musepack musicpd-soundcloud openal pulseaudio samba samplerate sidplay shine shout sndfile tremor twolame upnp wavpack zziplib
5PKG_SUGGESTED_OPTIONS= audiofile curl faad flac id3 libao musepack shout vorbis 5PKG_SUGGESTED_OPTIONS= curl faad ffmpeg id3 libao musepack samplerate shout sndfile vorbis
6 6
7PKG_OPTIONS_OPTIONAL_GROUPS= vorbis 7PKG_OPTIONS_LEGACY_OPTS+= game-music-emu:libgme
 8
 9PKG_OPTIONS_OPTIONAL_GROUPS= resampler vorbis
8PKG_OPTIONS_GROUP.vorbis= tremor vorbis 10PKG_OPTIONS_GROUP.vorbis= tremor vorbis
 11PKG_OPTIONS_GROUP.resampler= samplerate libsoxr
9 12
10.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
11 14
12.if !empty(PKG_OPTIONS:Madplug) 15.if !empty(PKG_OPTIONS:Madplug)
13. include "../../audio/adplug/buildlink3.mk" 16. include "../../audio/adplug/buildlink3.mk"
14.endif 17.else
15 18MESON_ARGS+= -Dadplug=disabled
16.if !empty(PKG_OPTIONS:Maudiofile) 
17BUILDLINK_API_DEPENDS.libaudiofile+= libaudiofile>=0.3 
18. include "../../audio/libaudiofile/buildlink3.mk" 
19.endif 19.endif
20 20
21.if !empty(PKG_OPTIONS:Mavahi) 21.if !empty(PKG_OPTIONS:Mavahi)
22. include "../../net/avahi/buildlink3.mk" 22. include "../../net/avahi/buildlink3.mk"
 23MESON_ARGS+= -Dzeroconf=avahi
 24.else
 25MESON_ARGS+= -Dzeroconf=auto
23.endif 26.endif
24 27
25.if !empty(PKG_OPTIONS:Mbzip2) 28.if !empty(PKG_OPTIONS:Mbzip2)
26. include "../../archivers/bzip2/buildlink3.mk" 29. include "../../archivers/bzip2/buildlink3.mk"
 30.else
 31MESON_ARGS+= -Dbzip2=disabled
27.endif 32.endif
28 33
29# wants a different version of the library than we have in pkgsrc 34.if !empty(PKG_OPTIONS:Mcdparanoia)
30#.if !empty(PKG_OPTIONS:Mcdparanoia) 35. include "../../misc/libcdio-paranoia/buildlink3.mk"
31#. include "../../audio/cdparanoia/buildlink3.mk" 36.else
32#.endif 37MESON_ARGS+= -Dcdio_paranoia=disabled
 38.endif
 39
 40.if !empty(PKG_OPTIONS:Mchromaprint)
 41. include "../../audio/chromaprint/buildlink3.mk"
 42.else
 43MESON_ARGS+= -Dchromaprint=disabled
 44.endif
33 45
34.if !empty(PKG_OPTIONS:Mcurl) 46.if !empty(PKG_OPTIONS:Mcurl)
35. include "../../www/curl/buildlink3.mk" 47. include "../../www/curl/buildlink3.mk"
 48.else
 49MESON_ARGS+= -Dcurl=disabled
 50.endif
 51
 52.if !empty(PKG_OPTIONS:Mdbus)
 53. include "../../sysutils/dbus/buildlink3.mk"
 54.else
 55MESON_ARGS+= -Ddbus=disabled
36.endif 56.endif
37 57
38.if !empty(PKG_OPTIONS:Mfaad) 58.if !empty(PKG_OPTIONS:Mfaad)
39. include "../../audio/faad2/buildlink3.mk" 59. include "../../audio/faad2/buildlink3.mk"
 60.else
 61MESON_ARGS+= -Dfaad=disabled
40.endif 62.endif
41 63
42.if !empty(PKG_OPTIONS:Mffmpeg) 64.if !empty(PKG_OPTIONS:Mffmpeg)
43. include "../../multimedia/ffmpeg4/buildlink3.mk" 65. include "../../multimedia/ffmpeg4/buildlink3.mk"
44.endif 66.else
45 67MESON_ARGS+= -Dffmpeg=disabled
46.if !empty(PKG_OPTIONS:Mflac) 
47BUILDLINK_ABI_DEPENDS.flac+= flac>=1.2 
48. include "../../audio/flac/buildlink3.mk" 
49# XXX whole album flac files can appearently be parsed without libcue, 
50# so I've yet to find out what libcue is good for 
51#. include "../../audio/libcue/buildlink3.mk" 
52.endif 68.endif
53 69
54.if !empty(PKG_OPTIONS:Mfluidsynth) 70.if !empty(PKG_OPTIONS:Mfluidsynth)
55. include "../../audio/fluidsynth/buildlink3.mk" 71. include "../../audio/fluidsynth/buildlink3.mk"
 72.else
 73MESON_ARGS+= -Dfluidsynth=disabled
56.endif 74.endif
57 75
58.if !empty(PKG_OPTIONS:Mgame-music-emu) 76.if !empty(PKG_OPTIONS:Mlibgme)
59. include "../../audio/game-music-emu/buildlink3.mk" 77. include "../../audio/game-music-emu/buildlink3.mk"
 78.else
 79MESON_ARGS+= -Dgme=disabled
60.endif 80.endif
61 81
62.if !empty(PKG_OPTIONS:Mid3) 82.if !empty(PKG_OPTIONS:Mid3)
63. include "../../audio/libid3tag/buildlink3.mk" 83. include "../../audio/libid3tag/buildlink3.mk"
 84.else
 85MESON_ARGS+= -Did3tag=disabled
64.endif 86.endif
65 87
66.if !empty(PKG_OPTIONS:Mjack) 88.if !empty(PKG_OPTIONS:Mjack)
67. include "../../audio/jack/buildlink3.mk" 89. include "../../audio/jack/buildlink3.mk"
 90.else
 91MESON_ARGS+= -Djack=disabled
68.endif 92.endif
69 93
70.if !empty(PKG_OPTIONS:Mlame) 94.if !empty(PKG_OPTIONS:Mlame)
71. include "../../audio/lame/buildlink3.mk" 95. include "../../audio/lame/buildlink3.mk"
 96.else
 97MESON_ARGS+= -Dlame=disabled
72.endif 98.endif
73 99
74.if !empty(PKG_OPTIONS:Mlibao) 100.if !empty(PKG_OPTIONS:Mlibao)
75. include "../../audio/libao/buildlink3.mk" 101. include "../../audio/libao/buildlink3.mk"
 102.else
 103MESON_ARGS+= -Dao=disabled
76.endif 104.endif
77 105
78.if !empty(PKG_OPTIONS:Mlibmms) 106.if !empty(PKG_OPTIONS:Mlibmms)
79. include "../../net/libmms/buildlink3.mk" 107. include "../../net/libmms/buildlink3.mk"
 108.else
 109MESON_ARGS+= -Dmms=disabled
80.endif 110.endif
81 111
82.if !empty(PKG_OPTIONS:Mlibmpdclient) 112.if !empty(PKG_OPTIONS:Mlibmpdclient)
83. include "../../audio/libmpdclient/buildlink3.mk" 113. include "../../audio/libmpdclient/buildlink3.mk"
 114.else
 115MESON_ARGS+= -Dlibmpdclient=disabled
84.endif 116.endif
85 117
86# does not find libresid-builder 
87#.if !empty(PKG_OPTIONS:Mlibsidplay2) 
88#. include "../../audio/libsidplay2/buildlink3.mk" 
89#.endif 
90 
91.if !empty(PKG_OPTIONS:Mlibsoxr) 118.if !empty(PKG_OPTIONS:Mlibsoxr)
92. include "../../audio/libsoxr/buildlink3.mk" 119. include "../../audio/libsoxr/buildlink3.mk"
 120.else
 121MESON_ARGS+= -Dsoxr=disabled
93.endif 122.endif
94 123
95.if !empty(PKG_OPTIONS:Mlibwildmidi) 124.if !empty(PKG_OPTIONS:Mlibwildmidi)
96. include "../../audio/libwildmidi/buildlink3.mk" 125. include "../../audio/libwildmidi/buildlink3.mk"
 126.else
 127MESON_ARGS+= -Dwildmidi=disabled
97.endif 128.endif
98 129
99.if !empty(PKG_OPTIONS:Mmikmod) 130.if !empty(PKG_OPTIONS:Mmikmod)
100. include "../../audio/libmikmod/buildlink3.mk" 131. include "../../audio/libmikmod/buildlink3.mk"
 132.else
 133MESON_ARGS+= -Dmikmod=disabled
101.endif 134.endif
102 135
103.if !empty(PKG_OPTIONS:Mmodplug) 136.if !empty(PKG_OPTIONS:Mmodplug)
104. include "../../audio/libmodplug/buildlink3.mk" 137. include "../../audio/libmodplug/buildlink3.mk"
105.endif 138.else
106 139MESON_ARGS+= -Dmodplug=disabled
107.if !empty(PKG_OPTIONS:Mmpg123) 
108. include "../../audio/mpg123/buildlink3.mk" 
109.endif 140.endif
110 141
111.if !empty(PKG_OPTIONS:Mmusepack) 142.if !empty(PKG_OPTIONS:Mmusepack)
112. include "../../audio/musepack/buildlink3.mk" 143. include "../../audio/musepack/buildlink3.mk"
 144.else
 145MESON_ARGS+= -Dmpcdec=disabled
113.endif 146.endif
114 147
115.if !empty(PKG_OPTIONS:Mmusicpd-soundcloud) 148.if !empty(PKG_OPTIONS:Mmusicpd-soundcloud)
116BUILDLINK_API_DEPENDS.yajl+= yajl>=2.1 149BUILDLINK_API_DEPENDS.yajl+= yajl>=2.1
117. include "../../devel/yajl/buildlink3.mk" 150. include "../../devel/yajl/buildlink3.mk"
 151.else
 152MESON_ARGS+= -Dyajl=disabled
118.endif 153.endif
119 154
120.if !empty(PKG_OPTIONS:Mopenal) 155.if !empty(PKG_OPTIONS:Mopenal)
121. include "../../audio/openal-soft/buildlink3.mk" 156. include "../../audio/openal-soft/buildlink3.mk"
122.endif 157.else
123 158MESON_ARGS+= -Dopenal=disabled
124.if !empty(PKG_OPTIONS:Mopus) 
125. include "../../audio/libopus/buildlink3.mk" 
126.endif 159.endif
127 160
128.if !empty(PKG_OPTIONS:Mpulseaudio) 161.if !empty(PKG_OPTIONS:Mpulseaudio)
129. include "../../audio/pulseaudio/buildlink3.mk" 162. include "../../audio/pulseaudio/buildlink3.mk"
 163.else
 164MESON_ARGS+= -Dpulse=disabled
 165.endif
 166
 167.if !empty(PKG_OPTIONS:Msamba)
 168. include "../../net/samba4/buildlink3.mk"
 169.else
 170MESON_ARGS+= -Dsmbclient=disabled
 171.endif
 172
 173.if !empty(PKG_OPTIONS:Msamplerate)
 174. include "../../audio/libsamplerate/buildlink3.mk"
 175.else
 176MESON_ARGS+= -Dsamplerate=disabled
130.endif 177.endif
131 178
132.if !empty(PKG_OPTIONS:Mshine) 179.if !empty(PKG_OPTIONS:Mshine)
133. include "../../audio/shine/buildlink3.mk" 180. include "../../audio/shine/buildlink3.mk"
 181.else
 182MESON_ARGS+= -Dshine=disabled
 183.endif
 184
 185.if !empty(PKG_OPTIONS:Msidplay)
 186. include "../../audio/libsidplay2/buildlink3.mk"
 187.else
 188MESON_ARGS+= -Dsidplay=disabled
134.endif 189.endif
135 190
136.if !empty(PKG_OPTIONS:Mshout) 191.if !empty(PKG_OPTIONS:Mshout)
137. include "../../audio/libshout/buildlink3.mk" 192. include "../../audio/libshout/buildlink3.mk"
138. include "../../audio/lame/buildlink3.mk" 193. include "../../audio/lame/buildlink3.mk"
 194.else
 195MESON_ARGS+= -Dshout=disabled
139.endif 196.endif
140 197
141# needs libresid-builder or libsidutils, both not packaged yet 198.if !empty(PKG_OPTIONS:Msndfile)
142#.if !empty(PKG_OPTIONS:Msidplay) 199. include "../../audio/libsndfile/buildlink3.mk"
143#. include "../../audio/libsidplay2/buildlink3.mk" 200.else
144#.endif 201MESON_ARGS+= -Dsndfile=disabled
145 
146.if !empty(PKG_OPTIONS:Msqlite3) 
147. include "../../databases/sqlite3/buildlink3.mk" 
148.endif 202.endif
149 203
150.if !empty(PKG_OPTIONS:Mtremor) 204.if !empty(PKG_OPTIONS:Mtremor)
151. include "../../audio/tremor/buildlink3.mk" 205. include "../../audio/tremor/buildlink3.mk"
 206.else
 207MESON_ARGS+= -Dtremor=disabled
152.endif 208.endif
153 209
154.if !empty(PKG_OPTIONS:Mtwolame) 210.if !empty(PKG_OPTIONS:Mtwolame)
155. include "../../audio/twolame/buildlink3.mk" 211. include "../../audio/twolame/buildlink3.mk"
 212.else
 213MESON_ARGS+= -Dtwolame=disabled
156.endif 214.endif
157 215
158.if !empty(PKG_OPTIONS:Mvorbis) 216.if !empty(PKG_OPTIONS:Mvorbis)
159. include "../../audio/libvorbis/buildlink3.mk" 217. include "../../audio/libvorbis/buildlink3.mk"
 218.else
 219MESON_ARGS+= -Dvorbis=disabled
 220MESON_ARGS+= -Dvorbisenc=disabled
 221.endif
 222
 223.if !empty(PKG_OPTIONS:Mupnp)
 224. include "../../net/libupnp/buildlink3.mk"
 225.else
 226MESON_ARGS+= -Dupnp=disabled
160.endif 227.endif
161 228
162.if !empty(PKG_OPTIONS:Mwavpack) 229.if !empty(PKG_OPTIONS:Mwavpack)
163. include "../../audio/wavpack/buildlink3.mk" 230. include "../../audio/wavpack/buildlink3.mk"
 231.else
 232MESON_ARGS+= -Dwavpack=disabled
164.endif 233.endif
165 234
166.if !empty(PKG_OPTIONS:Mzziplib) 235.if !empty(PKG_OPTIONS:Mzziplib)
167. include "../../archivers/zziplib/buildlink3.mk" 236. include "../../archivers/zziplib/buildlink3.mk"
 237.else
 238MESON_ARGS+= -Dzzip=disabled
168.endif 239.endif
cvs diff -r1.7 -r1.8 pkgsrc/audio/musicpd/files/mpd.conf (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/files/mpd.conf 2014/04/18 12:46:58 1.7
+++ pkgsrc/audio/musicpd/files/mpd.conf 2019/07/15 13:47:14 1.8
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: mpd.conf,v 1.7 2014/04/18 12:46:58 wiz Exp $ 1# $NetBSD: mpd.conf,v 1.8 2019/07/15 13:47:14 nia Exp $
2 2
3# required 3# required
4music_directory "/mp3" 4music_directory "/mp3"
5playlist_directory "/mp3" 5playlist_directory "/mp3"
6log_file "/var/log/mpd.log" 6log_file "/var/log/mpd.log"
7 7
8# optional 8# optional
9port "6600" 9port "6600"
10max_connections "5" 10max_connections "5"
11max_command_list_size "2048" 11max_command_list_size "2048"
12max_output_buffer_size "2048" 12max_output_buffer_size "2048"
13connection_timeout "60" 13connection_timeout "60"
14db_file "/mp3/.mpddb" 14db_file "/mp3/.mpddb"
15state_file "/mp3/.mpdstate" 15state_file "/mp3/.mpdstate"
16save_absolute_paths_in_playlists "no" 16save_absolute_paths_in_playlists "no"
17 17
18max_playlist_length "4096" 18max_playlist_length "4096"
19buffer_before_play "25%" 
20bind_to_address "any" 19bind_to_address "any"
21 20
22audio_output { 21audio_output {
23 type "oss" 22 type "oss"
24 name "LibAO-OSS" 23 name "LibAO-OSS"
25 device "@DEVOSSAUDIO@" 24 device "@DEVOSSAUDIO@"
26} 25}
27 26
28mixer_type "software" 27mixer_type "software"
29# mixer_control defaults to the master volume control. uncomment the 28# mixer_control defaults to the master volume control. uncomment the
30# following line to have mpd's volume control modify the "PCM" 29# following line to have mpd's volume control modify the "PCM"
31# volume instead: 30# volume instead:
32# mixer_control "Pcm" 31# mixer_control "Pcm"