audio-players/mpd: version 0.21

5 files changed, 168 insertions, 115 deletions

diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD
index f0b6fde4f8..264ee1b903 100755
--- a/audio-players/mpd/BUILD
+++ b/audio-players/mpd/BUILD
@@ -1,7 +1,5 @@
 create_account musicdaemon &&
 
-OPTS="--disable-mpc $MPD_OPTS $OPTS" &&
-
 LDFLAGS="-L/usr/lib/sidplay/builders $LDFLAGS" &&
 
 default_build
diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 76c45eaca3..be1b8b0a0b 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -1,3 +1,5 @@
+. "${GRIMOIRE}/MESON_CONFIGURE"
+
 # remove obsolete options
 list_remove MPD_OPTS "--enable-mvp" &&
 list_remove MPD_OPTS "--disable-mvp" &&
@@ -5,37 +7,49 @@ list_remove MPD_OPTS "--enable-oggflac" &&
 list_remove MPD_OPTS "--disable-oggflac" &&
 
 config_query_option MPD_OPTS "Enable IPv6 support?" y \
-                             "--enable-ipv6" \
-                             "--disable-ipv6" &&
+                             "-Dipv6=true" \
+                             "-Dipv6=false" &&
 
 config_query_option MPD_OPTS "Enable writing to a FIFO?" y \
-                             "--enable-fifo" \
-                             "--disable-fifo" &&
+                             "-Dfifo=true" \
+                             "-Dfifo=false" &&
 
 config_query_option MPD_OPTS "Enable support for clients connecting via TCP?" y \
-                             "--enable-tcp" \
-                             "--disable-tcp" &&
+                             "-Dtcp=true" \
+                             "-Dtcp=false" &&
 
 config_query_option MPD_OPTS "Enable support for clients connecting via unix domain sockets?" y \
-                             "--enable-un" \
-                             "--disable-un" &&
+                             "-Dlocal_socket=true" \
+                             "-Dlocal_socket=false" &&
 
 config_query_option MPD_OPTS "Enable writing to a pipe?" n \
-                             "--enable-pipe-output" \
-                             "--disable-pipe-output" &&
+                             "-Dpipe=true" \
+                             "-Dpipe=false" &&
 
 config_query_option MPD_OPTS "Enable HTTP server output?" y \
-                             "--enable-httpd-output" \
-                             "--disable-httpd-output" &&
+                             "-Dhttpd=true" \
+                             "-Dhttpd=false" &&
 
 config_query_option MPD_OPTS "Enable recorder file output plugin?" n \
-                             "--enable-recorder-output" \
-                             "--disable-recorder-output" &&
+                             "-Drecorder=true" \
+                             "-Drecorder=false" &&
 
-config_query_option MPD_OPTS "Enable support for Inotify automatic database update?" y \
-                             "--enable-inotify" \
-                             "--disable-inotify" &&
+config_query_option MPD_OPTS "Enable DSD file output plugin?" n \
+                             "-Ddsd=true" \
+                             "-Ddsd=false" &&
+
+config_query_option MPD_OPTS "Enable UPnP client support?" n \
+                             "-Dupnp=true" \
+                             "-Dupnp=false" &&
 
-config_query_option MPD_OPTS "Enable debugging?" n \
-                             "--enable-debug" \
-                             "--disable-debug"
+config_query_option MPD_OPTS "Enable support for neighbor discovery?" n \
+                             "-Dneighbor=true" \
+                             "-Dneighbor=false" &&
+
+config_query_option MPD_OPTS "Enable support for CUE sheets?" n \
+                             "-Dcue=true" \
+                             "-Dcue=false" &&
+
+config_query_option MPD_OPTS "Enable support for Inotify automatic database update?" y \
+                             "-Dinotify=true" \
+                             "-Dinotify=false"
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index e3f17ca23a..105e5aaf59 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,186 +1,193 @@
 depends -sub CXX gcc &&
 depends boost &&
+depends meson &&
 
 # TODO: missing libraries in grimoire:
-# - libroar (--enable-roar) for RoarAudio support
-# - libgme (--enable-gme) for Blargg's game music emulator plugin
-# - libadplug (--enable-adplug) for AdPlug decoder plugin
-# - libopus (--enable-opus) for Opus codec support
-# - libiso9660 (--enable-iso9660) for iso9660 archive support
-# - despotify (--enable-despotify) for despotify (spotify.com) support
+# - libgme (-Dgme=true) for Blargg's game music emulator plugin
+# - libadplug (-Dadplug=true) for AdPlug decoder plugin
 
 optional_depends icu \
-                 "--enable-icu" \
-                 "--disable-icu" \
+                 "-Dicu=true" \
+                 "-Dicu=false" \
                  "for Unicode support" &&
 
 optional_depends libao \
-                 "--enable-ao" \
-                 "--disable-ao" \
+                 "-Dao=true" \
+                 "-Dao=false" \
                  "for libao support" &&
 
 optional_depends yajl \
-                 "--enable-soundcloud" \
-                 "--disable-soundcloud" \
+                 "-Dsoundcloud=true" \
+                 "-Dsoundcloud=false" \
                  "for soundcloud.com support" &&
 
 optional_depends zlib \
-                 "--enable-zlib" \
-                 "--disable-zlib" \
+                 "-Dzlib=true" \
+                 "-Dzlib=false" \
                  "for zlib support" &&
 
 optional_depends bzip2 \
-                 "--enable-bzip2" \
-                 "--disable-bzip2" \
+                 "-Dbzip2=true" \
+                 "-Dbzip2=false" \
                  "for bzip2 archive support" &&
 
 optional_depends zziplib \
-                 "--enable-zzip" \
-                 "--disable-zzip" \
+                 "-Dzzip=true" \
+                 "-Dzzip=false" \
                  "for zip archive support" &&
 
 optional_depends libvorbis \
-                 "--enable-vorbis" \
-                 "--disable-vorbis" \
+                 "-Dvorbis=true" \
+                 "-Dvorbis=false" \
                  "for Ogg Vorbis support" &&
 
 if is_depends_enabled $SPELL libvorbis; then
   depends libogg &&
 
   config_query_option MPD_OPTS "Enable Ogg Vorbis encoder support?" y \
-                               "--enable-vorbis-encoder" \
-                               "--disable-vorbis-encoder"
+                               "-Dvorbisenc=true" \
+                               "-Dvorbisenc=false"
 fi &&
 
 optional_depends sidplay-libs \
-                 "--enable-sidplay" \
-                 "--disable-sidplay" \
+                 "-Dsidplay=true" \
+                 "-Dsidplay=false" \
                  "for C64 SID support" &&
 
 #optional_depends libmpcdec \
-#                 "--enable-mpc" \
-#                 "--disable-mpc" \
+#                 "-Dmpc=true" \
+#                 "-Dmpc=false" \
 #                 "for musepack support" &&
 
 optional_depends flac \
-                 "--enable-flac" \
-                 "--disable-flac" \
+                 "-Dflac=true" \
+                 "-Dflac=false" \
                  "for FLAC support" &&
 
 optional_depends faad2 \
-                 "--enable-aac" \
-                 "--disable-aac" \
+                 "-Dfaad=true" \
+                 "-Dfaad=false" \
                  "for MP4/AAC audio support" &&
 
 optional_depends audiofile \
-                 "--enable-audiofile" \
-                 "--disable-audiofile" \
+                 "-Daudiofile=true" \
+                 "-Daudiofile=false" \
                  "for WAVE, AIFF and AU file support" &&
 
 if is_depends_enabled $SPELL audiofile; then
   config_query_option MPD_OPTS "Enable WAVE encoder support?" y \
-                               "--enable-wave-encoder" \
-                               "--disable-wave-encoder"
+                               "-Dwave_encoder=true" \
+                               "-Dwave_encoder=false"
 fi &&
 
 optional_depends libsndfile \
-                 "--enable-sndfile" \
-                 "--disable-sndfile" \
+                 "-Dsndfile=true" \
+                 "-Dsndfile=false" \
                  "for sndfile support" &&
 
 optional_depends alsa-lib \
-                 "--enable-alsa" \
-                 "--disable-alsa" \
+                 "-Dalsa=true" \
+                 "-Dalsa=false" \
                  "for alsa mixer support" &&
 
 optional_depends oss \
-                 "--enable-oss" \
-                 "--disable-oss" \
+                 "-Doss=true" \
+                 "-Doss=false" \
                  "for Open Sound System support" &&
 
 optional_depends JACK-DRIVER \
-                 "--enable-jack" \
-                 "--disable-jack" \
+                 "-Djack=true" \
+                 "-Djack=false" \
                  "for JACK output support" &&
 
 optional_depends pulseaudio \
-                 "--enable-pulse" \
-                 "--disable-pulse" \
+                 "-Dpulse=true" \
+                 "-Dpulse=false" \
                  "for pulseaudio output support" &&
 
 optional_depends libmad \
-                 "--enable-mad" \
-                 "--disable-mad" \
+                 "-Dmad=true" \
+                 "-Dmad=false" \
                  "for mp3 files support (libmad)" &&
 
 optional_depends mpg123 \
-                 "--enable-mpg123" \
-                 "--disable-mpg123" \
+                 "-Dmpg123=true" \
+                 "-Dmpg123=false" \
                  "for mp3 files support (libmpg123)" &&
 
+optional_depends libopus \
+                 "-Dopus=true" \
+                 "-Dopus=false" \
+                 "for opus decoder support" &&
+
 optional_depends libid3tag \
-                 "--enable-id3" \
-                 "--disable-id3" \
+                 "-Did3tag=true" \
+                 "-Did3tag=false" \
                  "to use id3 tags" &&
 
+optional_depends chromaprint \
+                 "-Dchromaprint=true" \
+                 "-Dchromaprint=false" \
+                 "for ChromaPrint/AcoustID support" &&
+
 optional_depends libmikmod \
-                 "--enable-mikmod" \
-                 "--disable-mikmod" \
+                 "-Dmikmod=true" \
+                 "-Dmikmod=false" \
                  "for mod file support (libmikmod)" &&
 
 optional_depends libmodplug \
-                 "--enable-modplug" \
-                 "--disable-modplug" \
+                 "-Dmodplug=true" \
+                 "-Dmodplug=false" \
                  "for mod file support (libmodplug)" &&
 
 optional_depends wildmidi \
-                 "--enable-wildmidi" \
-                 "--disable-wildmidi" \
+                 "-Dwildmidi=true" \
+                 "-Dwildmidi=false" \
                  "for MIDI support via wildmidi" &&
 
 optional_depends fluidsynth \
-                 "--enable-fluidsynth" \
-                 "--disable-fluidsynth" \
+                 "-Dfluidsynth=true" \
+                 "-Dfluidsynth=false" \
                  "for MIDI support via fluidsynth" &&
 
 optional_depends libsamplerate \
-                 "--enable-lsr" \
-                 "--disable-lsr" \
+                 "-Dlibsamplerate=true" \
+                 "-Dlibsamplerate=false" \
                  "for samplerate conversions" &&
 
 optional_depends libshout \
-                 "--enable-shout" \
-                 "--disable-shout" \
+                 "-Dshout=true" \
+                 "-Dshout=false" \
                  "for shoutcast streaming output support" &&
 
 optional_depends wavpack \
-                 "--enable-wavpack" \
-                 "--disable-wavpack" \
+                 "-Dwavpack=true" \
+                 "-Dwavpack=false" \
                  "for WavPack support" &&
 
 optional_depends lame \
-                 "--enable-lame-encoder" \
-                 "--disable-lame-encoder" \
+                 "-Dlame=true" \
+                 "-Dlame=false" \
                  "for LAME encoder support" &&
 
 optional_depends twolame \
-                 "--enable-twolame-encoder" \
-                 "--disable-twolame-encoder" \
+                 "-Dtwolame=true" \
+                 "-Dtwolame=false" \
                  "for TwoLAME mp2 encoder support" &&
 
 optional_depends curl \
-                 "--enable-curl" \
-                 "--disable-curl" \
+                 "-Dcurl=true" \
+                 "-Dcurl=false" \
                  "for obtaining song data via HTTP support" &&
 
 optional_depends sqlite \
-                 "--enable-sqlite" \
-                 "--disable-sqlite" \
+                 "-Dsqlite=true" \
+                 "-Dsqlite=false" \
                  "for SQLite database support" &&
 
 optional_depends LIBAVCODEC \
-                 "--enable-ffmpeg" \
-                 "--disable-ffmpeg" \
+                 "-Dffmpeg=true" \
+                 "-Dffmpeg=false" \
                  "for FFMPEG support" &&
 
 if is_depends_enabled $SPELL ffmpeg; then
@@ -188,48 +195,77 @@ if is_depends_enabled $SPELL ffmpeg; then
 fi &&
 
 optional_depends libmpdclient \
-                 "--enable-libmpdclient" \
-                 "--disable-libmpdclient" \
+                 "-Dlibmpdclient=true" \
+                 "-Dlibmpdclient=false" \
                  "for MPD client support" &&
 
 optional_depends OPENAL \
-                 "--enable-openal" \
-                 "--disable-openal" \
+                 "-Dopenal=true" \
+                 "-Dopenal=false" \
                  "for OpenAL support" &&
 
 optional_depends libmms \
-                 "--enable-mms" \
-                 "--disable-mms" \
+                 "-Dmms=true" \
+                 "-Dmms=false" \
                  "for MMS protocol support" &&
 
+optional_depends libnfs \
+                 "-Dnfs=true" \
+                 "-Dnfs=false" \
+                 "for NFS protocol support" &&
+
+optional_depends samba4 \
+                 "-Dsmbclient=true" \
+                 "-Dsmbclient=false" \
+                 "for SMB protocol support" &&
+
 optional_depends libcdio \
-                 "--enable-iso9660" \
-                 "--disable-iso9660" \
+                 "-Diso9660=true" \
+                 "-Diso9660=false" \
                  "for libiso9660 archive plugin" &&
 
 optional_depends libcdio-paranoia \
-                 "--enable-cdio-paranoia" \
-                 "--disable-cdio-paranoia" \
+                 "-Dcdio_paranoia=true" \
+                 "-Dcdio_paranoia=false" \
                  "for audio CD support" &&
 
 optional_depends avahi \
-                 "--with-zeroconf=avahi" \
-                 "--with-zeroconf=no" \
+                 "-Dzeroconf=avahi" \
+                 "-Dzeroconf=no" \
                  "for Zeroconf service discovery support" &&
 
+optional_depends SYSTEM-LOGGER \
+                 "-Dsyslog=true" \
+                 "-Dsyslog=false" \
+                 "for syslog support" &&
+
 optional_depends systemd \
-                 "--enable-systemd-daemon" \
-                 "--disable-systemd-daemon" \
+                 "-Dsystemd=true" \
+                 "-Dsystemd=false" \
                  "to use the systemd daemon library" &&
 
 optional_depends tcp_wrappers \
-                 "--enable-libwrap" \
-                 "--disable-libwrap" \
+                 "-Dlibwrap=true" \
+                 "-Dlibwrap=false" \
                  "to use libwrap" &&
 
+optional_depends udisks2 \
+                 "-Dudisks=true" \
+                 "-Dudisks=false" \
+                 "for removable media support" &&
+
+optional_depends expat \
+                 "-Dwebdav=true" \
+		 "-Dwebdav=false" \
+		 "for WebDAV support" &&
+
+if is_depends_enabled $SPELL expat; then
+  depends curl
+fi &&
+
 optional_depends xmlto \
-                 "--enable-documentation" \
-                 "--disable-documentation" \
+                 "-Ddocumentation=true" \
+                 "-Ddocumentation=false" \
                  "to build documentation" &&
 
 # Xmlto is not enough.
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 8902695e8c..82b3df6be9 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,5 +1,6 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=mpd
-         VERSION=0.20.21
+         VERSION=0.21
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.musicpd.org/download/${SPELL}/${VERSION:0:4}/${SOURCE}
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 7314ca8b7d..d1bdab3b68 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,7 @@
+2018-11-03 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.21
+	* CONFIGURE, DEPENDS, DETAILS, BUILD: switch to meson
+
 2018-08-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 0.20.21