release v0.21.3

output/alsa: don't call snd_pcm_drain() if nothing was written
Works around a problem where MPD goes into a busy loop because snd_pcm_drain() always returns `-EAGAIN` without making any progress (fixes #425). This problem was triggered by snd_pcm_drain() after snd_pcm_cancel() and snd_pcm_prepare(), but without submitting any data with snd_pcm_writei(). I believe this is a kernel bug: in non-blocking mode, the kernel's snd_pcm_drain() function returns early. In this mode, it only checks whether snd_pcm_drain_done() has been called already, but snd_pcm_drain_done() is never called if no data was submitted. In blocking mode, the following `for` loop detects this condition, so snd_pcm_drain_done() is not necessary, but without this extra check, we get `-EAGAIN` forever.
2018-11-16 13:27:58 +01:00 · 2018-11-16 12:49:37 +01:00 · 2018-11-15 19:01:43 +02:00 · 2018-11-15 12:34:23 +01:00 · 2018-11-14 13:35:17 +01:00 · 2018-11-14 13:20:54 +01:00
1598 changed files with 86294 additions and 57072 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,83 +1,8 @@
-*.Plo
-*.Po
-*.a
-*.d
-*.la
-*.lo
-*.o
-*.exe
-
 *~

 .#*
 .stgit*
-.deps
-.dirstamp

-tags
+/output/

-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.h
-/config.h.in
-/config.log
-/config.mk
-/config.status
-/config_detected.h
-/config_detected.mk
-/configure
-/configure.lineno
-/depmode
-/libtool
-/ltmain.sh
-/mkinstalldirs
-/build
-/src/mpd
-/systemd/mpd.service
-/stamp-h1
-
-/src/dsd2pcm/dsd2pcm
-/src/win32/mpd_win32_rc.rc
-
-/doc/doxygen.conf
-/doc/protocol.html
-/doc/protocol
-/doc/user
-/doc/developer
-/doc/sticker
-/doc/api
-
-/test/software_volume
-/test/run_convert
-/test/run_decoder
-/test/read_tags
-/test/run_filter
-/test/run_encoder
-/test/run_output
-/test/read_conf
-/test/run_input
-/test/read_mixer
-/test/dump_playlist
-/test/run_normalize
-/test/tmp
-/test/run_inotify
-/test/test_queue_priority
-/test/test_protocol
-/test/run_ntp_server
-/test/run_resolver
-/test/run_tcp_connect
-/test/test_pcm
-/test/dump_rva2
-/test/dump_text_file
-/test/test_util
-/test/test_byte_reverse
-/test/test_mixramp
-/test/test_vorbis_encoder
-/test/DumpDatabase
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/mpd-*/
+__pycache__/
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,82 @@
+language: cpp
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:saiarcot895/chromium-dev' # for ninja-build
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-6
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC=gcc-6 CXX=g++-6 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - sourceline: 'ppa:saiarcot895/chromium-dev' # for ninja-build
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - g++-8
+            - libgtest-dev
+            - boost1.67
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
+        - MATRIX_EVAL="export CC=gcc-8 CXX=g++-8 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+
+    - os: osx
+      osx_image: xcode9.3beta
+      env:
+        - MATRIX_EVAL=""
+
+cache:
+  - apt
+  - ccache
+
+before_install:
+  - eval "${MATRIX_EVAL}"
+  # C++14
+  - test "$TRAVIS_OS_NAME" != "osx" || brew update
+
+install:
+  # C++14
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install ccache meson
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+
+before_script:
+  - ccache -s
+
+script:
+  - eval "${MATRIX_EVAL}"
+  - OPTIONS="-Dtest=true"
+  - meson . output --werror $OPTIONS
+  - ninja -C output -v test
+  - ccache -s
--- a/22
+++ b/22
@@ -1,11 +1,11 @@
 Music Player Daemon - http://www.musicpd.org
-Copyright (C) 2003-2014 The Music Player Daemon Project
+Copyright 2003-2018 The Music Player Daemon Project

 The following people have contributed code to MPD:

 Warren Dukes <warren.dukes@gmail.com>
 Avuton Olrich <avuton@gmail.com>
- Max Kellermann <max@duempel.org>
+ Max Kellermann <max.kellermann@gmail.com>
 Laszlo Ashin <kodest@gmail.com>
 Viliam Mateicka <viliam.mateicka@gmail.com>
 Eric Wollesen <encoded@xmtp.net>
@@ -29,3 +29,21 @@ The following people have contributed code to MPD:
 Denis Krjuchkov <denis@crazydev.net>
 Jurgen Kramer <gtmkramer@xs4all.nl>
 Jean-Francois Dockes <jf@dockes.org>
+ Yue Wang <yuleopen@gmail.com>
+ Matthew Leon Grinshpun <ml@matthewleon.com>
+ Dimitris Papastamos <sin@2f30.org>
+ Florian Schlichting <fsfs@debian.org>
+ François Revol <revol@free.fr>
+ Jacob Vosmaer <contact@jacobvosmaer.nl>
+ Thomas Guillem <thomas@gllm.fr>
+ Andrew Basterfield <abasterfield@gmail.com>
+ Bart Nagel <bart@tremby.net>
+ Christian Kröner <ckroener@gmx.net>
+ Christopher Zimmermann <madroach@gmerlin.de>
+ John Regan <john@jrjrtech.com>
+ Joshua Wise <joshua@joshuawise.com>
+ Ryan Walklin
+ Stefan Roellin <stefan@roellin-baumann.ch>
+ Stefano Miccoli <stefano.miccoli@polimi.it>
+ Steven O'Brien <steven_obrien1@yahoo.co.uk>
+ Thomas Zander <thomas.e.zander@googlemail.com>
--- a/215
+++ b/215
@@ -1,215 +0,0 @@
-                       Music Player Daemon (MPD) - INSTALL
-
-
-Introduction
------------
-
-This document is a very small amount of documentation about what is needed to 
-install MPD.  If more information is desired, read the user manual:
-
- http://www.musicpd.org/doc/user/
-
-Dependencies
------------
-
-gcc 4.6 or later - http://gcc.gnu.org/
-clang 3.2 or later - http://clang.llvm.org/
-Any other C++11 compliant compiler should also work.
-
-Boost 1.46 - http://www.boost.org/
-
-GLib 2.28 - http://www.gtk.org/
-General-purpose utility library.
-
-
-Optional Output Dependencies
----------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-AO - http://www.xiph.org/ao/
-A portable library that abstracts many audio output types as one API.  Should
-be used only if there is no native plugin available or if the native plugin
-doesn't work.  You will need libao.
-
-ALSA - http://www.alsa-project.org/
-The Advanced Linux Sound Architecture.  Recommended audio output if you use
-Linux.  You will need libasound.
-
-FIFO
-This is a mostly undocumented, developer plugin to transmit raw data.
-
-OSS - http://www.opensound.com
-Open Sound System.
-
-PulseAudio - http://www.pulseaudio.org/
-An advanced sound daemon.  You will need libpulse.
-
-JACK - http://www.jackaudio.org/
-A low-latency sound daemon.
-
-libshout - http://www.icecast.org/
-For streaming to an Icecast or Shoutcast server.
-You also need an encoder: either libvorbisenc (ogg), or liblame (mp3).
-
-OpenAL - http://kcat.strangesoft.net/openal.html
-Open Audio Library
-
-
-Optional Input Dependencies
---------------------------
-
-You will need at least one of these to compile MPD.
-
-Most of these are available as packages on major distributions.  Be sure to
-install both the library package as well as the development package.
-
-MAD - http://www.underbit.com/products/mad/
-For MP3 support.  You will need libmad, and optionally libid3tag if you want
-ID3 tag support.
-
-libmpg123 - http://www.mpg123.de/
-Alternative for MP3 support.
-
-Ogg Vorbis - http://www.xiph.org/ogg/vorbis/
-For Ogg Vorbis support.  You will need libogg and libvorbis.
-
-libopus - http://www.opus-codec.org/
-Opus codec support
-
-FLAC - http://flac.sourceforge.net/
-For FLAC support.  You will need version 1.2 or higher of libFLAC.
-
-Audio File - http://www.68k.org/~michael/audiofile/
-For WAVE, AIFF, and AU support.  You will need libaudiofile.
-
-FAAD2 - http://www.audiocoding.com/
-For MP4/AAC support.
-
-libmpcdec - http://www.musepack.net/
-For Musepack support.
-
-MikMod - http://mikmod.raphnet.net/
-For MOD support.  You will need libmikmod.
-
-libavcodec, libavformat (ffmpeg or libav) - http://ffmpeg.mplayerhq.hu/ http://libav.org/
-Multi-codec library.
-
-libsidplay2 - http://sidplay2.sourceforge.net/
-For C64 SID support.
-
-libfluidsynth - http://fluidsynth.resonance.org/
-For MIDI support.
-
-libwildmidi 0.2.3 - http://wildmidi.sourceforge.net/
-For MIDI support.
-
-libsndfile - http://www.mega-nerd.com/libsndfile/
-WAVE, AIFF, and many others.
-
-libwavpack - http://www.wavpack.com/
-For WavPack playback.
-
-libadplug - http://adplug.sourceforge.net/
-For AdLib playback.
-
-despotify - https://github.com/SimonKagstrom/despotify
-For Spotify playback.
-
-MP4v2 - https://code.google.com/p/mp4v2/
-For MP4 playback. You will need FAAD2.
-
-
-Optional Miscellaneous Dependencies
-----------------------------------
-
-Avahi - http://www.avahi.org/
-For Zeroconf support.
-
-libsamplerate - http://www.mega-nerd.com/SRC/
-For advanced samplerate conversions.
-
-libcurl - http://curl.haxx.se/
-For playing HTTP streams.
-
-libmms - https://launchpad.net/libmms
-For playing MMS streams.
-
-SQLite - http://www.sqlite.org/
-For the sticker database.
-
-libcdio - http://www.gnu.org/software/libcdio/
-For playing audio CDs.
-
-libsystemd-daemon - http://freedesktop.org/wiki/Software/systemd/
-For systemd activation.
-
-
-pkg-config
----------
-
-MPD uses pkg-config to locate most external libraries.  If you do not
-have pkg-config, or if your version of the library does not ship the
-".pc" file, you have to provide the library's build options in
-environment variables.  These variables are documented in "./configure
--help".  Example:
-
- FLAC_CFLAGS=-I/usr/include/FLAC FLAC_LIBS=-lFLAC ./configure
-
-
-Download
--------
-
-Get the latest release from of MPD from <http://www.musicpd.org/>.
-
-Compile
-------
-
-1) unpack the archive
-
-$ tar xf mpd-x.x.x.tar.xz
-
-2) change to directory created
-
-$ cd mpd-x.x.x
-
-3) Run configure script (this will determine what dependencies you have)
-
-$ ./configure
-
-4) Compile
-
-$ make
-
-Install (Optional)
-------
-
-(as root)
-$ make install
-
-Run
---
-
-1) run mpd:
-
-$ mpd <config file>
-
-First default is $XDG_CONFIG_HOME/mpd/mpd.conf then ~/.mpdconf then
-~/.mpd/mpd.conf then /etc/mpd.conf. If neither of these exist a mpd
-configuration file must be specified at runtime.
-
-A sample config file is included with the source of MPD, mpdconf.example.
-
-The first time MPD is run it will attempt to discover all music in your
-music root, recursively. This can be affected by the symbolic link 
-options specified in the example mpd.conf.
-
-Using MPD
---------
-
-You can download many different interfaces for MPD at 
-
- http://www.musicpd.org/clients/
--- a/Makefile.am
+++ b/Makefile.am
--- a/634
+++ b/634
@@ -1,3 +1,608 @@
+ver 0.21.3 (2018/11/16)
+* output
+  - alsa: fix crash bug
+  - alsa: fix stuttering at start of playback
+  - alsa: fix discarded samples at end of song
+  - alsa: clear error after reopening device
+* log: default to journal if MPD was started as systemd service
+
+ver 0.21.2 (2018/11/12)
+* protocol
+  - operator "=~" matches a regular expression
+  - operator "contains" matches substrings
+* decoder
+  - ffmpeg: require FFmpeg 3.1 or later
+  - ffmpeg: fix broken sound with certain codecs
+* output
+  - alsa: fix high CPU usage with dmix
+  - httpd: fix three crash bugs
+* mixer
+  - alsa: fix more rounding errors
+* fix zlib support
+
+ver 0.21.1 (2018/11/04)
+* protocol
+  - allow escaping quotes in filter expressions
+  - operator "==" never searches substrings in filter expressions
+* decoder
+  - ffmpeg: fix build failure with non-standard FFmpeg installation path
+  - flac: fix linker failure when building without FLAC support
+* encoder
+  - vorbis: fix linker failure when building without Vorbis decoder
+* fix build failure on Linux-PowerPC
+* fix build failure on FreeBSD
+* eliminate DLL dependencies on Windows
+* add warning about buggy Boost version 1.67
+* require Meson 0.47.2 because a Meson 0.47.1 bug breaks our build
+
+ver 0.21 (2018/10/31)
+* configuration
+  - add "include" directive, allows including config files
+  - incremental "metadata_to_use" setting
+* protocol
+  - "tagtypes" can be used to hide tags
+  - "find" and "search" can sort
+  - "outputs" prints the plugin name
+  - "outputset" sets runtime attributes
+  - close connection when client sends HTTP request
+  - new filter syntax for "find"/"search" etc. with negation
+* database
+  - simple: scan audio formats
+  - proxy: require libmpdclient 2.9
+  - proxy: forward `sort` and `window` to server
+* player
+  - hard-code "buffer_before_play" to 1 second, independent of audio format
+  - "one-shot" single mode
+* input
+  - curl: download to buffer instead of throttling transfer
+  - qobuz: new plugin to play Qobuz streams
+  - tidal: new plugin to play Tidal streams
+* tags
+  - new tags "OriginalDate", "MUSICBRAINZ_WORKID"
+* decoder
+  - ffmpeg: require at least version 11.12
+  - gme: try loading m3u sidecar files
+  - hybrid_dsd: new decoder plugin
+  - mad: move "gapless_mp3_playback" setting to "decoder" block
+  - mikmod: require at least version 3.2
+  - pcm: support audio/L24 (RFC 3190)
+  - sidplay: support basic and kernal rom (libsidplayfp)
+* resampler
+  - soxr: flush resampler at end of song
+* output
+  - alsa: non-blocking mode
+  - alsa: change "dop" and "allowed_formats" settings at runtime
+  - ao: fix crash bug due to partial frames
+  - shout: support the Shine encoder plugin
+  - sndio: remove support for the broken RoarAudio sndio emulation
+  - osx: initial support for DSD over PCM
+  - roar: removed
+  - httpd_output: support for unix sockets
+* mixer
+  - sndio: new mixer plugin
+* encoder
+  - opus: support for sending metadata using ogg stream chaining
+* listen on $XDG_RUNTIME_DIR/mpd/socket by default
+* append hostname to Zeroconf service name
+* systemd watchdog support
+* require GCC 6
+* build with Meson instead of autotools
+* use GTest instead of cppunit
+
+ver 0.20.23 (2018/10/29)
+* protocol
+  - emit "player" idle event when restarting the current song
+* fix broken float to s32 conversion
+* new clang crash bug workaround
+
+ver 0.20.22 (2018/10/23)
+* protocol
+  - add tag fallbacks for AlbumArtistSort, ArtistSort
+  - fix empty string filter on fallback tags
+  - "count group ..." can print an empty group
+  - fix broken command "list ... group"
+* storage
+  - curl: URL-encode paths
+* decoder
+  - fluidsynth: adapt to API change in version 2.0
+* Android
+  - now runs as a service
+  - add button to start/stop MPD
+  - add option to auto-start on boot
+* work around clang bug leading to crash
+* install the SVG icon
+
+ver 0.20.21 (2018/08/17)
+* database
+  - proxy: add "password" setting
+  - proxy: support tags "ArtistSort", "AlbumArtistSort", "AlbumSort"
+  - simple: allow .mpdignore comments only at start of line
+* output
+  - httpd: remove broken DLNA support code
+* playlist
+  - cue: support file type declaration "FLAC" (non-standard)
+* URI schemes are case insensitive
+* Android, Windows
+  - enable the "curl" storage plugin
+
+ver 0.20.20 (2018/05/22)
+* protocol
+  - fix "modified-since" filter regression
+* output
+  - pulse: cork stream when paused due to "single" mode
+* decoder
+  - dsdiff, dsf: support more MIME types
+  - dsdiff, dsf: allow 4 MB ID3 tags
+  - opus: support R128_ALBUM_GAIN tag
+* Android, Windows
+  - enable the "proxy" database plugin
+
+ver 0.20.19 (2018/04/26)
+* protocol
+  - validate absolute seek time, reject negative values
+* database
+  - proxy: fix "search already in progress" errors
+  - proxy: implement "list ... group"
+* input
+  - mms: fix lockup bug and a crash bug
+* decoder
+  - ffmpeg: fix av_register_all() deprecation warning (FFmpeg 4.0)
+* player
+  - fix spurious "Not seekable" error when switching radio streams
+* macOS: fix crash bug
+
+ver 0.20.18 (2018/02/24)
+* input
+  - curl: allow authentication methods other than "Basic"
+* decoder
+  - flac: improve seeking precision
+* fix gapless CUE song transitions
+* Android, Windows
+  - enable the NFS storage plugin
+
+ver 0.20.17 (2018/02/11)
+* output
+  - alsa: fix crash bug with 8 channels
+* mixer
+  - alsa: fix rounding error at volume 0
+* fix real-time and idle scheduling with Musl
+* Android
+  - fix compatibility with Android 4.0
+
+ver 0.20.16 (2018/02/03)
+* output
+  - pulse: fix crash during auto-detection
+* database
+  - simple: fix search within mount points
+  - upnp: enable IPv6
+* archive
+  - iso9660: libcdio 2.0 compatibility
+* fix crash in debug build on Haiku and other operating systems
+
+ver 0.20.15 (2018/01/05)
+* queue: fix crash after seek failure
+* resampler
+  - soxr: clear internal state after manual song change
+* state file
+  - make mount point restore errors non-fatal
+  - fix crash when restoring mounts with incompatible database plugin
+* Android
+  - build without Ant
+  - fix for SIGSYS crash
+
+ver 0.20.14 (2018/01/01)
+* database
+  - simple: fix file corruption in the presence of mount points
+* archive
+  - bz2: fix deadlock
+  - reduce lock contention, fixing lots of xrun problems
+* fix Solaris build failure
+
+ver 0.20.13 (2017/12/18)
+* output
+  - osx: set up ring buffer to hold at least 100ms
+* mixer
+  - alsa: fix rounding errors
+* database
+  - simple: don't purge mount points on update/rescan
+  - simple: fix "mount" bug caused by bad compiler optimization
+  - simple: fix "lsinfo" into mount points
+  - upnp: work around libupnp 1.6.24 API breakage
+* queue: fix spuriously misplaced prioritized songs
+* save and restore mountpoints within the state file
+* include Windows cross-build script in source tarball
+* fix Windows build failures
+
+ver 0.20.12 (2017/11/25)
+* database
+  - upnp: adapt to libupnp 1.8 API changes
+* input
+  - cdio_paranoia, ffmpeg, file, smbclient: reduce lock contention,
+    fixing lots of xrun problems
+  - curl: fix seeking
+* decoder
+  - ffmpeg: fix GCC 8 warning
+  - vorbis: fix Tremor support
+* player
+  - log message when decoder is too slow
+* encoder
+  - vorbis: default to quality 3
+* output
+  - fix hanging playback with soxr resampler
+  - httpd: flush encoder after tag; fixes corrupt Vorbis stream
+
+ver 0.20.11 (2017/10/18)
+* storage
+  - curl: support Content-Type application/xml
+* decoder
+  - ffmpeg: more reliable song duration
+  - gme: fix track numbering
+* improve random song order when switching songs manually
+* fix case insensitive search without libicu
+* fix Unicode file names in playlists on Windows
+* fix endless loop when accessing malformed file names in ZIP files
+
+ver 0.20.10 (2017/08/24)
+* decoder
+  - ffmpeg: support MusicBrainz ID3v2 tags
+* tags
+  - aiff: fix FORM chunk size endianess (is big-endian)
+* mixer
+  - osx: add a mixer for OSX.
+* fix crash when resuming playback before decoder is ready
+* fix crash on Windows
+
+ver 0.20.9 (2017/06/04)
+* decoder
+  - ffmpeg: support *.adx
+* fix byte order detection on FreeBSD/aarch64
+* fix more random crashes when compiled with clang
+
+ver 0.20.8 (2017/05/19)
+* output
+  - osx: fix build failure due to missing "noexcept"
+* playlist
+  - m3u: support MIME type `audio/mpegurl`
+* fix build failure with GCC 4.x
+
+ver 0.20.7 (2017/05/15)
+* database
+  - simple: fix false positive directory loop detection with NFS
+* enforce a reasonable minimum audio_buffer_size setting
+* cap buffer_before_play at 80% to prevent deadlock
+* fix random crashes when compiled with clang
+
+ver 0.20.6 (2017/03/10)
+* input
+  - curl: fix headers after HTTP redirect to Shoutcast server
+* decoder
+  - ffmpeg: re-enable as fallback
+  - mpcdec: fix crash (division by zero) after seeking
+  - sidplay: make compatible with libsidplayfp < 1.8
+* fix stream tags after automatic song change
+* workaround for GCC 4.9.4 / libstdc++ bug (build failure)
+
+ver 0.20.5 (2017/02/20)
+* tags
+  - id3: fix memory leak on corrupt ID3 tags
+* decoder
+  - sidplay: don't require libsidutils when building with libsidplayfp
+* output
+  - httpd: fix two buffer overflows in IcyMetaData length calculation
+* mixer
+  - alsa: fix crash bug
+
+ver 0.20.4 (2017/02/01)
+* input
+  - nfs: fix freeze after reconnect
+* output
+  - sndio: work around a libroar C++ incompatibility
+* workaround for GCC 4.9 "constexpr" bug
+* fix FreeBSD build failure
+
+ver 0.20.3 (2017/01/25)
+* protocol
+  - "playlistadd" creates new playlist if it does not exist, as documented
+* database
+  - proxy: fix error "terminate called after throwing ..."
+  - proxy: make connect errors during startup non-fatal
+* neighbor
+  - upnp: fix premature expiry
+* replay gain: don't reset ReplayGain levels when unpausing playback
+* silence surround channels when converting from stereo
+* use shortcuts such as "dsd64" in log messages
+
+ver 0.20.2 (2017/01/15)
+* input
+  - alsa: fix crash bug
+  - alsa: fix buffer overruns
+* decoder
+  - flac: add options "probesize" and "analyzeduration"
+* resampler
+  - libsamplerate: reset state after seeking
+* output
+  - fix static noise after changing to a different audio format
+  - alsa: fix the DSD_U32 sample rate
+  - alsa: fix the DSD_U32 byte order
+  - alsa: support DSD_U16
+  - recorder: fix error "Failed to create : No such file or directory"
+* playlist
+  - cue: fix skipping songs
+
+ver 0.20.1 (2017/01/09)
+* input
+  - curl: fix crash bug
+  - curl: fix freeze bug
+* decoder
+  - wavpack: fix crash bug
+* storage
+  - curl: new storage plugin for WebDAV (work in progress)
+* mixer
+  - alsa: normalize displayed volume according to human perception
+* fix crash with volume_normalization enabled
+
+ver 0.20 (2017/01/04)
+* protocol
+  - "commands" returns playlist commands only if playlist_directory configured
+  - "search"/"find" have a "window" parameter
+  - report song duration with milliseconds precision
+  - "sticker find" can match sticker values
+  - drop the "file:///" prefix for absolute file paths
+  - add range parameter to command "plchanges" and "plchangesposid"
+  - send verbose error message to client
+* input
+  - curl: fix memory leak
+* tags
+  - ape, ogg: drop support for non-standard tag "album artist"
+    affected filetypes: vorbis, flac, opus & all files with ape2 tags
+    (most importantly some mp3s)
+  - id3: remove the "id3v1_encoding" setting; by definition, all ID3v1 tags
+    are ISO-Latin-1
+  - ape: support APE replay gain on remote files
+  - read ID3 tags from NFS/SMB
+* decoder
+  - improved error logging
+  - report I/O errors to clients
+  - ffmpeg: support ReplayGain and MixRamp
+  - ffmpeg: support stream tags
+  - gme: add option "accuracy"
+  - gme: provide the TRACK tag
+  - gme: faster scanning
+  - mad: reduce memory usage while scanning tags
+  - mpcdec: read the bit rate
+  - pcm: support audio/L16 (RFC 2586) and audio/x-mpd-float
+  - sidplay: faster scanning
+  - wavpack: large file support
+  - wavpack: support DSD (WavPack 5)
+  - wavpack: archive support
+* playlist
+  - cue: don't skip pregap
+  - embcue: fix last track
+  - flac: new plugin which reads the "CUESHEET" metadata block
+* output
+  - alsa: fix multi-channel order
+  - alsa: remove option "use_mmap"
+  - alsa: support DSD_U32
+  - alsa: disable DoP if it fails
+  - jack: reduce CPU usage
+  - pulse: set channel map to WAVE-EX
+  - recorder: record tags
+  - recorder: allow dynamic file names
+  - sndio: new output plugin
+* mixer
+  - null: new plugin
+* resampler
+  - new block "resampler" in configuration file
+    replacing the old "samplerate_converter" setting
+  - soxr: allow multi-threaded resampling
+* player
+  - reset song priority on playback
+  - reduce xruns
+* write database and state file atomically
+* always write UTF-8 to the log file.
+* remove dependency on GLib
+* support libsystemd (instead of the older libsystemd-daemon)
+* database
+  - proxy: add TCP keepalive option
+* update
+  - apply .mpdignore matches to subdirectories
+* switch the code base to C++14
+  - GCC 4.9 or clang 3.4 (or newer) recommended
+
+ver 0.19.21 (2016/12/13)
+* decoder
+  - ffmpeg: fix crash bug
+* fix unit test failure after recent "setprio" change
+* systemd: add user unit
+
+ver 0.19.20 (2016/12/09)
+* protocol
+  - "setprio" re-enqueues old song if priority has been raised
+* decoder
+  - ffmpeg: ignore empty packets
+  - pcm: fix corruption bug with partial frames (after short read)
+  - sidplay: fix playback speed with libsidplayfp
+* output
+  - winmm: fix 8 bit playback
+* fix gcc 7.0 -Wimplicit-fallthrough
+* systemd: paranoid security settings
+
+ver 0.19.19 (2016/08/23)
+* decoder
+  - ffmpeg: bug fix for FFmpeg 3.1 support
+  - wildmidi: support libWildMidi 0.4
+* output
+  - pulse: support 32 bit, 24 bit and floating point playback
+* support non-x86 NetBSD
+* fix clang 3.9 warnings
+
+ver 0.19.18 (2016/08/05)
+* decoder
+  - ffmpeg: fix crash with older FFmpeg versions (< 3.0)
+  - ffmpeg: log detailed error message
+  - ffmpeg: support FFmpeg 3.1
+  - sidplay: detect libsidplay2 with pkg-config
+  - sidplay: log detailed error message
+  - sidplay: read the "date" tag
+  - sidplay: allow building with libsidplayfp instead of libsidplay2
+* output
+  - shout: recognize setting "encoder" instead of "encoding"
+* fix memory leak after stream failure
+* fix build failure with Boost 1.61
+* require gcc 4.7 or newer
+
+ver 0.19.17 (2016/07/09)
+* decoder
+  - flac: fix assertion failure while seeking
+  - flac: fix stream duration indicator
+  - fix seek problems in several plugins
+* fix spurious seek error "Failed to allocate silence buffer"
+* replay gain: fix "replay_gain_handler mixer" setting
+* DSD: use 0x69 as silence pattern
+* fix use-after-free bug on "close" and "kill"
+
+ver 0.19.16 (2016/06/13)
+* faster seeking
+* fix system include path order
+* add missing DocBook file to tarball
+
+ver 0.19.15 (2016/04/30)
+* decoder
+  - ffmpeg: support FFmpeg 3.0
+  - ffmpeg: use as fallback instead of "mad" if no plugin matches
+  - opus: support bigger OpusTags packets
+* fix more build failures on non-glibc builds due to constexpr Mutex
+* fix build failure due to missing include
+* fix unit test on Alpha
+
+ver 0.19.14 (2016/03/18)
+* decoder
+  - dsdiff: fix off-by-one buffer overflow
+  - opus: limit tag size to 64 kB
+* archive
+  - iso9660: fix buffer overflow
+* fix quadratic runtime bug in the tag pool
+* fix build failures on non-glibc builds due to constexpr Mutex
+
+ver 0.19.13 (2016/02/23)
+* tags
+  - aiff, riff: fix ID3 chunk padding
+* decoder
+  - ffmpeg: support the TAK codec
+* fix disappearing duration of remote songs during playback
+* initialize supplementary groups with glibc 2.19+
+
+ver 0.19.12 (2015/12/15)
+* fix assertion failure on malformed UTF-8 tag
+* fix build failure on non-Linux systems
+* fix LimitRTTIME in systemd unit file
+
+ver 0.19.11 (2015/10/27)
+* tags
+  - ape: fix buffer overflow
+* decoder
+  - ffmpeg: fix crash due to wrong avio_alloc_context() call
+  - gme: don't loop forever, fall back to GME's default play length
+* encoder
+  - flac: fix crash with 32 bit playback
+* mixer
+  - fix mixer lag after enabling/disabling output
+
+ver 0.19.10 (2015/06/21)
+* input
+  - curl: fix deadlock on small responses
+  - smbclient: fix DFF playback
+* decoder
+  - ffmpeg: improve seeking accuracy
+  - fix stuck stream tags
+* encoder
+  - opus: fix bogus granulepos
+* output
+  - fix failure to open device right after booting
+* neighbor
+  - nfs: fix deadlock when connecting
+* fix "single" mode breakage due to queue edits
+
+ver 0.19.9 (2015/02/06)
+* decoder
+  - dsdiff, dsf: raise ID3 tag limit to 1 MB
+* playlist: fix loading duplicate tag types from state file
+* despotify: remove defunct plugin
+* fix clock integer overflow on OS X
+* fix gcc 5.0 warnings
+* fix build failure with uClibc
+* fix build failure on non-POSIX operating systems
+* fix dependency issue on parallel Android build
+* fix database/state file saving on Windows
+
+ver 0.19.8 (2015/01/14)
+* input
+  - curl: fix bug after rewinding from end-of-file
+  - mms: reduce delay at the beginning of playback
+* decoder
+  - dsdiff, dsf: allow ID3 tags larger than 4 kB
+  - ffmpeg: support interleaved floating point
+* fix clang 3.6 warnings
+* fix build failure on NetBSD
+
+ver 0.19.7 (2014/12/17)
+* input
+  - nfs: fix crash while canceling a failing file open operation
+  - nfs: fix memory leak on connection failure
+  - nfs: fix reconnect after mount failure
+  - nfs: implement mount timeout (60 seconds)
+* storage
+  - nfs: implement I/O timeout (60 seconds)
+* playlist
+  - embcue: fix filename suffix detection
+  - don't skip non-existent songs in "listplaylist"
+* decoder
+  - ffmpeg: fix time stamp underflow
+* fix memory allocator bug on Windows
+
+ver 0.19.6 (2014/12/08)
+* decoder
+  - ffmpeg: support FFmpeg 2.5
+* fix build failure with musl
+* android
+  - update libFLAC to 1.3.1
+  - update FFmpeg to 2.5
+
+ver 0.19.5 (2014/11/26)
+* input
+  - nfs: fix crash on connection failure
+* archive
+  - zzip: fix crash after seeking
+* decoder
+  - dsdiff, dsf, opus: fix deadlock while seeking
+  - mp4v2: remove because of incompatible license
+
+ver 0.19.4 (2014/11/18)
+* protocol
+  - workaround for buggy clients that send "add /"
+* decoder
+  - ffmpeg: support opus
+  - opus: add MIME types audio/ogg and application/ogg
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
+ver 0.19.3 (2014/11/11)
+* protocol
+  - fix "(null)" result string to "list" when AlbumArtist is disabled
+* database
+  - upnp: fix breakage due to malformed URIs
+* input
+  - curl: another fix for redirected streams
+* decoder
+  - audiofile: fix crash while playing streams
+  - audiofile: fix bit rate calculation
+  - ffmpeg: support opus
+  - opus: fix bogus duration on streams
+  - opus: support chained streams
+  - opus: improved error logging
+* fix distorted audio with soxr resampler
+* fix build failure on Mac OS X with non-Apple compilers
+
 ver 0.19.2 (2014/11/02)
 * input
  - curl: fix redirected streams
@@ -103,6 +708,35 @@ ver 0.19 (2014/10/10)
 * install systemd unit for socket activation
 * Android port

+ver 0.18.23 (2015/02/06)
+* despotify: remove defunct plugin
+* fix clock integer overflow on OS X
+* fix gcc 5.0 warnings
+
+ver 0.18.22 (2015/01/14)
+* fix clang 3.6 warnings
+
+ver 0.18.21 (2014/12/17)
+* playlist
+  - embcue: fix filename suffix detection
+* decoder
+  - ffmpeg: fix time stamp underflow
+
+ver 0.18.20 (2014/12/08)
+* decoder
+  - ffmpeg: support FFmpeg 2.5
+* fix build failure with musl
+
+ver 0.18.19 (2014/11/26)
+* archive
+  - zzip: fix crash after seeking
+
+ver 0.18.18 (2014/11/18)
+* decoder
+  - ffmpeg: support opus
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
 ver 0.18.17 (2014/11/02)
 * playlist
  - don't allow empty playlist name
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-
-		       Music Player Daemon (MPD)
-			http://www.musicpd.org
-
-A daemon for playing music of various formats.  Music is played through the 
-server's audio device.  The daemon stores info about all available music, 
-and this info can be easily searched and retrieved.  Player control, info
-retrieval, and playlist management can all be managed remotely.
-
-For basic installation information see the INSTALL file.
-
-MPD is released under the GNU General Public License version 2, which is
-distributed in the COPYING file.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.
-
--- a/README.md
+++ b/README.md
@@ -0,0 +1,29 @@
+# Music Player Daemon
+
+http://www.musicpd.org
+
+A daemon for playing music of various formats.  Music is played through the 
+server's audio device.  The daemon stores info about all available music, 
+and this info can be easily searched and retrieved.  Player control, info
+retrieval, and playlist management can all be managed remotely.
+
+For basic installation instructions
+[read the manual](https://www.musicpd.org/doc/user/install.html).
+
+# Users
+
+- [Manual](http://www.musicpd.org/doc/user/)
+- [Forum](http://forum.musicpd.org/)
+- [IRC](irc://chat.freenode.net/#mpd)
+- [Bug tracker](https://github.com/MusicPlayerDaemon/MPD/issues/)
+
+# Developers
+
+- [Protocol specification](http://www.musicpd.org/doc/protocol/)
+- [Developer manual](http://www.musicpd.org/doc/developer/)
+
+# Legal
+
+MPD is released under the
+[GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.txt),
+which is distributed in the COPYING file.
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1 +0,0 @@
-/build
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,23 +2,32 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="org.musicpd"
          android:installLocation="auto"
-          android:versionCode="7"
-          android:versionName="0.19.1">
+          android:versionCode="25"
+          android:versionName="0.21.3">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>

-  <application android:icon="@drawable/icon" android:label="@string/app_name">
-    <activity android:name=".Main"
-              android:label="@string/app_name"
-              android:launchMode="singleInstance">
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+  <application android:allowBackup="true"
+               android:icon="@drawable/icon"
+               android:label="@string/app_name">
+    <activity android:name=".Settings"
+              android:label="@string/app_name">
      <intent-filter>
        <action android:name="android.intent.action.MAIN" />
        <category android:name="android.intent.category.LAUNCHER" />
      </intent-filter>
    </activity>
+    <receiver android:name=".Receiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+      </intent-filter>
+    </receiver>
+    <service android:name=".Main" android:process=":main"/>
  </application>

-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
--- a/android/apk/make-unsigned-apk.sh
+++ b/android/apk/make-unsigned-apk.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+ANDROID_ABI=$1
+STRIP=$2
+ZIP=$3
+UNSIGNED_APK=$4
+LIBMPD_SO=$5
+CLASSES_DEX=$6
+RESOURCES_APK=$7
+D=`dirname "$UNSIGNED_APK"`
+
+rm -rf "$D/apk"
+mkdir -p "$D/apk/lib/$ANDROID_ABI"
+
+"$STRIP" "$LIBMPD_SO" -o "$D/apk/lib/$ANDROID_ABI/`basename $LIBMPD_SO`"
+cp "$CLASSES_DEX" "$D/apk/"
+cp "$RESOURCES_APK" "$UNSIGNED_APK"
+
+cd "$D/apk"
+exec zip -q -r -X "../`basename $UNSIGNED_APK`" .
--- a/android/apk/meson.build
+++ b/android/apk/meson.build
@@ -0,0 +1,59 @@
+unsigned_apk = custom_target(
+  'mpd-unsigned.apk',
+  output: 'mpd-unsigned.apk',
+  input: [mpd, classes_dex, resources_apk[0]],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-unsigned-apk.sh'),
+    android_abi,
+    get_option('android_strip'),
+    zip,
+    '@OUTPUT0@',
+    '@INPUT@',
+  ],
+)
+
+if get_option('android_debug_keystore') != ''
+  debug_apk = custom_target(
+    'mpd-debug.apk',
+    output: 'mpd-debug.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-keystore', get_option('android_debug_keystore'),
+      '-storepass', 'android',
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      'androiddebugkey',
+    ],
+    build_by_default: true
+  )
+endif
+
+if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != ''
+  unaligned_apk = custom_target(
+    'mpd-unaligned.apk',
+    output: 'mpd-unaligned.apk',
+    input: unsigned_apk,
+    command: [
+      jarsigner,
+      '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
+      '-keystore', get_option('android_keystore'),
+      '-storepass', get_option('android_keypass'),
+      '-signedjar', '@OUTPUT@',
+      '@INPUT@',
+      get_option('android_keyalias'),
+    ],
+  )
+
+  apk = custom_target(
+    'mpd.apk',
+    output: 'mpd.apk',
+    input: unaligned_apk,
+    command: [
+      android_zipalign,
+      '-f', '4',
+      '@INPUT@', '@OUTPUT@',
+    ],
+    build_by_default: true
+  )
+endif
--- a/android/build.py
+++ b/android/build.py
@@ -1,18 +1,16 @@
 #!/usr/bin/env python3

 import os, os.path
-import sys, shutil, subprocess
-import urllib.request
-import hashlib
-import re
+import sys, subprocess

-if len(sys.argv) < 3:
-    print("Usage: build.py SDK_PATH NDK_PATH [configure_args...]", file=sys.stderr)
+if len(sys.argv) < 4:
+    print("Usage: build.py SDK_PATH NDK_PATH ABI [configure_args...]", file=sys.stderr)
    sys.exit(1)

 sdk_path = sys.argv[1]
 ndk_path = sys.argv[2]
-configure_args = sys.argv[3:]
+android_abi = sys.argv[3]
+configure_args = sys.argv[4:]

 if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
    print("SDK not found in", ndk_path, file=sys.stderr)
@@ -22,412 +20,177 @@ if not os.path.isdir(ndk_path):
    print("NDK not found in", ndk_path, file=sys.stderr)
    sys.exit(1)

+android_abis = {
+    'armeabi-v7a': {
+        'arch': 'arm-linux-androideabi',
+        'ndk_arch': 'arm',
+        'toolchain_arch': 'arm-linux-androideabi',
+        'llvm_triple': 'armv7-none-linux-androideabi',
+        'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
+    },
+
+    'arm64-v8a': {
+        'android_api_level': '21',
+        'arch': 'aarch64-linux-android',
+        'ndk_arch': 'arm64',
+        'toolchain_arch': 'aarch64-linux-android',
+        'llvm_triple': 'aarch64-none-linux-android',
+        'cflags': '',
+    },
+
+    'x86': {
+        'arch': 'i686-linux-android',
+        'ndk_arch': 'x86',
+        'toolchain_arch': 'x86',
+        'llvm_triple': 'i686-none-linux-android',
+        'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
+    },
+}
+
+# select the NDK target
+abi_info = android_abis[android_abi]
+arch = abi_info['arch']
+
 # the path to the MPD sources
-mpd_path = os.path.dirname(os.path.dirname(sys.argv[0]))
+mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '..'))
+sys.path[0] = os.path.join(mpd_path, 'python')

 # output directories
-lib_path = os.path.abspath('lib')
-tarball_path = lib_path
-src_path = os.path.join(lib_path, 'src')
-build_path = os.path.join(lib_path, 'build')
-root_path = os.path.join(lib_path, 'root')
+from build.dirs import lib_path, tarball_path, src_path
+from build.meson import configure as run_meson
+
+arch_path = os.path.join(lib_path, arch)
+build_path = os.path.join(arch_path, 'build')

 # build host configuration
 build_arch = 'linux-x86_64'

-# redirect pkg-config to use our root directory instead of the default
-# one on the build host
-os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig')
-
-# select the NDK compiler
-gcc_version = '4.8'
-llvm_version = '3.3'
-
-# select the NDK target
-ndk_arch = 'arm'
-host_arch = 'arm-linux-androideabi'
-android_abi = 'armeabi-v7a'
-ndk_platform = 'android-14'
-
 # set up the NDK toolchain

-gcc_toolchain = os.path.join(ndk_path, 'toolchains', host_arch + '-' + gcc_version, 'prebuilt', build_arch)
-llvm_toolchain = os.path.join(ndk_path, 'toolchains', 'llvm-' + llvm_version, 'prebuilt', build_arch)
-ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
-target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
+class AndroidNdkToolchain:
+    def __init__(self, tarball_path, src_path, build_path,
+                 use_cxx):
+        self.tarball_path = tarball_path
+        self.src_path = src_path
+        self.build_path = build_path

-llvm_triple = 'armv7-none-linux-androideabi'
+        ndk_arch = abi_info['ndk_arch']
+        android_api_level = '21'
+        ndk_platform = 'android-' + android_api_level

-def select_toolchain(use_cxx, use_clang):
-    global cc, cxx, ar, strip, cflags, cxxflags, cppflags, ldflags, libs
+        # select the NDK compiler
+        gcc_version = '4.9'

-    target_arch = '-march=armv7-a -mfloat-abi=softfp'
-    if use_clang:
-        cc = os.path.join(llvm_toolchain, 'bin/clang')
-        cxx = os.path.join(llvm_toolchain, 'bin/clang++')
-        target_arch += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + gcc_toolchain
-    else:
-        cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc')
-        cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++')
-    ar = os.path.join(gcc_toolchain, 'bin', host_arch + '-ar')
-    strip = os.path.join(gcc_toolchain, 'bin', host_arch + '-strip')
+        ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
+        sysroot = os.path.join(ndk_path, 'sysroot')
+        target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)

-    libstdcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/gnu-libstdc++', gcc_version)
-    libstdcxx_cppflags = '-isystem ' + os.path.join(libstdcxx_path, 'include') + ' -isystem ' + os.path.join(libstdcxx_path, 'libs', android_abi, 'include')
-    if use_clang:
-        libstdcxx_cppflags += ' -D__STRICT_ANSI__'
-    libstdcxx_ldadd = os.path.join(libstdcxx_path, 'libs', android_abi, 'libgnustl_static.a')
+        install_prefix = os.path.join(arch_path, 'root')

-    cflags = '-Os -g ' + target_arch
-    cxxflags = '-Os -g ' + target_arch
-    cppflags = '--sysroot=' + target_root + ' -I' + root_path + '/include'
-    ldflags = '--sysroot=' + target_root + ' -L' + root_path + '/lib'
-    libs = ''
+        self.arch = arch
+        self.install_prefix = install_prefix
+        self.sysroot = sysroot

-    if use_cxx:
-        libs += ' ' + libstdcxx_ldadd
-        cppflags += ' ' + libstdcxx_cppflags
+        toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
+        llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
+        llvm_triple = abi_info['llvm_triple']

-def file_md5(path):
-    """Calculate the MD5 checksum of a file and return it in hexadecimal notation."""
+        common_flags = '-Os -g'
+        common_flags += ' -fPIC'
+        common_flags += ' ' + abi_info['cflags']

-    with open(path, 'rb') as f:
-        m = hashlib.md5()
-        while True:
-            data = f.read(65536)
-            if len(data) == 0:
-                # end of file
-                return m.hexdigest()
-            m.update(data)
+        toolchain_bin = os.path.join(toolchain_path, 'bin')
+        llvm_bin = os.path.join(llvm_path, 'bin')
+        self.cc = os.path.join(llvm_bin, 'clang')
+        self.cxx = os.path.join(llvm_bin, 'clang++')
+        common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path

-def download_tarball(url, md5):
-    """Download a tarball, verify its MD5 checksum and return the local path."""
+        common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'

-    global tarball_path
-    os.makedirs(tarball_path, exist_ok=True)
-    path = os.path.join(tarball_path, os.path.basename(url))
+        self.ar = os.path.join(toolchain_bin, arch + '-ar')
+        self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
+        self.nm = os.path.join(toolchain_bin, arch + '-nm')
+        self.strip = os.path.join(toolchain_bin, arch + '-strip')

-    try:
-        calculated_md5 = file_md5(path)
-        if md5 == calculated_md5: return path
-        os.unlink(path)
-    except FileNotFoundError:
-        pass
+        self.cflags = common_flags
+        self.cxxflags = common_flags
+        self.cppflags = '--sysroot=' + sysroot + \
+            ' -isystem ' + os.path.join(install_prefix, 'include') + \
+            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
+            ' -D__ANDROID_API__=' + android_api_level
+        self.ldflags = '--sysroot=' + sysroot + \
+            ' -L' + os.path.join(install_prefix, 'lib') + \
+            ' -L' + os.path.join(target_root, 'usr', 'lib') + \
+            ' -B' + os.path.join(target_root, 'usr', 'lib') + \
+            ' ' + common_flags
+        self.libs = ''

-    tmp_path = path + '.tmp'
+        self.is_arm = ndk_arch == 'arm'
+        self.is_armv7 = self.is_arm and 'armv7' in self.cflags
+        self.is_aarch64 = ndk_arch == 'arm64'
+        self.is_windows = False

-    print("download", url)
-    urllib.request.urlretrieve(url, tmp_path)
-    calculated_md5 = file_md5(tmp_path)
-    if calculated_md5 != md5:
-        os.unlink(tmp_path)
-        raise "MD5 mismatch"
+        libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++')
+        libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi)

-    os.rename(tmp_path, path)
-    return path
+        libstdcxx_flags = ''
+        libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include')
+        libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
+        libstdcxx_libs = '-lc++_static -lc++abi'

-class Project:
-    def __init__(self, url, md5, installed, name=None, version=None,
-                 base=None,
-                 use_cxx=False, use_clang=False):
-        if base is None:
-            basename = os.path.basename(url)
-            m = re.match(r'^(.+)\.(tar(\.(gz|bz2|xz|lzma))?|zip)$', basename)
-            if not m: raise
-            self.base = m.group(1)
-        else:
-            self.base = base
+        if use_cxx:
+            self.cxxflags += ' ' + libstdcxx_cxxflags
+            self.ldflags += ' ' + libstdcxx_ldflags
+            self.libs += ' ' + libstdcxx_libs

-        if name is None or version is None:
-            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?)$', self.base)
-            if name is None: name = m.group(1)
-            if version is None: version = m.group(2)
+        self.env = dict(os.environ)

-        self.name = name
-        self.version = version
-
-        self.url = url
-        self.md5 = md5
-        self.installed = installed
-
-        self.use_cxx = use_cxx
-        self.use_clang = use_clang
-
-    def download(self):
-        return download_tarball(self.url, self.md5)
-
-    def is_installed(self):
-        global root_path
-        tarball = self.download()
-        installed = os.path.join(root_path, self.installed)
-        tarball_mtime = os.path.getmtime(tarball)
+        # redirect pkg-config to use our root directory instead of the
+        # default one on the build host
+        import shutil
+        bin_dir = os.path.join(install_prefix, 'bin')
        try:
-            return os.path.getmtime(installed) >= tarball_mtime
-        except FileNotFoundError:
-            return False
-
-    def unpack(self):
-        global src_path
-        tarball = self.download()
-        path = os.path.join(src_path, self.base)
-        try:
-            shutil.rmtree(path)
-        except FileNotFoundError:
+            os.makedirs(bin_dir)
+        except:
            pass
-        os.makedirs(src_path, exist_ok=True)
-        subprocess.check_call(['/bin/tar', 'xfC', tarball, src_path])
-        return path
-
-    def make_build_path(self):
-        path = os.path.join(build_path, self.base)
-        try:
-            shutil.rmtree(path)
-        except FileNotFoundError:
-            pass
-        os.makedirs(path, exist_ok=True)
-        return path
-
-class AutotoolsProject(Project):
-    def __init__(self, url, md5, installed, configure_args=[],
-                 autogen=False,
-                 cppflags='',
-                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
-        self.configure_args = configure_args
-        self.autogen = autogen
-        self.cppflags = cppflags
-
-    def build(self):
-        src = self.unpack()
-        if self.autogen:
-            subprocess.check_call(['/usr/bin/aclocal'], cwd=src)
-            subprocess.check_call(['/usr/bin/automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
-            subprocess.check_call(['/usr/bin/autoconf'], cwd=src)
-            subprocess.check_call(['/usr/bin/libtoolize', '--force'], cwd=src)
-
-        build = self.make_build_path()
-
-        select_toolchain(use_cxx=self.use_cxx, use_clang=self.use_clang)
-        configure = [
-            os.path.join(src, 'configure'),
-            'CC=' + cc,
-            'CXX=' + cxx,
-            'CFLAGS=' + cflags,
-            'CXXFLAGS=' + cxxflags,
-            'CPPFLAGS=' + cppflags + ' ' + self.cppflags,
-            'LDFLAGS=' + ldflags,
-            'LIBS=' + libs,
-            'AR=' + ar,
-            'STRIP=' + strip,
-            '--host=' + host_arch,
-            '--prefix=' + root_path,
-            '--with-sysroot=' + target_root,
-            '--enable-silent-rules',
-        ] + self.configure_args
-
-        subprocess.check_call(configure, cwd=build)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build)
-
-class FfmpegProject(Project):
-    def __init__(self, url, md5, installed, configure_args=[],
-                 cppflags='',
-                 **kwargs):
-        Project.__init__(self, url, md5, installed, **kwargs)
-        self.configure_args = configure_args
-        self.cppflags = cppflags
-
-    def build(self):
-        src = self.unpack()
-        build = self.make_build_path()
-
-        select_toolchain(use_cxx=self.use_cxx, use_clang=self.use_clang)
-        configure = [
-            os.path.join(src, 'configure'),
-            '--cc=' + cc,
-            '--cxx=' + cxx,
-            '--extra-cflags=' + cflags + ' ' + cppflags + ' ' + self.cppflags,
-            '--extra-cxxflags=' + cxxflags + ' ' + cppflags + ' ' + self.cppflags,
-            '--extra-ldflags=' + ldflags,
-            '--extra-libs=' + libs,
-            '--ar=' + ar,
-            '--enable-cross-compile',
-            '--target-os=linux',
-            '--arch=' + ndk_arch,
-            '--cpu=cortex-a8',
-            '--prefix=' + root_path,
-        ] + self.configure_args
-
-        subprocess.check_call(configure, cwd=build)
-        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build)
-        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build)
-
-class BoostProject(Project):
-    def __init__(self, url, md5, installed,
-                 **kwargs):
-        m = re.match(r'.*/boost_(\d+)_(\d+)_(\d+)\.tar\.bz2$', url)
-        version = "%s.%s.%s" % (m.group(1), m.group(2), m.group(3))
-        Project.__init__(self, url, md5, installed,
-                         name='boost', version=version,
-                         **kwargs)
-
-    def build(self):
-        src = self.unpack()
-
-        # install the headers manually; don't build any library
-        # (because right now, we only use header-only libraries)
-        includedir = os.path.join(root_path, 'include')
-        for dirpath, dirnames, filenames in os.walk(os.path.join(src, 'boost')):
-            relpath = dirpath[len(src)+1:]
-            destdir = os.path.join(includedir, relpath)
-            try:
-                os.mkdir(destdir)
-            except:
-                pass
-            for name in filenames:
-                if name[-4:] == '.hpp':
-                    shutil.copyfile(os.path.join(dirpath, name),
-                                    os.path.join(destdir, name))
+        self.pkg_config = shutil.copy(os.path.join(mpd_path, 'build', 'pkg-config.sh'),
+                                      os.path.join(bin_dir, 'pkg-config'))
+        self.env['PKG_CONFIG'] = self.pkg_config

 # a list of third-party libraries to be used by MPD on Android
+from build.libs import *
 thirdparty_libs = [
-    AutotoolsProject(
-        'http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz',
-        '5c3a34309d8b98640827e5d0991a4015',
-        'lib/libogg.a',
-        ['--disable-shared', '--enable-static'],
-    ),
-
-    AutotoolsProject(
-        'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz',
-        '55f2288055e44754275a17c9a2497391',
-        'lib/libvorbis.a',
-        ['--disable-shared', '--enable-static'],
-    ),
-
-    AutotoolsProject(
-        'http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz',
-        'c5a8cf7c0b066759542bc4ca46817ac6',
-        'lib/libopus.a',
-        ['--disable-shared', '--enable-static'],
-        use_clang=True,
-    ),
-
-    AutotoolsProject(
-        'https://svn.xiph.org/releases/flac/flac-1.3.0.tar.xz',
-        '13b5c214cee8373464d3d65dee362cdd',
-        'lib/libFLAC.a',
-        [
-            '--disable-shared', '--enable-static',
-            '--disable-xmms-plugin', '--disable-cpplibs',
-        ],
-        use_clang=True,
-    ),
-
-    AutotoolsProject(
-        'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
-        'e5808ad997ba32c498803822078748c3',
-        'lib/libid3tag.a',
-        ['--disable-shared', '--enable-static'],
-        autogen=True,
-    ),
-
-    AutotoolsProject(
-        'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
-        '1be543bc30c56fb6bea1d7bf6a64e66c',
-        'lib/libmad.a',
-        ['--disable-shared', '--enable-static'],
-        autogen=True,
-    ),
-
-    FfmpegProject(
-        'http://www.ffmpeg.org/releases/ffmpeg-2.2.3.tar.bz2',
-        'dbb5b6b69bd010916f17df0ae596e0b1',
-        'lib/libavcodec.a',
-        [
-            '--disable-shared', '--enable-static',
-            '--enable-gpl',
-            '--enable-small',
-            '--disable-pthreads',
-            '--disable-runtime-cpudetect',
-            '--disable-programs',
-            '--disable-doc',
-            '--disable-avdevice',
-            '--disable-swresample',
-            '--disable-swscale',
-            '--disable-postproc',
-            '--disable-avfilter',
-            '--disable-network',
-            '--disable-encoders',
-            '--disable-protocols',
-            '--disable-outdevs',
-            '--disable-filters',
-        ],
-    ),
-
-    AutotoolsProject(
-        'http://curl.haxx.se/download/curl-7.37.0.tar.lzma',
-        '54bfd1eb5214f604186d6f5ac61c7781',
-        'lib/libcurl.a',
-        [
-            '--disable-shared', '--enable-static',
-            '--disable-debug',
-            '--enable-http',
-            '--enable-ipv6',
-            '--disable-ftp', '--disable-file',
-            '--disable-ldap', '--disable-ldaps',
-            '--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
-            '--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
-            '--disable-gopher',
-            '--disable-manual',
-            '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
-            '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
-            '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
-        ],
-        use_clang=True,
-    ),
-
-    BoostProject(
-        'http://netcologne.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2',
-        'd6eef4b4cacb2183f2bf265a5a03a354',
-        'include/boost/version.hpp',
-    ),
+    libmpdclient,
+    libogg,
+    libvorbis,
+    opus,
+    flac,
+    libid3tag,
+    ffmpeg,
+    curl,
+    libexpat,
+    libnfs,
+    boost,
 ]

 # build the third-party libraries
 for x in thirdparty_libs:
-    if not x.is_installed():
-        x.build()
+    toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                    use_cxx=x.use_cxx)
+    if not x.is_installed(toolchain):
+        x.build(toolchain)

 # configure and build MPD
-select_toolchain(use_cxx=True, use_clang=True)
+toolchain = AndroidNdkToolchain(tarball_path, src_path, build_path,
+                                use_cxx=True)

-configure = [
-    os.path.join(mpd_path, 'configure'),
-    'CC=' + cc,
-    'CXX=' + cxx,
-    'CFLAGS=' + cflags,
-    'CXXFLAGS=' + cxxflags,
-    'CPPFLAGS=' + cppflags,
-    'LDFLAGS=' + ldflags,
-    'LIBS=' + libs,
-    'AR=' + ar,
-    'STRIP=' + strip,
-    '--host=' + host_arch,
-    '--prefix=' + root_path,
-    '--with-sysroot=' + target_root,
-    '--with-android-sdk=' + sdk_path,
+configure_args += [
+    '-Dandroid_sdk=' + sdk_path,
+    '-Dandroid_ndk=' + ndk_path,
+    '-Dandroid_abi=' + android_abi,
+    '-Dandroid_strip=' + toolchain.strip,
+]

-    '--enable-silent-rules',
-
-    '--disable-glib',
-    '--disable-icu',
-
-    # disabled for now because these features require GLib:
-    '--disable-httpd-output',
-    '--disable-vorbis-encoder',
-
-] + configure_args
-
-subprocess.check_call(configure)
-subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'])
+from build.meson import configure as run_meson
+run_meson(toolchain, mpd_path, '.', configure_args)
+subprocess.check_call(['/usr/bin/ninja'], env=toolchain.env)
--- a/android/make-resources-apk.sh
+++ b/android/make-resources-apk.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+S=`dirname "$0"`
+AAPT=$1
+BASE_JAR=$2
+JAVA_PKG=$3
+JAVA_PKG_PATH=$4
+APK_FILE="$5"
+D=`dirname "$APK_FILE"`
+
+rm -rf "$D/res"
+mkdir -p "$D/res/drawable" "$D/src"
+cp "$D/icon.png" "$D/notification_icon.png"  "$D/res/drawable/"
+
+"$AAPT" package -f -m --auto-add-overlay \
+  --custom-package "$JAVA_PKG" \
+  -M "$S/AndroidManifest.xml" \
+  -S "$D/res" \
+  -S "$S/res" \
+  -J "$D/src" \
+  -I "$BASE_JAR" \
+  -F "$D/resources.apk"
+
+cp "$D/src/$JAVA_PKG_PATH/R.java" "$D/"
--- a/android/meson.build
+++ b/android/meson.build
@@ -0,0 +1,140 @@
+android_package = 'org.musicpd'
+android_package_path = join_paths(android_package.split('.'))
+
+android_ndk = get_option('android_ndk')
+android_sdk = get_option('android_sdk')
+android_abi = get_option('android_abi')
+
+android_sdk_build_tools_version = '27.0.0'
+android_sdk_platform = 'android-21'
+
+android_build_tools_dir = join_paths(android_sdk, 'build-tools', android_sdk_build_tools_version)
+android_sdk_platform_dir = join_paths(android_sdk, 'platforms', android_sdk_platform)
+
+android_aidl = join_paths(android_build_tools_dir, 'aidl')
+android_aapt = join_paths(android_build_tools_dir, 'aapt')
+android_dx = join_paths(android_build_tools_dir, 'dx')
+android_zipalign = join_paths(android_build_tools_dir, 'zipalign')
+
+javac = find_program('javac')
+jarsigner = find_program('jarsigner')
+rsvg_convert = find_program('rsvg-convert')
+convert = find_program('convert')
+zip = find_program('zip')
+
+common_cppflags += '-I' + join_paths(meson.current_build_dir(), 'include')
+
+#
+# AIDL
+#
+
+IMainCallback_java = custom_target(
+  'IMainCallback.java',
+  output: 'IMainCallback.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMainCallback.aidl'),
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+IMain_java = custom_target(
+  'IMain.java',
+  output: 'IMain.java',
+  input: join_paths(meson.current_source_dir(), 'src', 'IMain.aidl'),
+  depends: IMainCallback_java,
+  command: [
+    join_paths(meson.current_source_dir(), 'run-aidl.sh'),
+    android_aidl,
+    '@INPUT@',
+    '@OUTPUT@',
+    join_paths(meson.current_build_dir(), 'src'),
+    android_package_path,
+  ],
+)
+
+#
+# Resources
+#
+
+android_icon = custom_target(
+  'Android icon',
+  output: 'icon.png',
+  input: '../mpd.svg',
+  command: [
+    rsvg_convert, '--width=48', '--height=48', '@INPUT@', '-o', '@OUTPUT@',
+  ],
+)
+
+android_notification_icon = custom_target(
+  'Android notification icon',
+  output: 'notification_icon.png',
+  input: android_icon,
+  command: [
+    convert, '@INPUT@', '-colorspace', 'Gray', '-gamma', '2.2', '@OUTPUT@',
+  ],
+)
+
+resources_apk = custom_target(
+  'resources.apk',
+  output: ['resources.apk', 'R.java'],
+  input: [
+    'res/layout/custom_notification_gb.xml',
+    'res/layout/log_item.xml',
+    'res/layout/settings.xml',
+    'res/values/strings.xml',
+    android_icon,
+    android_notification_icon,
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'make-resources-apk.sh'),
+    android_aapt,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package,
+    android_package_path,
+    '@OUTPUT0@',
+  ],
+)
+
+#
+# Compile Java
+#
+
+classes_jar = custom_target(
+  'classes.jar',
+  output: 'classes.jar',
+  input: [
+    'src/Bridge.java',
+    'src/Loader.java',
+    'src/Main.java',
+    'src/Receiver.java',
+    'src/Settings.java',
+    IMain_java,
+    IMainCallback_java,
+    resources_apk[1],
+  ],
+  command: [
+    join_paths(meson.current_source_dir(), 'run-javac.sh'),
+    javac,
+    join_paths(android_sdk_platform_dir, 'android.jar'),
+    android_package_path,
+    zip,
+    '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
+
+classes_dex = custom_target(
+  'classes.dex',
+  output: 'classes.dex',
+  input: classes_jar,
+  command: [
+    android_dx,
+    '--dex', '--output', '@OUTPUT@',
+    '@INPUT@',
+  ],
+)
--- a/android/res/layout/custom_notification_gb.xml
+++ b/android/res/layout/custom_notification_gb.xml
@@ -0,0 +1,22 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp" >
+    <ImageView android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_marginRight="10dp" />
+    <TextView android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/image"
+        style="Custom Notification Title" />
+    <TextView android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/image"
+        android:layout_below="@id/title"
+        style="Custom Notification Text" />
+</RelativeLayout>
--- a/android/res/layout/log_item.xml
+++ b/android/res/layout/log_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:typeface="monospace" />
--- a/android/res/layout/settings.xml
+++ b/android/res/layout/settings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <ToggleButton
+        android:id="@+id/run"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textOn="@string/toggle_button_run_on"
+        android:textOff="@string/toggle_button_run_off" />
+
+    <CheckBox
+        android:id="@+id/run_on_boot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/checkbox_run_on_boot" />
+
+    <CheckBox
+        android:id="@+id/wakelock"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/checkbox_wakelock" />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ListView
+		android:id="@+id/log_list"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:paddingTop="10dip" />
+
+</LinearLayout>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -2,4 +2,10 @@

 <resources>
  <string name="app_name">MPD</string>
+  <string name="notification_title_mpd_running">Music Player Daemon is running</string>
+  <string name="notification_text_mpd_running">Touch for MPD options.</string>
+  <string name="toggle_button_run_on">MPD is running</string>
+  <string name="toggle_button_run_off">MPD is not running</string>
+  <string name="checkbox_run_on_boot">Run MPD automatically on boot</string>
+  <string name="checkbox_wakelock">Prevent suspend when MPD is running (Wakelock)</string>
 </resources>
--- a/android/run-aidl.sh
+++ b/android/run-aidl.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+AIDL=$1
+SRC=$2
+DST=$3
+GENSRC=$4
+JAVA_PKG_PATH=$5
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+cp "$SRC" "$GENSRC/$JAVA_PKG_PATH/"
+"$AIDL" -I"$GENSRC" -o"$GENSRC" "$GENSRC/$JAVA_PKG_PATH/`basename $SRC`"
+exec cp "$GENSRC/$JAVA_PKG_PATH/`basename $DST`" "$DST"
--- a/android/run-javac.sh
+++ b/android/run-javac.sh
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+JAVAC=$1
+CLASSPATH=$2
+JAVA_PKG_PATH=$3
+ZIP=$4
+JARFILE=`realpath "$5"`
+shift 5
+
+D=`dirname "$JARFILE"`
+GENSRC="$D/src"
+GENCLASS="$D/classes"
+GENINCLUDE="$D/include"
+
+mkdir -p "$GENSRC/$JAVA_PKG_PATH"
+"$JAVAC" -source 1.6 -target 1.6 -Xlint:-options \
+	 -cp "$CLASSPATH" \
+	 -h "$GENINCLUDE" \
+	 -d "$GENCLASS" \
+	 "$@"
+cd "$GENCLASS"
+zip -q -r "$JARFILE" .
--- a/android/src/Bridge.java
+++ b/android/src/Bridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,12 @@ import android.content.Context;
 * Bridge to native code.
 */
 public class Bridge {
-	public static native void run(Context context);
+
+	/* used by jni */
+	public interface LogListener {
+		public void onLog(int priority, String msg);
+	}
+
+	public static native void run(Context context, LogListener logListener);
 	public static native void shutdown();
 }
--- a/android/src/IMain.aidl
+++ b/android/src/IMain.aidl
@@ -0,0 +1,12 @@
+package org.musicpd;
+import org.musicpd.IMainCallback;
+
+interface IMain
+{
+    void start();
+    void stop();
+    void setWakelockEnabled(boolean enabled);
+    boolean isRunning();
+    void registerCallback(IMainCallback cb);
+    void unregisterCallback(IMainCallback cb);
+}
--- a/android/src/IMainCallback.aidl
+++ b/android/src/IMainCallback.aidl
@@ -0,0 +1,9 @@
+package org.musicpd;
+
+interface IMainCallback
+{
+    void onStarted();
+    void onStopped();
+    void onError(String error);
+    void onLog(int priority, String msg);
+}
--- a/android/src/Loader.java
+++ b/android/src/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/android/src/Main.java
+++ b/android/src/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,57 +19,360 @@

 package org.musicpd;

-import android.app.Activity;
-import android.os.Bundle;
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.widget.TextView;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
 import android.util.Log;
+import android.widget.RemoteViews;

-public class Main extends Activity implements Runnable {
-	private static final String TAG = "MPD";
+public class Main extends Service implements Runnable {
+	private static final String TAG = "Main";
+	private static final String REMOTE_ERROR = "MPD process was killed";
+	private static final int MAIN_STATUS_ERROR = -1;
+	private static final int MAIN_STATUS_STOPPED = 0;
+	private static final int MAIN_STATUS_STARTED = 1;

-	Thread thread;
+	private static final int MSG_SEND_STATUS = 0;
+	private static final int MSG_SEND_LOG = 1;

-	TextView textView;
+	private Thread mThread = null;
+	private int mStatus = MAIN_STATUS_STOPPED;
+	private boolean mAbort = false;
+	private String mError = null;
+	private final RemoteCallbackList<IMainCallback> mCallbacks = new RemoteCallbackList<IMainCallback>();
+	private final IBinder mBinder = new MainStub(this);
+	private PowerManager.WakeLock mWakelock = null;

-	final Handler quitHandler = new Handler() {
-			public void handleMessage(Message msg) {
-				textView.setText("Music Player Daemon has quit");
+	static class MainStub extends IMain.Stub {
+		private Main mService;
+		MainStub(Main service) {
+			mService = service;
+		}
+		public void start() {
+			mService.start();
+		}
+		public void stop() {
+			mService.stop();
+		}
+		public void setWakelockEnabled(boolean enabled) {
+			mService.setWakelockEnabled(enabled);
+		}
+		public boolean isRunning() {
+			return mService.isRunning();
+		}
+		public void registerCallback(IMainCallback cb) {
+			mService.registerCallback(cb);
+		}
+		public void unregisterCallback(IMainCallback cb) {
+			mService.unregisterCallback(cb);
+		}
+	}

-				// TODO: what now?  restart?
+	private synchronized void sendMessage(int what, int arg1, int arg2, Object obj) {
+		int i = mCallbacks.beginBroadcast();
+		while (i > 0) {
+			i--;
+			final IMainCallback cb = mCallbacks.getBroadcastItem(i);
+			try {
+				switch (what) {
+				case MSG_SEND_STATUS:
+					switch (arg1) {
+					case MAIN_STATUS_ERROR:
+						cb.onError((String)obj);
+						break;
+					case MAIN_STATUS_STOPPED:
+						cb.onStopped();
+						break;
+					case MAIN_STATUS_STARTED:
+						cb.onStarted();
+						break;
+					}
+					break;
+				case MSG_SEND_LOG:
+					cb.onLog(arg1, (String) obj);
+					break;
+				}
+			} catch (RemoteException e) {
+			}
+		}
+		mCallbacks.finishBroadcast();
+	}
+
+	private Bridge.LogListener mLogListener = new Bridge.LogListener() {
+		@Override
+		public void onLog(int priority, String msg) {
+			sendMessage(MSG_SEND_LOG, priority, 0, msg);
+		}
+	};
+
+	@Override
+	public IBinder onBind(Intent intent) {
+		return mBinder;
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		start();
+		if (intent != null && intent.getBooleanExtra("wakelock", false))
+			setWakelockEnabled(true);
+		return START_STICKY;
+	}
+
+	@Override
+	public void run() {
+		if (!Loader.loaded) {
+			final String error = "Failed to load the native MPD libary.\n" +
+				"Report this problem to us, and include the following information:\n" +
+				"SUPPORTED_ABIS=" + String.join(", ", Build.SUPPORTED_ABIS) + "\n" +
+				"PRODUCT=" + Build.PRODUCT + "\n" +
+				"FINGERPRINT=" + Build.FINGERPRINT + "\n" +
+				"error=" + Loader.error;
+			setStatus(MAIN_STATUS_ERROR, error);
+			stopSelf();
+			return;
+		}
+		synchronized (this) {
+			if (mAbort)
+				return;
+			setStatus(MAIN_STATUS_STARTED, null);
+		}
+		Bridge.run(this, mLogListener);
+		setStatus(MAIN_STATUS_STOPPED, null);
+	}
+
+	private synchronized void setStatus(int status, String error) {
+		mStatus = status;
+		mError = error;
+		sendMessage(MSG_SEND_STATUS, mStatus, 0, mError);
+	}
+
+	private void start() {
+		if (mThread != null)
+			return;
+		mThread = new Thread(this);
+		mThread.start();
+
+		final Intent mainIntent = new Intent(this, Settings.class);
+		mainIntent.setAction("android.intent.action.MAIN");
+		mainIntent.addCategory("android.intent.category.LAUNCHER");
+		final PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
+				mainIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+
+		Notification notification = new Notification.Builder(this)
+			.setContentTitle(getText(R.string.notification_title_mpd_running))
+			.setContentText(getText(R.string.notification_text_mpd_running))
+			.setSmallIcon(R.drawable.notification_icon)
+			.setContentIntent(contentIntent)
+			.build();
+
+		startForeground(R.string.notification_title_mpd_running, notification);
+		startService(new Intent(this, Main.class));
+	}
+
+	private void stop() {
+		if (mThread != null) {
+			if (mThread.isAlive()) {
+				synchronized (this) {
+					if (mStatus == MAIN_STATUS_STARTED)
+						Bridge.shutdown();
+					else
+						mAbort = true;
+				}
+			}
+			try {
+				mThread.join();
+				mThread = null;
+				mAbort = false;
+			} catch (InterruptedException ie) {}
+		}
+		setWakelockEnabled(false);
+		stopForeground(true);
+		stopSelf();
+	}
+
+	private void setWakelockEnabled(boolean enabled) {
+		if (enabled && mWakelock == null) {
+			PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+			mWakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+			mWakelock.acquire();
+			Log.d(TAG, "Wakelock acquired");
+		} else if (!enabled && mWakelock != null) {
+			mWakelock.release();
+			mWakelock = null;
+			Log.d(TAG, "Wakelock released");
+		}
+	}
+
+	private boolean isRunning() {
+		return mThread != null && mThread.isAlive();
+	}
+
+	private void registerCallback(IMainCallback cb) {
+		if (cb != null) {
+			mCallbacks.register(cb);
+			sendMessage(MSG_SEND_STATUS, mStatus, 0, mError);
+		}
+	}
+
+	private void unregisterCallback(IMainCallback cb) {
+		if (cb != null) {
+			mCallbacks.unregister(cb);
+		}
+	}
+
+	/*
+	 * Client that bind the Main Service in order to send commands and receive callback
+	 */
+	public static class Client {
+
+		public interface Callback {
+			public void onStarted();
+			public void onStopped();
+			public void onError(String error);
+			public void onLog(int priority, String msg);
+		}
+
+		private boolean mBound = false;
+		private final Context mContext;
+		private Callback mCallback;
+		private IMain mIMain = null;
+
+		private final IMainCallback.Stub mICallback = new IMainCallback.Stub() {
+
+			@Override
+			public void onStopped() throws RemoteException {
+				mCallback.onStopped();
+			}
+
+			@Override
+			public void onStarted() throws RemoteException {
+				mCallback.onStarted();
+			}
+
+			@Override
+			public void onError(String error) throws RemoteException {
+				mCallback.onError(error);
+			}
+
+			@Override
+			public void onLog(int priority, String msg) throws RemoteException {
+				mCallback.onLog(priority, msg);
 			}
 		};

-	@Override protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+		private final ServiceConnection mServiceConnection = new ServiceConnection() {

-		if (!Loader.loaded) {
-			TextView tv = new TextView(this);
-			tv.setText("Failed to load the native MPD libary.\n" +
-				   "Report this problem to us, and include the following information:\n" +
-				   "ABI=" + Build.CPU_ABI + "\n" +
-				   "PRODUCT=" + Build.PRODUCT + "\n" +
-				   "FINGERPRINT=" + Build.FINGERPRINT + "\n" +
-				   "error=" + Loader.error);
-			setContentView(tv);
-			return;
+			@Override
+			public void onServiceConnected(ComponentName name, IBinder service) {
+				synchronized (this) {
+					mIMain = IMain.Stub.asInterface(service);
+					try {
+						if (mCallback != null)
+							mIMain.registerCallback(mICallback);
+					} catch (RemoteException e) {
+						if (mCallback != null)
+							mCallback.onError(REMOTE_ERROR);
+					}
+				}
+			}
+
+			@Override
+			public void onServiceDisconnected(ComponentName name) {
+				if (mCallback != null)
+					mCallback.onError(REMOTE_ERROR);
+			}
+		};
+
+		public Client(Context context, Callback cb) throws IllegalArgumentException {
+			if (context == null)
+				throw new IllegalArgumentException("Context can't be null");
+			mContext = context;
+			mCallback = cb;
+			mBound = mContext.bindService(new Intent(mContext, Main.class), mServiceConnection, Context.BIND_AUTO_CREATE);
 		}

-		if (thread == null || !thread.isAlive()) {
-			thread = new Thread(this, "NativeMain");
-			thread.start();
+		public boolean start() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.start();
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
 		}

-		textView = new TextView(this);
-		textView.setText("Music Player Daemon is running"
-				 + "\nCAUTION: this version is EXPERIMENTAL!");
-		setContentView(textView);
+		public boolean stop() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.stop();
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public boolean setWakelockEnabled(boolean enabled) {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						mIMain.setWakelockEnabled(enabled);
+						return true;
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public boolean isRunning() {
+			synchronized (this) {
+				if (mIMain != null) {
+					try {
+						return mIMain.isRunning();
+					} catch (RemoteException e) {
+					}
+				}
+				return false;
+			}
+		}
+
+		public void release() {
+			if (mBound) {
+				synchronized (this) {
+					if (mIMain != null && mICallback != null) {
+						try {
+							if (mCallback != null)
+								mIMain.unregisterCallback(mICallback);
+						} catch (RemoteException e) {
+						}
+					}
+				}
+				mBound = false;
+				mContext.unbindService(mServiceConnection);
+			}
+		}
 	}

-	@Override public void run() {
-		Bridge.run(this);
-		quitHandler.sendMessage(quitHandler.obtainMessage());
+	/*
+	 * start Main service without any callback
+	 */
+	public static void start(Context context, boolean wakelock) {
+		context.startService(new Intent(context, Main.class).putExtra("wakelock", wakelock));
 	}
 }
--- a/android/src/Receiver.java
+++ b/android/src/Receiver.java
@@ -1,3 +1,4 @@
+
 /*
 * Copyright (C) 2003-2014 The Music Player Daemon Project
 * http://www.musicpd.org
@@ -17,48 +18,24 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_GLOBAL_EVENTS_HXX
-#define MPD_GLOBAL_EVENTS_HXX
+package org.musicpd;

-#ifdef WIN32
-#include <windows.h>
-/* DELETE is a WIN32 macro that poisons our namespace; this is a
-   kludge to allow us to use it anyway */
-#ifdef DELETE
-#undef DELETE
-#endif
-#endif
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;

-class EventLoop;
-
-namespace GlobalEvents {
-	enum Event {
-		/** an idle event was emitted */
-		IDLE,
-
-		/** must call playlist_sync() */
-		PLAYLIST,
-
-		/** the current song's tag has changed */
-		TAG,
-
-#ifdef WIN32
-		/** shutdown requested */
-		SHUTDOWN,
-#endif
-
-		MAX
-	};
-
-	typedef void (*Handler)();
-
-	void Initialize(EventLoop &loop);
-
-	void Deinitialize();
-
-	void Register(Event event, Handler handler);
-
-	void Emit(Event event);
+public class Receiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d("Receiver", "onReceive: " + intent);
+        if (intent.getAction() == "android.intent.action.BOOT_COMPLETED") {
+        	if (Settings.Preferences.getBoolean(context,
+        			Settings.Preferences.KEY_RUN_ON_BOOT, false)) {
+        		final boolean wakelock = Settings.Preferences.getBoolean(context,
+        				Settings.Preferences.KEY_WAKELOCK, false);
+        		Main.start(context, wakelock);
+        	}
+        }
+    }
 }
-
-#endif /* MAIN_NOTIFY_H */
--- a/android/src/Settings.java
+++ b/android/src/Settings.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.musicpd;
+
+import java.util.LinkedList;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+
+public class Settings extends Activity {
+	private static final String TAG = "Settings";
+	private Main.Client mClient;
+	private TextView mTextStatus;
+	private ToggleButton mRunButton;
+	private boolean mFirstRun;
+	private LinkedList<String> mLogListArray = new LinkedList<String>();
+	private ListView mLogListView;
+	private ArrayAdapter<String> mLogListAdapter;
+
+	private static final int MAX_LOGS = 500;
+
+	private static final int MSG_ERROR = 0;
+	private static final int MSG_STOPPED = 1;
+	private static final int MSG_STARTED = 2;
+	private static final int MSG_LOG = 3;
+
+	public static class Preferences {
+		public static final String KEY_RUN_ON_BOOT ="run_on_boot";
+		public static final String KEY_WAKELOCK ="wakelock";
+
+		public static SharedPreferences get(Context context) {
+			return context.getSharedPreferences(TAG, MODE_PRIVATE);
+		}
+
+		public static void putBoolean(Context context, String key, boolean value) {
+			final SharedPreferences prefs = get(context);
+
+			if (prefs == null)
+				return;
+			final Editor editor = prefs.edit();
+			editor.putBoolean(key, value);
+			editor.apply();
+		}
+
+		public static boolean getBoolean(Context context, String key, boolean defValue) {
+			final SharedPreferences prefs = get(context);
+
+			return prefs != null ? prefs.getBoolean(key, defValue) : defValue;
+		}
+	}
+
+	private Handler mHandler = new Handler(new Handler.Callback() {
+		@Override
+		public boolean handleMessage(Message msg) {
+			switch (msg.what) {
+			case MSG_ERROR:
+				Log.d(TAG, "onError");
+
+				mClient.release();
+				connectClient();
+
+				mRunButton.setEnabled(false);
+				mRunButton.setChecked(false);
+
+				mTextStatus.setText((String)msg.obj);
+				mFirstRun = true;
+				break;
+			case MSG_STOPPED:
+				Log.d(TAG, "onStopped");
+				mRunButton.setEnabled(true);
+				if (!mFirstRun && Preferences.getBoolean(Settings.this, Preferences.KEY_RUN_ON_BOOT, false))
+					mRunButton.setChecked(true);
+				else
+					mRunButton.setChecked(false);
+				mFirstRun = true;
+				break;
+			case MSG_STARTED:
+				Log.d(TAG, "onStarted");
+				mRunButton.setChecked(true);
+				mFirstRun = true;
+				mTextStatus.setText("CAUTION: this version is EXPERIMENTAL!"); // XXX
+				break;
+			case MSG_LOG:
+				if (mLogListArray.size() > MAX_LOGS)
+					mLogListArray.remove(0);
+				String priority;
+				switch (msg.arg1) {
+				case Log.DEBUG:
+					priority = "D";
+					break;
+				case Log.ERROR:
+					priority = "E";
+					break;
+				case Log.INFO:
+					priority = "I";
+					break;
+				case Log.VERBOSE:
+					priority = "V";
+					break;
+				case Log.WARN:
+					priority = "W";
+					break;
+				default:
+					priority = "";
+				}
+				mLogListArray.add(priority + "/ " + (String)msg.obj);
+				mLogListAdapter.notifyDataSetChanged();
+
+				break;
+			}
+			return true;
+		}
+	});
+
+	private final OnCheckedChangeListener mOnRunChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			if (mClient != null) {
+				if (isChecked) {
+					mClient.start();
+					if (Preferences.getBoolean(Settings.this,
+							Preferences.KEY_WAKELOCK, false))
+						mClient.setWakelockEnabled(true);
+				} else {
+					mClient.stop();
+				}
+			}
+		}
+	};
+
+	private final OnCheckedChangeListener mOnRunOnBootChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			Preferences.putBoolean(Settings.this, Preferences.KEY_RUN_ON_BOOT, isChecked);
+			if (isChecked && mClient != null && !mRunButton.isChecked())
+				mRunButton.setChecked(true);
+		}
+	};
+
+	private final OnCheckedChangeListener mOnWakelockChangeListener = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			Preferences.putBoolean(Settings.this, Preferences.KEY_WAKELOCK, isChecked);
+			if (mClient != null && mClient.isRunning())
+				mClient.setWakelockEnabled(isChecked);
+		}
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		setContentView(R.layout.settings);
+		mRunButton = (ToggleButton) findViewById(R.id.run);
+		mRunButton.setOnCheckedChangeListener(mOnRunChangeListener);
+
+		mTextStatus = (TextView) findViewById(R.id.status);
+
+		mLogListAdapter = new ArrayAdapter<String>(this, R.layout.log_item, mLogListArray);
+
+		mLogListView = (ListView) findViewById(R.id.log_list);
+		mLogListView.setAdapter(mLogListAdapter);
+		mLogListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
+
+		CheckBox checkbox = (CheckBox) findViewById(R.id.run_on_boot);
+		checkbox.setOnCheckedChangeListener(mOnRunOnBootChangeListener);
+		if (Preferences.getBoolean(this, Preferences.KEY_RUN_ON_BOOT, false))
+			checkbox.setChecked(true);
+
+		checkbox = (CheckBox) findViewById(R.id.wakelock);
+		checkbox.setOnCheckedChangeListener(mOnWakelockChangeListener);
+		if (Preferences.getBoolean(this, Preferences.KEY_WAKELOCK, false))
+			checkbox.setChecked(true);
+
+		super.onCreate(savedInstanceState);
+	}
+
+	private void connectClient() {
+		mClient = new Main.Client(this, new Main.Client.Callback() {
+
+			private void removeMessages() {
+				/* don't remove log messages */
+				mHandler.removeMessages(MSG_STOPPED);
+				mHandler.removeMessages(MSG_STARTED);
+				mHandler.removeMessages(MSG_ERROR);
+			}
+
+			@Override
+			public void onStopped() {
+				removeMessages();
+				mHandler.sendEmptyMessage(MSG_STOPPED);
+			}
+
+			@Override
+			public void onStarted() {
+				removeMessages();
+				mHandler.sendEmptyMessage(MSG_STARTED);
+			}
+
+			@Override
+			public void onError(String error) {
+				removeMessages();
+				mHandler.sendMessage(Message.obtain(mHandler, MSG_ERROR, error));
+			}
+
+			@Override
+			public void onLog(int priority, String msg) {
+				mHandler.sendMessage(Message.obtain(mHandler, MSG_LOG, priority, 0, msg));
+			}
+		});
+	}
+
+	@Override
+	protected void onStart() {
+		mFirstRun = false;
+		connectClient();
+		super.onStart();
+	}
+
+	@Override
+	protected void onStop() {
+		mClient.release();
+		mClient = null;
+		super.onStop();
+	}
+}
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf config.cache build
-mkdir build
-
-aclocal -I m4 $ACLOCAL_FLAGS
-autoheader
-automake --add-missing $AUTOMAKE_FLAGS
-autoconf
--- a/build/pkg-config.sh
+++ b/build/pkg-config.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+BIN=`dirname $0`
+ROOT=`dirname "$BIN"`
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR="${ROOT}/lib/pkgconfig:${ROOT}/share/pkgconfig"
+
+exec /usr/bin/pkg-config "$@"
--- a/configure.ac
+++ b/configure.ac
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -0,0 +1,214 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['sphinx.ext.intersphinx']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Music Player Daemon'
+copyright = '2003-2018 The Music Player Daemon Project'
+author = 'Max Kellermann'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.21.3'
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'classic'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = ''
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
--- a/doc/developer.rst
+++ b/doc/developer.rst
@@ -0,0 +1,128 @@
+Developer's Manual
+##################
+
+Introduction
+============
+
+This is a guide for those who wish to hack on the MPD source code.  MPD is an open project, and we are always happy about contributions.  So far, more than 150 people have contributed patches. This document is work in progress.  Most of it may be incomplete yet.  Please help!
+
+Code Style
+==========
+
+* indent with tabs (width 8)
+* don't write CPP when you can write C++: use inline functions and constexpr instead of macros
+* comment your code, document your APIs
+* the code should be C++14 compliant, and must compile with :program:`GCC` 6.0 and :program:`clang` 3.4
+* report error conditions with C++ exceptions, preferable derived from :envvar:`std::runtime_error`
+* all code must be exception-safe
+* classes and functions names use CamelCase; variables are lower-case with words separated by underscore
+
+Some example code:
+~~~~~~~~~~~~~~~~~~
+
+.. code-block:: c
+
+    Foo(const char *abc, int xyz)
+    {
+        if (abc == nullptr) {
+                LogWarning("Foo happened!");
+                return -1;
+        }
+
+        return xyz;
+    }
+
+Hacking The Source
+==================
+
+MPD sources are managed in a git repository on
+`Github <https://github.com/MusicPlayerDaemon/>`_.
+
+Always write your code against the latest git:
+
+.. code-block:: none
+
+    git clone git://github.com/MusicPlayerDaemon/MPD
+
+If you already have a clone, update it:
+
+.. code-block:: none
+
+    git pull --rebase git://github.com/MusicPlayerDaemon/MPD master
+
+You can do without :code:`--rebase`, but we recommend that you rebase
+your repository on the "master" repository all the time.
+
+Configure with the option :code:`--werror`.  Enable as many plugins as
+possible, to be sure that you don't break any disabled code.
+
+Don't mix several changes in one single patch.  Create a separate patch for every change. Tools like :program:`stgit` help you with that. This way, we can review your patches more easily, and we can pick the patches we like most first.
+
+Basic stgit usage
+-----------------
+
+stgit allows you to create a set of patches and refine all of them: you can go back to any patch at any time, and re-edit it (both the code and the commit message). You can reorder patches and insert new patches at any position. It encourages creating separate patches for tiny changes.
+
+stgit needs to be initialized on a git repository:
+
+.. code-block:: sh
+
+    stg init
+
+Before you edit the code, create a patch:
+
+.. code-block:: sh
+
+    stg new my-patch-name
+
+stgit now asks you for the commit message.
+
+Now edit the code. Once you're finished, you have to "refresh" the patch, i.e. your edits are incorporated into the patch you have created:
+
+.. code-block:: sh
+
+    stg refresh
+
+You may now continue editing the same patch, and refresh it as often as you like. Create more patches, edit and refresh them.
+
+To view the list of patches, type stg series. To go back to a specific patch, type stg goto my-patch-name; now you can re-edit it (don't forget stg refresh when you're finished with that patch).
+
+When the whole patch series is finished, convert stgit patches to git commits:
+
+.. code-block:: sh
+
+    stg commit
+
+Submitting Patches
+==================
+
+Send your patches to the mailing list:
+Email: `mpd-devel <mpd-devel@musicpd.org>`_
+
+:program:`git pull` requests are preferred.
+
+Development Tools
+=================
+
+Clang Static Analyzer
+---------------------
+
+ The `static analyzer <http://clang-analyzer.llvm.org/>`_ is a tool that helps find bugs. To run it on the MPD code base, install LLVM and clang. configure MPD to use clang:
+
+.. code-block:: sh
+
+    ./configure --enable-debug CXX=clang++ CC=clang ...
+
+It is recommended to use :code:`--enable-debug`, because the analyzer
+takes advantage of :dfn:`assert()` calls, which are only enabled in
+the debug build.
+
+Now run the analyzer:
+
+.. code-block:: sh
+
+    scan-build --use-c++=clang++ --use-cc=clang make
+
+The options :code:`--use-c++` and :code:`--use-cc` are necessary
+because it invokes :command:`cc` for actually compiling the sources by
+default. That breaks, because MPD requires a C99 compiler.
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -1,207 +0,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "docbook/dtd/xml/4.2/docbookx.dtd">
-<book>
-  <title>The Music Player Daemon - Developer's Manual</title>
-
-  <chapter>
-    <title>Introduction</title>
-
-    <para>
-      This is a guide for those who wish to hack on the MPD source
-      code.  MPD is an open project, and we are always happy about
-      contributions.  So far, more than 150 people have contributed
-      patches.
-    </para>
-
-    <para>
-      This document is work in progress.  Most of it may be incomplete
-      yet.  Please help!
-    </para>
-  </chapter>
-
-  <chapter>
-    <title>Code Style</title>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          indent with tabs (width 8)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          don't write CPP when you can write C++: use inline
-          functions and constexpr instead of macros
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          the code should be C++11 compliant, and must compile with
-          <application>GCC</application> 4.6 and
-          <application>clang</application> 3.2
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Some example code:
-        </para>
-
-        <programlisting lang="C">static inline int
-foo(const char *abc, int xyz)
-{
-        if (abc == NULL) {
-                LogWarning("Foo happened!");
-                return -1;
-        }
-
-        return xyz;
-}
-        </programlisting>
-      </listitem>
-    </itemizedlist>
-  </chapter>
-
-  <chapter>
-    <title>Hacking The Source</title>
-
-    <para>
-      MPD sources are managed in a git repository on <ulink
-      url="http://git.musicpd.org/">git.musicpd.org</ulink>.
-    </para>
-
-    <para>
-      Always write your code against the latest git:
-    </para>
-
-    <programlisting>git clone git://git.musicpd.org/master/mpd.git</programlisting>
-
-    <para>
-      If you already have a clone, update it:
-    </para>
-
-    <programlisting>git pull --rebase git://git.musicpd.org/master/mpd.git master</programlisting>
-
-    <para>
-      You can do without "--rebase", but we recommend that you rebase
-      your repository on the "master" repository all the time.
-    </para>
-
-    <para>
-      Configure with the options <option>--enable-debug
-      --enable-werror</option>.  Enable as many plugins as possible,
-      to be sure that you don't break any disabled code.
-    </para>
-
-    <para>
-      Don't mix several changes in one single patch.  Create a
-      separate patch for every change.  Tools like
-      <application>stgit</application> help you with that.  This way,
-      we can review your patches more easily, and we can pick the
-      patches we like most first.
-    </para>
-
-
-    <section>
-      <title> Basic stgit usage</title>
-
-      <para>
-        stgit allows you to create a set of patches and refine all of
-        them: you can go back to any patch at any time, and re-edit it
-        (both the code and the commit message). You can reorder
-        patches and insert new patches at any position. It encourages
-        creating separate patches for tiny changes.
-      </para>
-
-      <para>
-        stgit needs to be initialized on a git repository: stg init
-      </para>
-
-      <para>
-        Before you edit the code, create a patch: stg new
-        my-patch-name (stgit now asks you for the commit message).
-      </para>
-
-      <para>
-        Now edit the code. Once you're finished, you have to "refresh"
-        the patch, i.e. your edits are incorporated into the patch you
-        have created: stg refresh
-      </para>
-
-      <para>
-        You may now continue editing the same patch, and refresh it as
-        often as you like. Create more patches, edit and refresh them.
-      </para>
-
-      <para>
-        To view the list of patches, type stg series. To go back to a
-        specific patch, type stg goto my-patch-name; now you can
-        re-edit it (don't forget stg refresh when you're finished with
-        that patch).
-      </para>
-
-      <para>
-        When the whole patch series is finished, convert stgit patches
-        to git commits: stg commit
-      </para>
-    </section>
-  </chapter>
-
-  <chapter>
-    <title>Submitting Patches</title>
-
-    <para>
-      Send your patches to the mailing list:
-      <email>mpd-devel@musicpd.org</email> (<ulink
-      url="http://mailman.blarg.de/listinfo/mpd-devel">subscribe
-      here</ulink>)
-    </para>
-
-    <para>
-      <command>git pull</command> requests are preferred.  Regular
-      contributors can get <ulink
-      url="http://git.musicpd.org/account-policy.html">an account on
-      git.musicpd.org</ulink>, but any public git repository will do.
-    </para>
-  </chapter>
-
-  <chapter>
-    <title>Development Tools</title>
-
-    <section>
-      <title>Clang Static Analyzer</title>
-
-      <para>
-        The <ulink url="http://clang-analyzer.llvm.org/">clang static
-        analyzer</ulink> is a tool that helps find bugs.  To run it on
-        the MPD code base, install LLVM and clang.  Configure MPD to
-        use clang:
-      </para>
-
-      <programlisting>./configure --enable-debug CXX=clang++ CC=clang ...</programlisting>
-
-      <para>
-        It is recommended to use <option>--enable-debug</option>,
-        because the analyzer takes advantage of
-        <function>assert()</function> calls, which are only enabled in
-        the debug build.
-      </para>
-
-      <para>
-        Now run the analyzer:
-      </para>
-
-      <programlisting>scan-build --use-c++=clang++ --use-cc=clang make</programlisting>
-
-      <para>
-        The options <option>--use-c++</option> and
-        <option>--use-cc</option> are necessary because it invokes
-        <command>cc</command> for actually compiling the sources by
-        default.  That breaks, because MPD requires a C99 compiler.
-      </para>
-    </section>
-  </chapter>
-</book>
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
--- a/doc/include/tags.xml
+++ b/doc/include/tags.xml
@@ -0,0 +1,165 @@
+<?xml version='1.0' encoding="utf-8"?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                              "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<itemizedlist>
+  <listitem>
+    <para>
+      <varname>artist</varname>: the artist name.  Its meaning is not
+      well-defined; see <varname>composer</varname> and
+      <varname>performer</varname> for more specific tags.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>artistsort</varname>: same as
+      <varname>artist</varname>, but for sorting.  This usually omits
+      prefixes such as "The".
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>album</varname>: the album name.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumsort</varname>: same as <varname>album</varname>,
+      but for sorting.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumartist</varname>: on multi-artist albums, this is
+      the artist name which shall be used for the whole album.  The
+      exact meaning of this tag is not well-defined.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>albumartistsort</varname>: same as
+      <varname>albumartist</varname>, but for sorting.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>title</varname>: the song title.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>track</varname>: the decimal track number within the
+      album.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>name</varname>: a name for this song.  This is not the
+      song title.  The exact meaning of this tag is not well-defined.
+      It is often used by badly configured internet radio stations
+      with broken tags to squeeze both the artist name and the song
+      title in one tag.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>genre</varname>: the music genre.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>date</varname>: the song's release date.  This is
+      usually a 4-digit year.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>composer</varname>: the artist who composed the song.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>performer</varname>: the artist who performed the song.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>comment</varname>: a human-readable comment about this
+      song.  The exact meaning of this tag is not well-defined.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>disc</varname>: the decimal disc number in a multi-disc
+      album.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_artistid</varname>: the artist id in the
+      <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_albumid</varname>: the album id in the
+      <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_albumartistid</varname>: the album artist
+      id in the <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_trackid</varname>: the track id in the
+      <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_releasetrackid</varname>: the release track
+      id in the <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>
+      <varname>musicbrainz_workid</varname>: the work id in the
+      <ulink
+      url="https://picard.musicbrainz.org/docs/mappings/">MusicBrainz</ulink>
+      database.
+    </para>
+  </listitem>
+</itemizedlist>
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -0,0 +1,18 @@
+Music Player Daemon
+===================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   user
+   plugins
+   developer
+   protocol
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -0,0 +1,33 @@
+install_man(['mpd.1', 'mpd.conf.5'])
+
+sphinx = find_program('sphinx-build')
+sphinx_output = custom_target(
+  'HTML documentation',
+  output: 'html',
+  input: [
+    'index.rst', 'user.rst', 'developer.rst',
+    'plugins.rst',
+    'protocol.rst',
+    'conf.py',
+  ],
+  command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
+  build_by_default: true,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+custom_target(
+  'upload',
+  input: sphinx_output,
+  output: 'upload',
+  build_always_stale: true,
+  command: [
+    'rsync', '-vpruz', '--delete', meson.current_build_dir() + '/',
+    'www.musicpd.org:/var/www/mpd/doc/',
+    '--chmod=Dug+rwx,Do+rx,Fug+rw,Fo+r',
+    '--include=html', '--include=html/**',
+    '--exclude=*',
+  ],
+)
+  
+  
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -48,8 +48,8 @@ mpd.conf(5), mpc(1)
 .SH BUGS
 If you find a bug, please report it at
 .br
-<\fBhttp://bugs.musicpd.org/bug_report_page.php\fP>.
+<\fBhttps://github.com/MusicPlayerDaemon/MPD/issues/\fP>.
 .SH AUTHORS
-Max Kellermann <max@duempel.org>
+Max Kellermann <max.kellermann@gmail.com>

 Special thanks to all the people that provided feedback and patches.
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -72,19 +72,6 @@ never run as root, and you may use this option to make MPD change its
 user id after initialization.  Do not use this option if you start MPD
 as an unprivileged user.
 .TP
-.B bind_to_address <ip address or hostname or any>
-This specifies which address mpd binds to and listens on.  Multiple
-bind_to_address parameters may be specified.  The default is "any", which binds
-to all available addresses.
-
-You can set a port that is different from the global port setting,
-e.g. "localhost:6602".  IPv6 addresses must be enclosed in square
-brackets if you want to configure a port, e.g. "[::1]:6602".
-
-To bind to a Unix domain socket, specify an absolute path or a path starting
-with a tilde (~).  For a system-wide MPD, we suggest the path
-"\fB/var/run/mpd/socket\fP".
-.TP
 .B port <port>
 This specifies the port that mpd listens on.  The default is 6600.
 .TP
@@ -112,23 +99,8 @@ information will be published with Zeroconf.  The default is yes.
 .B zeroconf_name <name>
 If Zeroconf is enabled, this is the service name to publish.  This name should
 be unique to your local network, but name collisions will be properly dealt
-with.  The default is "Music Player".
-.TP
-.B password <password@permissions>
-This specifies a password for access to mpd.  The format is
-"password@permissions" where permissions is a comma delimited list composed
-of "read", "add", "control", and/or "admin".  "read" allows for reading of the
-database, displaying the current playlist, and current status of mpd.  "add"
-allows for adding songs and loading playlists.  "control" allows for all other
-player and playlist manipulations.  "admin" allows the db to be updated and for
-the client to kill mpd.  An example value is "somePassword@read,add".  Multiple
-password parameters may be specified.
-.TP
-.B default_permissions <permissions>
-This specifies the permissions of a client that has not been authenticated
-using a password.  The format of permissions is specified in the description of
-the "password" config parameter.  If no passwords are specified, the default is
-"read,add,control,admin", otherwise it is "" (no permissions).
+with.  The default is "Music Player @ %h", where %h will be replaced with the
+hostname of the machine running MPD.
 .TP
 .B audio_output
 See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections
@@ -156,36 +128,10 @@ This specifies the character set used for the filesystem.  A list of supported
 character sets can be obtained by running "iconv \-l".  The default is
 determined from the locale when the db was originally created.
 .TP
-.B id3v1_encoding <charset>
-This specifies the character set which ID3v1 tags are encoded in.  A list of
-supported character sets can be obtained by running "iconv \-l".  The default is
-to let libid3tag convert them (from ISO-8859-1, as the standard specifies) and
-do no additional conversion.
-.TP
-.B gapless_mp3_playback <yes or no>
-This specifies whether to support gapless playback of MP3s which have the
-necessary headers.  Useful if your MP3s have headers with incorrect
-information.  If you have such MP3s, it is highly recommended that you fix them
-using vbrfix (available from <http://www.willwap.co.uk/Programs/vbrfix.php>)
-instead of disabling gapless MP3 playback.  The default is to support gapless
-MP3 playback.
-.TP
 .B save_absolute_paths_in_playlists <yes or no>
 This specifies whether relative or absolute paths for song filenames are used
 when saving playlists.  The default is "no".
 .TP
-.B metadata_to_use <tags>
-This specifies the tag types that will be scanned for and made available to
-clients.  Note that you must recreate (not update) your database for changes to
-this parameter to take effect.  Possible values are artist, album, title,
-track, name, genre, date, composer, performer, comment, disc,
-musicbrainz_artistid, musicbrainz_albumid, musicbrainz_albumartistid,
-musicbrainz_releasetrackid, musicbrainz_trackid.  Multiple tags may be specified
-as a comma separated list.
-An example value is "artist,album,title,track".  The special value "none" may
-be used alone to disable all metadata.  The default is to use all known tag
-types except for comments and those starting with "musicbrainz".
-.TP
 .B auto_update <yes or no>
 This specifies the whether to support automatic update of music database when
 files are changed in music_directory. The default is to disable autoupdate
@@ -195,16 +141,6 @@ of database.
 Limit the depth of the directories being watched, 0 means only watch
 the music directory itself.  There is no limit by default.
 .TP
-.B despotify_user <name>
-This specifies the user to use when logging in to Spotify using the despotify plugins.
-.TP
-.B despotify_password <name>
-This specifies the password to use when logging in to Spotify using the despotify plugins.
-.TP
-.B despotify_high_bitrate <yes or no>
-This specifies if the requested bitrate for Spotify should be high or not. Higher sounds
-better but requires more processing and higher bandwidth. Default is yes.
-.TP
 .SH REQUIRED AUDIO OUTPUT PARAMETERS
 .TP
 .B type <type>
@@ -254,11 +190,6 @@ probably only useful if your alsa device has more than one
 identically\-named mixer control.  The default is "0".  Use "amixer
 scontrols" to see the list of controls with their indexes.
 .TP
-.B use_mmap <yes or no>
-Setting this allows you to use memory-mapped I/O.  Certain hardware setups may
-benefit from this, but most do not.  Most users do not need to set this.  The
-default is to not use memory-mapped I/O.
-.TP
 .B auto_resample <yes or no>
 Setting this to "no" disables ALSA's software resampling, if the
 hardware does not support a specific sample rate.  This lets MPD do
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -32,7 +32,7 @@
 # settings.
 #
 # The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
+# setting defaults to logging to syslog.
 #
 #log_file			"~/.mpd/log"
 #
@@ -75,7 +75,8 @@
 #
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other then the default, any.
-# This setting can deny access to control of the daemon.
+# This setting can deny access to control of the daemon. Not effective if
+# systemd socket activiation is in use.
 #
 # For network
 #bind_to_address		"any"
@@ -95,14 +96,6 @@
 #
 #log_level			"default"
 #
-# If you have a problem with your MP3s ending abruptly it is recommended that 
-# you set this argument to "no" to attempt to fix the problem. If this solves
-# the problem, it is highly recommended to fix the MP3 files with vbrfix
-# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which
-# point gapless MP3 playback can be enabled.
-#
-#gapless_mp3_playback			"yes"
-#
 # Setting "restore_paused" to "yes" puts MPD into pause mode instead
 # of starting playback after startup.
 #
@@ -115,9 +108,13 @@
 #
 # This setting defines a list of tag types that will be extracted during the
 # audio file discovery process. The complete list of possible values can be
-# found in the mpd.conf man page.
+# found in the user manual.
 #metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
 #
+# This example just enables the "comment" tag without disabling all
+# the other supported tags:
+#metadata_to_use "+comment"
+#
 # This setting enables automatic update of MPD's database when files in 
 # music_directory are changed.
 #
@@ -154,9 +151,9 @@
 #zeroconf_enabled		"yes"
 #
 # The argument to this setting will be the Zeroconf / Avahi unique name for
-# this MPD server on the network.
+# this MPD server on the network. %h will be replaced with the hostname.
 #
-#zeroconf_name			"Music Player"
+#zeroconf_name			"Music Player @ %h"
 #
 ###############################################################################

@@ -164,7 +161,7 @@
 # Permissions #################################################################
 #
 # If this setting is set, MPD will require password authorization. The password
-# can setting can be specified multiple times for different password profiles.
+# setting can be specified multiple times for different password profiles.
 #
 #password                        "password@read,add,control,admin"
 #
@@ -231,7 +228,7 @@ input {
 #
 #audio_output {
 #	type		"shout"
-#	encoding	"ogg"			# optional
+#	encoder		"vorbis"		# optional
 #	name		"My Shout Stream"
 #	host		"localhost"
 #	port		"8000"
@@ -304,6 +301,23 @@ input {
 ##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
 #}
 #
+# An example of an sndio output.
+#
+#audio_output {
+#	type		"sndio"
+#	name		"sndio output"
+#	mixer_type	"hardware"
+#}
+#
+# An example of an OS X output:
+#
+#audio_output {
+#	type		"osx"
+#	name		"My OS X Device"
+##	device		"Built-in Output"	# optional
+##	channel_map      "-1,-1,0,1"	# optional
+#}
+#
 ## Example "pipe" output:
 #
 #audio_output {
@@ -325,13 +339,6 @@ input {
 #	mixer_type      "none"			# optional
 #}
 #
-# If MPD has been compiled with libsamplerate support, this setting specifies 
-# the sample rate converter to use.  Possible values can be found in the 
-# mpd.conf man page or the libsamplerate documentation. By default, this is
-# setting is disabled.
-#
-#samplerate_converter		"Fastest Sinc Interpolator"
-#
 ###############################################################################


@@ -380,34 +387,4 @@ input {
 #
 #filesystem_charset		"UTF-8"
 #
-# This setting controls the encoding that ID3v1 tags should be converted from.
-#
-#id3v1_encoding			"ISO-8859-1"
-#
 ###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-#  Location of your songlengths file, as distributed with the HVSC.
-#  The sidplay plugin checks this for matching MD5 fingerprints.
-#  See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-#  This is the default playing time in seconds for songs not in the
-#  songlength database, or in case you're not using a database.
-#  A value of 0 means play indefinitely.
-#
-# filter:
-#  Turns the SID filter emulation on or off.
-#
-#decoder {
-#	plugin			"sidplay"
-#	songlength_database	"/media/C64Music/DOCUMENTS/Songlengths.txt"
-#	default_songlength	"120"
-#	filter "true"
-#}
-#
-###############################################################################
-
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -0,0 +1,990 @@
+User's Manual
+#############
+
+Introduction
+************
+
+Music Player Daemon (:program:`MPD`) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol.
+
+This document is work in progress. Most of it may be incomplete yet. Please help!
+
+Installation
+************
+
+Installing on Debian/Ubuntu
+---------------------------
+
+Install the package :file:`mpd` via :program:`apt`:
+
+.. code-block:: none
+
+    apt install mpd
+
+When installed this way, :program:`MPD` by default looks for music in :file:`/var/lib/mpd/music/`; this may not be correct. Look at your :file:`/etc/mpd.conf` file... 
+
+.. note::
+
+   Debian and Ubuntu are infamous for shipping heavily outdated
+   software.  The :program:`MPD` version in their respective stable
+   releases are usually too old to be supported by this project.
+   Ironically, the :program:`MPD` version in Debian "*unstable*" is
+   more stable than the version in Debian "*stable*".
+
+
+Installing on Android
+---------------------
+
+An experimental Android build is available on Google Play. After installing and launching it, :program:`MPD` will scan the music in your Music directory and you can control it as usual with a :program:`MPD` client.
+
+If you need to tweak the configuration, you can create a file called :file:`mpd.conf` on the data partition (the directory which is returned by Android's :dfn:`getExternalStorageDirectory()` API function). 
+
+ALSA is not available on Android; only the :ref:`OpenSL ES
+<sles_output>` output plugin can be used for local playback.
+
+Compiling from source
+---------------------
+
+Download the source tarball from the `MPD home page <https://musicpd.org>`_ and unpack it:
+
+.. code-block:: none
+
+    tar xf mpd-version.tar.xz
+    cd mpd-version
+
+In any case, you need:
+
+* a C++14 compiler (e.g. gcc 6.0 or clang 3.9)
+* `Meson 0.47.2 <http://mesonbuild.com/>`__ and `Ninja
+  <https://ninja-build.org/>`__
+* Boost 1.58
+* pkg-config 
+
+Each plugin usually needs a codec library, which you also need to
+install. Check the :doc:`plugins` for details about required libraries
+
+For example, the following installs a fairly complete list of build dependencies on Debian Jessie:
+
+.. code-block:: none
+
+    apt install g++ \
+      libpcre3-dev \
+      libmad0-dev libmpg123-dev libid3tag0-dev \
+      libflac-dev libvorbis-dev libopus-dev \
+      libadplug-dev libaudiofile-dev libsndfile1-dev libfaad-dev \
+      libfluidsynth-dev libgme-dev libmikmod2-dev libmodplug-dev \
+      libmpcdec-dev libwavpack-dev libwildmidi-dev \
+      libsidplay2-dev libsidutils-dev libresid-builder-dev \
+      libavcodec-dev libavformat-dev \
+      libmp3lame-dev libtwolame-dev libshine-dev \
+      libsamplerate0-dev libsoxr-dev \
+      libbz2-dev libcdio-paranoia-dev libiso9660-dev libmms-dev \
+      libzzip-dev \
+      libcurl4-gnutls-dev libyajl-dev libexpat-dev \
+      libasound2-dev libao-dev libjack-jackd2-dev libopenal-dev \
+      libpulse-dev libshout3-dev \
+      libsndio-dev \
+      libmpdclient-dev \
+      libnfs-dev libsmbclient-dev \
+      libupnp-dev \
+      libavahi-client-dev \
+      libsqlite3-dev \
+      libsystemd-dev libwrap0-dev \
+      libgtest-dev \
+      libboost-dev \
+      libicu-dev
+      
+
+Now configure the source tree:
+
+.. code-block:: none
+
+ meson . output/release --buildtype=debugoptimized -Db_ndebug=true
+
+The following command shows a list of compile-time options:
+
+.. code-block:: none
+
+ meson configure output/release
+
+When everything is ready and configured, compile:
+
+.. code-block:: none
+
+ ninja -C output/release
+
+And install:
+
+.. code-block:: none
+
+ ninja -C output/release install
+
+Compiling for Windows
+---------------------
+
+Even though it does not "feel" like a Windows application, :program:`MPD` works well under Windows. Its build process follows the "Linux style" and may seem awkward for Windows people (who are not used to compiling their software, anyway).
+
+Basically, there are two ways to compile :program:`MPD` for Windows:
+
+* Build as described above: with :program:`meson` and
+  :program:`ninja`.  To cross-compile from Linux, you need `a Meson
+  cross file <https://mesonbuild.com/Cross-compilation.html>`__.
+
+  The remaining difficulty is installing all the external libraries.
+  And :program:`MPD` usually needs many, making this method cumbersome
+  for the casual user.
+
+* Build on Linux for Windows using :program:`MPD`'s library build script. 
+
+This section is about the latter.
+
+Just like with the native build, unpack the :program:`MPD` source
+tarball and change into the directory.  Then, instead of
+:program:`meson`, type:
+
+.. code-block:: none
+
+ mkdir -p output/win64
+ cd output/win64
+ ../../win32/build.py --64
+
+This downloads various library sources, and then configures and builds
+:program:`MPD` (for x64; to build a 32 bit binary, pass
+:code:`--32`). The resulting EXE files is linked statically, i.e. it
+contains all the libraries already and you do not need carry DLLs
+around. It is large, but easy to use. If you wish to have a small
+mpd.exe with DLLs, you need to compile manually, without the
+:file:`build.py` script.
+
+Compiling for Android
+---------------------
+
+:program:`MPD` can be compiled as an Android app. It can be installed easily with Google Play, but if you want to build it from source, follow this section.
+
+You need:
+
+* Android SDK
+* Android NDK 
+
+Just like with the native build, unpack the :program:`MPD` source
+tarball and change into the directory.  Then, instead of
+:program:`meson`, type:
+
+.. code-block:: none
+
+ mkdir -p output/android
+ cd output/android
+ ../../android/build.py SDK_PATH NDK_PATH ABI
+ meson configure -Dandroid_debug_keystore=$HOME/.android/debug.keystore
+ ninja android/apk/mpd-debug.apk
+
+:envvar:`SDK_PATH` is the absolute path where you installed the
+Android SDK; :envvar:`NDK_PATH` is the Android NDK installation path;
+ABI is the Android ABI to be built, e.g. ":code:`arm64-v8a`".
+
+This downloads various library sources, and then configures and builds :program:`MPD`. 
+
+systemd socket activation
+-------------------------
+
+Using systemd, you can launch :program:`MPD` on demand when the first client attempts to connect.
+
+:program:`MPD` comes with two systemd unit files: a "service" unit and
+a "socket" unit.  These will be installed to the directory specified
+with :code:`-Dsystemd_system_unit_dir=...`,
+e.g. :file:`/lib/systemd/system`.
+
+To enable socket activation, type:
+
+.. code-block:: none
+
+    systemctl enable mpd.socket
+    systemctl start mpd.socket
+
+In this configuration, :program:`MPD` will ignore the :ref:`listener
+settings <listeners>` (``bind_to_address`` and ``port``).
+
+systemd user unit
+-----------------
+
+You can launch :program:`MPD` as a systemd user unit.  These will be
+installed to the directory specified with
+:code:`-Dsystemd_user_unit_dir=...`,
+e.g. :file:`/usr/lib/systemd/user` or
+:file:`$HOME/.local/share/systemd/user`.
+
+Once the user unit is installed, you can start and stop :program:`MPD` like any other service:
+
+.. code-block:: none
+
+    systemctl --user start mpd
+
+To auto-start :program:`MPD` upon login, type:
+
+.. code-block:: none
+
+    systemctl --user enable mpd
+
+Configuration
+*************
+
+The Configuration File
+----------------------
+
+:program:`MPD` reads its configuration from a text file. Usually, that is :file:`/etc/mpd.conf`, unless a different path is specified on the command line. If you run :program:`MPD` as a user daemon (and not as a system daemon), the configuration is read from :file:`$XDG_CONFIG_HOME/mpd/mpd.conf` (usually :file:`~/.config/mpd/mpd.conf`). On Android, :file:`mpd.conf` will be loaded from the top-level directory of the data partition.
+
+Each line in the configuration file contains a setting name and its value, e.g.:
+
+:code:`connection_timeout "5"`
+
+For settings which specify a filesystem path, the tilde is expanded:
+
+:code:`music_directory "~/Music"`
+
+Some of the settings are grouped in blocks with curly braces, e.g. per-plugin settings:
+
+.. code-block:: none
+
+    audio_output {
+        type "alsa"
+        name "My ALSA output"
+        device "iec958:CARD=Intel,DEV=0"
+        mixer_control "PCM"
+    }
+
+The :code:`include` directive can be used to include settings from
+another file; the given file name is relative to the current file:
+
+.. code-block:: none
+
+  include "other.conf"
+
+Configuring the music directory
+-------------------------------
+
+When you play local files, you should organize them within a directory called the "music directory". This is configured in :program:`MPD` with the music_directory setting.
+
+By default, :program:`MPD` follows symbolic links in the music directory. This behavior can be switched off: :code:`follow_outside_symlinks` controls whether :program:`MPD` follows links pointing to files outside of the music directory, and :code:`follow_inside_symlinks` lets you disable symlinks to files inside the music directory.
+
+Instead of using local files, you can use storage plugins to access
+files on a remote file server. For example, to use music from the
+SMB/CIFS server ":file:`myfileserver`" on the share called "Music",
+configure the music directory ":file:`smb://myfileserver/Music`". For
+a recipe, read the Satellite :program:`MPD` section :ref:`satellite`.
+
+You can also use multiple storage plugins to assemble a virtual music directory consisting of multiple storages. 
+
+Configuring database plugins
+----------------------------
+
+If a music directory is configured, one database plugin is used. To configure this plugin, add a database block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    database {
+        plugin "simple"
+        path "/var/lib/mpd/db"
+    }
+    
+More information can be found in the :ref:`database_plugins`
+reference.
+
+Configuring neighbor plugins
+----------------------------
+
+All neighbor plugins are disabled by default to avoid unwanted overhead. To enable (and configure) a plugin, add a neighbor block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    neighbors {
+        plugin "smbclient"
+    }
+      
+More information can be found in the :ref:`neighbor_plugin` reference.
+
+Configuring input plugins
+-------------------------
+
+To configure an input plugin, add a input block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    input {
+        plugin "curl"
+        proxy "proxy.local"
+    }
+      
+
+The following table lists the input options valid for all plugins:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **plugin**
+     - The name of the plugin
+   * - **enabled yes|no**
+     - Allows you to disable a input plugin without recompiling. By default, all plugins are enabled.
+
+More information can be found in the :ref:`input_plugins` reference.
+
+Configuring decoder plugins
+---------------------------
+
+Most decoder plugins do not need any special configuration. To configure a decoder, add a decoder block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    decoder {
+        plugin "wildmidi"
+        config_file "/etc/timidity/timidity.cfg"
+    }
+      
+The following table lists the decoder options valid for all plugins:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **plugin**
+     - The name of the plugin
+   * - **enabled yes|no**
+     - Allows you to disable a decoder plugin without recompiling. By default, all plugins are enabled.
+
+More information can be found in the :ref:`decoder_plugins` reference.
+
+Configuring encoder plugins
+---------------------------
+
+Encoders are used by some of the output plugins (such as shout). The encoder settings are included in the audio_output section.
+
+More information can be found in the :ref:`encoder_plugins` reference.
+
+Configuring audio outputs
+-------------------------
+
+Audio outputs are devices which actually play the audio chunks produced by :program:`MPD`. You can configure any number of audio output devices, but there must be at least one. If none is configured, :program:`MPD` attempts to auto-detect. Usually, this works quite well with ALSA, OSS and on Mac OS X.
+
+To configure an audio output manually, add one or more audio_output blocks to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    audio_output {
+        type "alsa"
+        name "my ALSA device"
+        device "hw:0"
+    }
+
+The following table lists the audio_output options valid for all plugins:
+
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **type**
+     - The name of the plugin
+   * - **name**
+     - The name of the audio output. It is visible to the client. Some plugins also use it internally, e.g. as a name registered in the PULSE server.
+   * - **format**
+     -  Always open the audio output with the specified audio format samplerate:bits:channels), regardless of the format of the input file. This is optional for most plugins.
+
+        Any of the three attributes may be an asterisk to specify that this attribute should not be enforced, example: 48000:16:*. *:*:* is equal to not having a format specification.
+
+        The following values are valid for bits: 8 (signed 8 bit integer samples), 16, 24 (signed 24 bit integer samples padded to 32 bit), 32 (signed 32 bit integer samples), f (32 bit floating point, -1.0 to 1.0), "dsd" means DSD (Direct Stream Digital). For DSD, there are special cases such as "dsd64", which allows you to omit the sample rate (e.g. dsd512:2 for stereo DSD512, i.e. 22.5792 MHz).
+
+        The sample rate is special for DSD: :program:`MPD` counts the number of bytes, not bits. Thus, a DSD "bit" rate of 22.5792 MHz (DSD512) is 2822400 from :program:`MPD`'s point of view (44100*512/8).
+   * - **enabed yes|no**
+     - Specifies whether this audio output is enabled when :program:`MPD` is started. By default, all audio outputs are enabled. This is just the default setting when there is no state file; with a state file, the previous state is restored.
+   * - **tags yes|no**
+     - If set to no, then :program:`MPD` will not send tags to this output. This is only useful for output plugins that can receive tags, for example the httpd output plugin.
+   * - **always_on yes|no**
+     - If set to yes, then :program:`MPD` attempts to keep this audio output always open. This may be useful for streaming servers, when you don't want to disconnect all listeners even when playback is accidentally stopped.
+   * - **mixer_type hardware|software|null|none**
+     - Specifies which mixer should be used for this audio output: the hardware mixer (available for ALSA :ref:`alsa_plugin`, OSS :ref:`oss_plugin` and PulseAudio :ref:`pulse_plugin`), the software mixer, the "null" mixer (null; allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer :ref:`external_mixer`) or no mixer (none). By default, the hardware mixer is used for devices which support it, and none for the others.
+
+Configuring filters
+-------------------
+
+Filters are plugins which modify an audio stream.
+
+To configure a filter, add a filter block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    filter {
+        plugin "volume"
+        name "software volume"
+    }
+
+The following table lists the filter options valid for all plugins:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **plugin**
+     - The name of the plugin
+   * - **name**
+     - The name of the filter
+
+Configuring playlist plugins
+----------------------------
+
+Playlist plugins are used to load remote playlists (protocol commands load, listplaylist and listplaylistinfo). This is not related to :program:`MPD`'s playlist directory.
+
+To configure a playlist plugin, add a playlist_plugin block to :file:`mpd.conf`:
+
+.. code-block:: none
+
+    playlist_plugin {
+        name "m3u"
+        enabled "true"
+    }
+
+The following table lists the playlist_plugin options valid for all plugins:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **plugin**
+     - The name of the plugin
+   * - **enabled yes|no**
+     - Allows you to disable a playlist plugin without recompiling. By default, all plugins are enabled.
+
+More information can be found in the :ref:`playlist_plugins`
+reference.
+
+Audio Format Settings
+---------------------
+
+Global Audio Format
+~~~~~~~~~~~~~~~~~~~
+
+The setting audio_output_format forces :program:`MPD` to use one audio format for all outputs. Doing that is usually not a good idea. The values are the same as in format in the audio_output section.
+
+Resampler
+~~~~~~~~~
+
+Sometimes, music needs to be resampled before it can be played; for example, CDs use a sample rate of 44,100 Hz while many cheap audio chips can only handle 48,000 Hz. Resampling reduces the quality and consumes a lot of CPU. There are different options, some of them optimized for high quality and others for low CPU usage, but you can't have both at the same time. Often, the resampler is the component that is responsible for most of :program:`MPD`'s CPU usage. Since :program:`MPD` comes with high quality defaults, it may appear that :program:`MPD` consumes more CPU than other software.
+
+Check the :ref:`resampler_plugins` reference for a list of resamplers
+and how to configure them.
+
+Client Connections
+------------------
+
+.. _listeners:
+
+Listeners
+~~~~~~~~~
+
+The setting :code:`bind_to_address` specifies which addresses
+:program:`MPD` listens on for connections from clients.  It can be
+used multiple times to bind to more than one address.  Example::
+
+ bind_to_address "192.168.1.42"
+ bind_to_address "127.0.0.1"
+
+The default is "any", which binds to all available addresses.
+Additionally, MPD binds to :code:`$XDG_RUNTIME_DIR/mpd/socket` (if it
+was launched as a per-user daemon and no :code:`bind_to_address`
+setting exists).
+
+You can set a port that is different from the global port setting,
+e.g. "localhost:6602".  IPv6 addresses must be enclosed in square
+brackets if you want to configure a port::
+
+ bind_to_address "[::1]:6602"
+
+To bind to a local socket (UNIX domain socket), specify an absolute
+path or a path starting with a tilde (~).  Some clients default to
+connecting to :file:`/var/run/mpd/socket` so this may be a good
+choice::
+
+ bind_to_address "/var/run/mpd/socket"
+
+If no port is specified, the default port is 6600.  This default can
+be changed with the port setting::
+
+ port "6601"
+
+These settings will be ignored if `systemd socket activation`_ is
+used.
+
+
+Permissions and Passwords
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default, all clients are unauthenticated and have a full set of permissions. This can be restricted with the settings :code:`default_permissions` and :code:`password`.
+
+:code:`default_permissions` controls the permissions of a new client. Its value is a comma-separated list of permissions:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Name
+     - Description
+   * - **read**
+     - Allows reading of the database, displaying the current playlist, and current status of :program:`MPD`.
+   * - **add**
+     - Allows adding songs and loading playlists.
+   * - **control**
+     - Allows all other player and playlist manipulations.
+   * - **admin**
+     - Allows database updates and allows shutting down :program:`MPD`.
+
+:code:`local_permissions` may be used to assign other permissions to clients connecting on a local socket.
+
+:code:`password` allows the client to send a password to gain other permissions. This option may be specified multiple times with different passwords.
+
+Note that the :code:`password` option is not secure: passwords are sent in clear-text over the connection, and the client cannot verify the server's identity.
+
+Example:
+
+.. code-block:: none
+
+    default_permissions "read"
+    password "the_password@read,add,control"
+    password "the_admin_password@read,add,control,admin"
+
+Other Settings
+--------------
+
+.. _metadata_to_use:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **metadata_to_use TAG1,TAG2,...**
+     - Use only the specified tags, and ignore the others. This
+       setting can reduce the database size and :program:`MPD`'s
+       memory usage by omitting unused tags. By default, all tags but
+       comment are enabled. The special value "none" disables all
+       tags.
+
+       If the setting starts with ``+`` or ``-``, then the following
+       tags will be added or remoted to/from the current set of tags.
+       This example just enables the "comment" tag without disabling all
+       the other supported tags
+
+         metadata_to_use "+comment"
+
+       Section :ref:`tags` contains a list of supported tags.
+
+The State File
+~~~~~~~~~~~~~~
+
+ The state file is a file where :program:`MPD` saves and restores its state (play queue, playback position etc.) to keep it persistent across restarts and reboots. It is an optional setting.
+
+:program:`MPD` will attempt to load the state file during startup, and will save it when shutting down the daemon. Additionally, the state file is refreshed every two minutes (after each state change).
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **state_file PATH**
+     - Specify the state file location. The parent directory must be writable by the :program:`MPD` user (+wx).
+   * - **state_file_interval SECONDS**
+     - Auto-save the state file this number of seconds after each state change. Defaults to 120 (2 minutes).
+
+The Sticker Database
+~~~~~~~~~~~~~~~~~~~~
+
+"Stickers" are pieces of information attached to songs. Some clients
+use them to store ratings and other volatile data. This feature
+requires :program:`SQLite`, compile-time configure option
+:code:`-Dsqlite=...`.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **sticker_file PATH**
+     - The location of the sticker database.
+
+Resource Limitations
+~~~~~~~~~~~~~~~~~~~~
+
+These settings are various limitations to prevent :program:`MPD` from using too many resources (denial of service).
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **connection_timeout SECONDS**
+     - If a client does not send any new data in this time period, the connection is closed. Clients waiting in "idle" mode are excluded from this. Default is 60.
+   * - **max_connections NUMBER**
+     - This specifies the maximum number of clients that can be connected to :program:`MPD` at the same time. Default is 5.
+   * - **max_playlist_length NUMBER**
+     - The maximum number of songs that can be in the playlist. Default is 16384.
+   * - **max_command_list_size KBYTES**
+     - The maximum size a command list. Default is 2048 (2 MiB).
+   * - **max_output_buffer_size KBYTES**
+     - The maximum size of the output buffer to a client (maximum response size). Default is 8192 (8 MiB).
+
+Buffer Settings
+~~~~~~~~~~~~~~~
+
+Do not change these unless you know what you are doing.
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **audio_buffer_size KBYTES**
+     - Adjust the size of the internal audio buffer. Default is 4096 (4 MiB).
+
+Zeroconf
+~~~~~~~~
+
+If Zeroconf support (`Avahi <http://avahi.org/>`_ or Apple's Bonjour)
+was enabled at compile time with :code:`-Dzeroconf=...`,
+:program:`MPD` can announce its presence on the network. The following
+settings control this feature:
+
+.. list-table::
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Setting
+     - Description
+   * - **zeroconf_enabled yes|no**
+     - Enables or disables this feature. Default is yes.
+   * - **zeroconf_name NAME**
+     - The service name to publish via Zeroconf. The default is "Music Player @ %h".
+       %h will be replaced with the hostname of the machine running :program:`MPD`.
+
+Advanced configuration
+**********************
+
+.. _satellite:
+
+Satellite setup
+---------------
+
+:program:`MPD` runs well on weak machines such as the Raspberry Pi. However, such hardware tends to not have storage big enough to hold a music collection. Mounting music from a file server can be very slow, especially when updating the database.
+
+One approach for optimization is running :program:`MPD` on the file server, which not only exports raw files, but also provides access to a readily scanned database. Example configuration:
+
+.. code-block:: none
+
+    music_directory "nfs://fileserver.local/srv/mp3"
+    #music_directory "smb://fileserver.local/mp3"
+
+    database {
+        plugin "proxy"
+        host "fileserver.local"
+    }
+      
+The :code:`music_directory` setting tells :program:`MPD` to read files from the given NFS server. It does this by connecting to the server from userspace. This does not actually mount the file server into the kernel's virtual file system, and thus requires no kernel cooperation and no special privileges. It does not even require a kernel with NFS support, only the nfs storage plugin (using the libnfs userspace library). The same can be done with SMB/CIFS using the smbclient storage plugin (using libsmbclient).
+
+The database setting tells :program:`MPD` to pass all database queries on to the :program:`MPD` instance running on the file server (using the proxy plugin).
+
+Real-Time Scheduling
+--------------------
+
+On Linux, :program:`MPD` attempts to configure real-time scheduling for some threads that benefit from it.
+
+This is only possible you allow :program:`MPD` to do it. This privilege is controlled by :envvar:`RLIMIT_RTPRIO` :envvar:`RLIMIT_RTTIME`. You can configure this privilege with :command:`ulimit` before launching :program:`MPD`:
+
+.. code-block:: none
+
+    ulimit -HS -r 50; mpd
+
+Or you can use the :command:`prlimit` program from the util-linux package:
+
+.. code-block:: none
+
+    prlimit --rtprio=50 --rttime=unlimited mpd
+
+The systemd service file shipped with :program:`MPD` comes with this setting.
+
+This works only if the Linux kernel was compiled with :makevar:`CONFIG_RT_GROUP_SCHED` disabled. Use the following command to check this option for your current kernel:
+
+.. code-block:: none
+
+    zgrep ^CONFIG_RT_GROUP_SCHED /proc/config.gz
+
+You can verify whether the real-time scheduler is active with the ps command:
+
+.. code-block:: none
+
+    # ps H -q `pidof -s mpd` -o 'pid,tid,cls,rtprio,comm'
+      PID   TID CLS RTPRIO COMMAND
+    16257 16257  TS      - mpd
+    16257 16258  TS      - io
+    16257 16259  FF     50 rtio
+    16257 16260  TS      - player
+    16257 16261  TS      - decoder
+    16257 16262  FF     50 output:ALSA
+    16257 16263 IDL      0 update
+
+The CLS column shows the CPU scheduler; TS is the normal scheduler; FF and RR are real-time schedulers. In this example, two threads use the real-time scheduler: the output thread and the rtio (real-time I/O) thread; these two are the important ones. The database update thread uses the idle scheduler ("IDL in ps), which only gets CPU when no other process needs it.
+
+Note
+~~~~
+
+There is a rumor that real-time scheduling improves audio quality. That is not true. All it does is reduce the probability of skipping (audio buffer xruns) when the computer is under heavy load.
+
+Using MPD
+*********
+
+The client
+----------
+
+After you have installed, configured and started :program:`MPD`, you choose a client to control the playback.
+
+The most basic client is :program:`mpc`, which provides a command line interface. It is useful in shell scripts. Many people bind specific :program:`mpc` commands to hotkeys.
+
+The `MPD Wiki <http://www.musicpd.org/clients/>`_ contains an extensive list of clients to choose from.
+
+The music directory and the database
+------------------------------------
+
+The "music directory" is where you store your music files. :program:`MPD` stores all relevant meta information about all songs in its "database". Whenever you add, modify or remove songs in the music directory, you have to update the database, for example with mpc:
+
+.. code-block:: none
+
+    mpc update
+
+Depending on the size of your music collection and the speed of the storage, this can take a while.
+
+To exclude a file from the update, create a file called :file:`.mpdignore` in its parent directory. Each line of that file may contain a list of shell wildcards. Matching files in the current directory and all subdirectories are excluded.
+
+Mounting other storages into the music directory
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:program:`MPD` has various storage plugins of which multiple instances can be "mounted" into the music directory. This way, you can use local music, file servers and USB sticks at the same time. Example:
+
+.. code-block:: none
+
+    mpc mount foo nfs://192.168.1.4/export/mp3
+    mpc mount usbstick udisks://by-uuid-2F2B-D136
+    mpc unmount usbstick
+
+:program:`MPD`'s neighbor plugins can be helpful with finding mountable storages:
+
+.. code-block:: none
+
+    mpc listneighbors
+
+Mounting is only possible with the simple database plugin and a :code:`cache_directory`, e.g.:
+
+.. code-block:: none
+
+    database {
+      plugin "simple"
+      path "~/.mpd/db"
+      cache_directory "~/.mpd/cache"
+    }
+        
+This requires migrating from the old :code:`db_file` setting to a database section. The cache directory must exist, and :program:`MPD` will put one file per mount there, which will be reused when the same storage is used again later.
+
+Metadata
+--------
+
+When scanning or playing a song, :program:`MPD` parses its metadata.
+See :ref:`tags` for a list of supported tags.
+
+The :ref:`metadata_to_use <metadata_to_use>` setting can be used to
+enable or disable certain tags.
+
+The queue
+---------
+
+The queue (sometimes called "current playlist") is a list of songs to be played by :program:`MPD`. To play a song, add it to the queue and start playback. Most clients offer an interface to edit the queue.
+
+Stored Playlists
+----------------
+
+Stored playlists are some kind of secondary playlists which can be created, saved, edited and deleted by the client. They are addressed by their names. Its contents can be loaded into the queue, to be played back. The playlist_directory setting specifies where those playlists are stored. 
+
+Advanced usage
+**************
+
+Bit-perfect playback
+--------------------
+
+"Bit-perfect playback" is a phrase used by audiophiles to describe a setup that plays back digital music as-is, without applying any modifications such as resampling, format conversion or software volume. Naturally, this implies a lossless codec.
+
+By default, :program:`MPD` attempts to do bit-perfect playback, unless you tell it not to. Precondition is a sound chip that supports the audio format of your music files. If the audio format is not supported, :program:`MPD` attempts to fall back to the nearest supported audio format, trying to lose as little quality as possible.
+
+To verify if :program:`MPD` converts the audio format, enable verbose logging, and watch for these lines:
+
+.. code-block:: none
+
+    decoder: audio_format=44100:24:2, seekable=true
+    output: opened plugin=alsa name="An ALSA output"audio_format=44100:16:2
+    output: converting from 44100:24:2
+
+This example shows that a 24 bit file is being played, but the sound chip cannot play 24 bit. It falls back to 16 bit, discarding 8 bit.
+
+However, this does not yet prove bit-perfect playback; ALSA may be fooling :program:`MPD` that the audio format is supported. To verify the format really being sent to the physical sound chip, try:
+
+.. code-block:: none
+
+    cat /proc/asound/card*/pcm*p/sub*/hw_params
+    access: RW_INTERLEAVED
+    format: S16_LE
+    subformat: STD
+    channels: 2
+    rate: 44100 (44100/1)
+    period_size: 4096
+    buffer_size: 16384
+
+Obey the "format" row, which indicates that the current playback format is 16 bit (signed 16 bit integer, little endian).
+
+Check list for bit-perfect playback:
+
+* Use the ALSA output plugin.
+* Disable sound processing inside ALSA by configuring a "hardware" device (hw:0,0 or similar).
+* Don't use software volume (setting mixer_type).
+* Don't force :program:`MPD` to use a specific audio format (settings format, audio_output_format).
+* Verify that you are really doing bit-perfect playback using :program:`MPD`'s verbose log and :file:`/proc/asound/card*/pcm*p/sub*/hw_params`. Some DACs can also indicate the audio format.
+
+Direct Stream Digital (DSD)
+---------------------------
+
+DSD (`Direct Stream Digital <https://en.wikipedia.org/wiki/Direct_Stream_Digital>`_) is a digital format that stores audio as a sequence of single-bit values at a very high sampling rate.
+
+:program:`MPD` understands the file formats dff and dsf. There are three ways to play back DSD:
+
+* Native DSD playback. Requires ALSA 1.0.27.1 or later, a sound driver/chip that supports DSD and of course a DAC that supports DSD.
+
+* DoP (DSD over PCM) playback. This wraps DSD inside fake 24 bit PCM according to the DoP standard. Requires a DAC that supports DSD. No support from ALSA and the sound chip required (except for bit-perfect 24 bit PCM support).
+* Convert DSD to PCM on-the-fly. 
+
+Native DSD playback is used automatically if available. DoP is only used if enabled explicitly using the dop option, because there is no way for :program:`MPD` to find out whether the DAC supports it. DSD to PCM conversion is the fallback if DSD cannot be used directly.
+
+Client Hacks
+************
+
+.. _external_mixer:
+
+External Mixer
+--------------
+
+The setting :code:`mixer_type "null"` asks MPD to pretend that there is a mixer, but not actually do something. This allows you to implement a :program:`MPD` client which listens for mixer events, queries the current (fake) volume, and uses it to program an external mixer. For example, your client can forward this setting to your amplifier.
+
+Troubleshooting
+***************
+
+Where to start
+--------------
+
+Make sure you have the latest :program:`MPD` version (via :code:`mpd --version`, not mpc version). All the time, bugs are found and fixed, and your problem might be a bug that is fixed already. Do not ask for help unless you have the latest :program:`MPD` version. The most common excuse is when your distribution ships an old :program:`MPD` version - in that case, please ask your distribution for help, and not the :program:`MPD` project.
+
+Check the log file. Configure :code:`log_level "verbose"` or pass :option:`--verbose` to mpd.
+
+Sometimes, it is helpful to run :program:`MPD` in a terminal and follow what happens. This is how to do it:
+
+.. code-block:: none
+
+    mpd --stdout --no-daemon --verbose
+
+Support
+-------
+
+Getting Help
+~~~~~~~~~~~~
+
+The :program:`MPD` project runs a `forum <https://forum.musicpd.org/>`_ and an IRC channel (#mpd on Freenode) for requesting help. Visit the MPD help page for details on how to get help.
+
+Common Problems
+~~~~~~~~~~~~~~~
+
+1. Database
+^^^^^^^^^^^
+
+Question: I can't see my music in the MPD database!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+* Check your :code:`music_directory` setting. 
+* Does the MPD user have read permission on all music files, and read+execute permission on all music directories (and all of their parent directories)? 
+* Did you update the database? (mpc update) 
+* Did you enable all relevant decoder plugins at compile time? :command:`mpd --version` will tell you. 
+
+Question: MPD doesn't read ID3 tags!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+* You probably compiled :program:`MPD` without libid3tag. :command:`mpd --version` will tell you.
+
+2. Playback
+^^^^^^^^^^^
+
+Question: I can't hear music on my client!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+* That problem usually follows a misunderstanding of the nature of :program:`MPD`. :program:`MPD` is a remote-controlled music player, not a music distribution system. Usually, the speakers are connected to the box where :program:`MPD` runs, and the :program:`MPD` client only sends control commands, but the client does not actually play your music.
+
+  :program:`MPD` has output plugins which allow hearing music on a remote host (such as httpd), but that is not :program:`MPD`'s primary design goal. 
+
+Question: "Device or resource busy"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+*  This ALSA error means that another program uses your sound hardware exclusively. You can stop that program to allow :program:`MPD` to use it.
+
+  Sometimes, this other program is PulseAudio, which can multiplex sound from several applications, to allow them to share your sound chip. In this case, it might be a good idea for :program:`MPD` to use PulseAudio as well, instead of using ALSA directly.
+
+Reporting Bugs
+--------------
+
+If you believe you found a bug in :program:`MPD`, report it on the `bug tracker <https://github.com/MusicPlayerDaemon/MPD/issues>`_.
+
+Your bug report should contain:
+
+* the output of :command:`mpd --version`
+* your configuration file (:file:`mpd.conf`)
+* relevant portions of the log file (:option:`--verbose`)
+* be clear about what you expect MPD to do, and what is actually happening
+
+MPD crashes
+~~~~~~~~~~~
+
+All :program:`MPD` crashes are bugs which must be fixed by a developer, and you should write a bug report. (Many crash bugs are caused by codec libraries used by :program:`MPD`, and then that library must be fixed; but in any case, the :program:`MPD` `bug tracker <https://github.com/MusicPlayerDaemon/MPD/issues>`_ is a good place to report it first if you don't know.)
+
+A crash bug report needs to contain a "backtrace".
+
+First of all, your :program:`MPD` executable must not be "stripped"
+(i.e. debug information deleted).  The executables shipped with Linux
+distributions are usually stripped, but some have so-called "debug"
+packages (package :file:`mpd-dbgsym` or :file:`mpd-dbg` on Debian,
+:file:`mpd-debug` on other distributions).  Make sure this package is
+installed.
+
+If you built :program:`MPD` from sources, please recompile with Meson
+option ":code:`--buildtype=debug -Db_ndebug=false`", because this will
+add more helpful information to the backtrace.
+
+You can extract the backtrace from a core dump, or by running :program:`MPD` in a debugger, e.g.:
+
+.. code-block:: none
+
+    gdb --args mpd --stdout --no-daemon --verbose
+    run
+
+As soon as you have reproduced the crash, type ":command:`bt`" on the
+gdb command prompt. Copy the output to your bug report.
--- a/doc/user.xml
+++ b/doc/user.xml
--- a/m4/ax_append_compile_flags.m4
+++ b/m4/ax_append_compile_flags.m4
@@ -1,65 +0,0 @@
-# ===========================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
-#
-# DESCRIPTION
-#
-#   For every FLAG1, FLAG2 it is checked whether the compiler works with the
-#   flag.  If it does, the flag is added FLAGS-VARIABLE
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  During the check the flag is always added to the
-#   current language's flags.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   NOTE: This macro depends on the AX_APPEND_FLAG and
-#   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
-#   AX_APPEND_LINK_FLAGS.
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
-[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
-done
-])dnl AX_APPEND_COMPILE_FLAGS
--- a/m4/ax_append_flag.m4
+++ b/m4/ax_append_flag.m4
@@ -1,69 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
-#
-# DESCRIPTION
-#
-#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
-#   added in between.
-#
-#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
-#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
-#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
-#   FLAG.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 2
-
-AC_DEFUN([AX_APPEND_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
-AS_VAR_SET_IF(FLAGS,
-  [case " AS_VAR_GET(FLAGS) " in
-    *" $1 "*)
-      AC_RUN_LOG([: FLAGS already contains $1])
-      ;;
-    *)
-      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
-      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
-      ;;
-   esac],
-  [AS_VAR_SET(FLAGS,["$1"])])
-AS_VAR_POPDEF([FLAGS])dnl
-])dnl AX_APPEND_FLAG
--- a/m4/ax_append_link_flags.m4
+++ b/m4/ax_append_link_flags.m4
@@ -1,63 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
-#
-# DESCRIPTION
-#
-#   For every FLAG1, FLAG2 it is checked whether the linker works with the
-#   flag.  If it does, the flag is added FLAGS-VARIABLE
-#
-#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
-#   used. During the check the flag is always added to the linker's flags.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
-#   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_APPEND_LINK_FLAGS],
-[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
-done
-])dnl AX_APPEND_LINK_FLAGS
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -1,272 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 23
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64|ppc64|s390x|sparc64|aarch64)
-        libsubdirs="lib64 lib lib64"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
--- a/m4/ax_check_compile_flag.m4
+++ b/m4/ax_check_compile_flag.m4
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 3
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
--- a/m4/ax_check_link_flag.m4
+++ b/m4/ax_check_link_flag.m4
@@ -1,73 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the linker or gives an error.
-#   (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_LINK_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 3
-
-AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
-AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  LDFLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_LINK_FLAGS
--- a/m4/ax_cxx_compile_stdcxx_0x.m4
+++ b/m4/ax_cxx_compile_stdcxx_0x.m4
@@ -1,107 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_0X
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++0x
-#   standard.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [
-  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-  ax_cv_cxx_compile_cxx0x_native,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_native=yes, ax_cv_cxx_compile_cxx0x_native=no)
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-  ax_cv_cxx_compile_cxx0x_cxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=c++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_cxx=yes, ax_cv_cxx_compile_cxx0x_cxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-  ax_cv_cxx_compile_cxx0x_gxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);],,
-  ax_cv_cxx_compile_cxx0x_gxx=yes, ax_cv_cxx_compile_cxx0x_gxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  if test "$ax_cv_cxx_compile_cxx0x_native" = yes ||
-     test "$ax_cv_cxx_compile_cxx0x_cxx" = yes ||
-     test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then
-    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-  fi
-])
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -1,332 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well. e.g. you should link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threads programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 21
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test x"$ax_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case ${host_os} in
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-        ;;
-
-        darwin*)
-        ax_pthread_flags="-pthread $ax_pthread_flags"
-        ;;
-esac
-
-# Clang doesn't consider unrecognized options an error unless we specify
-# -Werror. We throw in some extra Clang-specific options to ensure that
-# this doesn't happen for GCC, which also accepts -Werror.
-
-AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-save_CFLAGS="$CFLAGS"
-ax_pthread_extra_flags="-Werror"
-CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-                  [AC_MSG_RESULT([yes])],
-                  [ax_pthread_extra_flags=
-                   AC_MSG_RESULT([no])])
-CFLAGS="$save_CFLAGS"
-
-if test x"$ax_pthread_ok" = xno; then
-for flag in $ax_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                if test x"$ax_pthread_config" = xno; then continue; fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-                [ax_pthread_ok=yes],
-                [])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_MSG_CHECKING([for joinable pthread attribute])
-        attr_name=unknown
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                           [int attr = $attr; return attr /* ; */])],
-                [attr_name=$attr; break],
-                [])
-        done
-        AC_MSG_RESULT([$attr_name])
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case ${host_os} in
-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-            osf* | hpux*) flag="-D_REENTRANT";;
-            solaris*)
-            if test "$GCC" = "yes"; then
-                flag="-D_REENTRANT"
-            else
-                # TODO: What about Clang on Solaris?
-                flag="-mt -D_REENTRANT"
-            fi
-            ;;
-        esac
-        AC_MSG_RESULT([$flag])
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT], [
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != xyes; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                  [#handle absolute path differently from PATH based program lookup
-                   AS_CASE(["x$CC"],
-                     [x/*],
-                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$ax_pthread_ok" = xyes; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
--- a/m4/ax_require_defined.m4
+++ b/m4/ax_require_defined.m4
@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -1,73 +0,0 @@
-AC_DEFUN([AM_PATH_FAAD],
-[dnl ##
-dnl faad
-dnl ##
-
-AC_ARG_ENABLE(aac,
-	AS_HELP_STRING([--disable-aac],
-		[disable AAC support (default: enable)]),,
-	enable_aac=yes)
-
-if test x$enable_aac = xyes; then
-	FAAD_LIBS="-lfaad"
-	FAAD_CFLAGS=""
-
-	oldcflags=$CFLAGS
-	oldlibs=$LIBS
-	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $FAAD_CFLAGS"
-	LIBS="$LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
-	AC_CHECK_HEADER(faad.h,,enable_aac=no)
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include <faad.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
-	fi
-	if test x$enable_aac = xyes; then
-		AC_MSG_CHECKING(that FAAD2 can even be used)
-		AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <faad.h>
-
-int main() {
-	char buffer;
-	NeAACDecHandle decoder;
-	NeAACDecFrameInfo frameInfo;
-	NeAACDecConfigurationPtr config;
-	unsigned char channels;
-	long sampleRate;
-	long bufferlen = 0;
-
-	decoder = NeAACDecOpen();
-	config = NeAACDecGetCurrentConfiguration(decoder);
-	config->outputFormat = FAAD_FMT_16BIT;
-	NeAACDecSetConfiguration(decoder,config);
-	NeAACDecInit(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	NeAACDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels);
-	NeAACDecDecode(decoder,&frameInfo,&buffer,bufferlen);
-	NeAACDecClose(decoder);
-
-	return 0;
-}
-])],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding])
-	else
-		AC_MSG_WARN([faad2 lib needed for MP4/AAC support -- disabling MP4/AAC support])
-	fi
-	CFLAGS=$oldcflags
-	LIBS=$oldlibs
-	CPPFLAGS=$oldcppflags
-fi
-
-if test x$enable_aac = xno; then
-	FAAD_LIBS=""
-	FAAD_CFLAGS=""
-fi
-
-AC_SUBST(FAAD_CFLAGS)
-AC_SUBST(FAAD_LIBS)
-
-])
--- a/m4/libwrap.m4
+++ b/m4/libwrap.m4
@@ -1,14 +0,0 @@
-dnl
-dnl Usage:
-dnl AC_CHECK_LIBWRAP([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-
-AC_DEFUN([AC_CHECK_LIBWRAP],[
-	AC_CHECK_HEADERS([tcpd.h],
-		AC_CHECK_LIB([wrap], [request_init],
-			[LIBWRAP_CFLAGS=""
-			LIBWRAP_LDFLAGS="-lwrap"
-			$1],
-			$2),
-		$2)
-])
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -1,98 +0,0 @@
-AC_DEFUN([MPD_AUTO_ENABLED], [
-	var="enable_$1"
-	feature="$2"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_NOTICE([auto-detected $feature])
-		eval "$var=yes"
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_DISABLED], [
-	var="enable_$1"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xauto"; then
-		AC_MSG_WARN([$msg -- disabling $feature])
-		eval "$var=no"
-	elif eval "test x`echo '$'$var` = xyes"; then
-		AC_MSG_ERROR([$feature: $msg])
-	fi
-])
-
-dnl Check whether a prerequisite for a feature was found.  This is
-dnl very similar to MPD_AUTO_RESULT, but does not finalize the
-dnl detection; it assumes that more checks will follow.
-AC_DEFUN([MPD_AUTO_PRE], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` != xno" && eval "test x`echo '$'$found` = xno"; then
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_RESULT], [
-	name="$1"
-	var="enable_$1"
-	found="found_$name"
-	feature="$2"
-	msg="$3"
-
-	if eval "test x`echo '$'$var` = xno"; then
-		eval "$found=no"
-	fi
-
-	if eval "test x`echo '$'$found` = xyes"; then
-                MPD_AUTO_ENABLED([$name], [$feature])
-	else
-                MPD_AUTO_DISABLED([$name], [$feature], [$msg])
-	fi
-])
-
-AC_DEFUN([MPD_AUTO_PKG], [
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		PKG_CHECK_MODULES([$2], [$3],
-			[eval "found_$1=yes"],
-			[eval "found_$1=no"])
-	fi
-
-	MPD_AUTO_RESULT([$1], [$4], [$5])
-])
-
-dnl Check with pkg-config first, fall back to AC_CHECK_LIB.
-dnl
-dnl Parameters: varname1, varname2, pkgname, libname, symname, libs, cflags, description, errmsg
-AC_DEFUN([MPD_AUTO_PKG_LIB], [
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		PKG_CHECK_MODULES([$2], [$3],
-			[eval "found_$1=yes"],
-			AC_CHECK_LIB($4, $5,
-				[eval "found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'"],
-				[eval "found_$1=no"],
-				[$6]))
-	fi
-
-	MPD_AUTO_RESULT([$1], [$8], [$9])
-])
-
-dnl Wrapper for AC_CHECK_LIB.
-dnl
-dnl Parameters: varname1, varname2, libname, symname, libs, cflags, description, errmsg
-AC_DEFUN([MPD_AUTO_LIB], [
-	AC_SUBST([$2_LIBS], [])
-	AC_SUBST([$2_CFLAGS], [])
-
-	if eval "test x`echo '$'enable_$1` != xno"; then
-		AC_CHECK_LIB($3, $4,
-			[eval "found_$1=yes $2_LIBS='$5' $2_CFLAGS='$6'"],
-			[eval "found_$1=no"],
-			[$5])
-	fi
-
-	MPD_AUTO_RESULT([$1], [$7], [$8])
-])
--- a/m4/mpd_depends.m4
+++ b/m4/mpd_depends.m4
@@ -1,9 +0,0 @@
-AC_DEFUN([MPD_DEPENDS], [
-	if test x$$2 = xno; then
-		if test x$$1 = xauto; then
-			$1=no
-		elif test x$$1 = xyes; then
-			AC_MSG_ERROR([$3])
-		fi
-	fi
-])
--- a/m4/mpd_func.m4
+++ b/m4/mpd_func.m4
@@ -1,25 +0,0 @@
-dnl MPD_OPTIONAL_FUNC(name, func, macro)
-dnl
-dnl Allow the user to enable or disable the use of a function.  If the
-dnl option is not specified, the function is auto-detected.
-AC_DEFUN([MPD_OPTIONAL_FUNC], [
-	AC_ARG_ENABLE([$1],
-		AS_HELP_STRING([--enable-$1],
-			[use the function "$1" (default: auto)]),
-		[test xenable_$1 = xyes && AC_DEFINE([$3], 1, [Define to use $1])],
-		[AC_CHECK_FUNC([$2],
-			[AC_DEFINE([$3], 1, [Define to use $1])],)])
-])
-
-dnl MPD_OPTIONAL_FUNC_NODEF(name, func)
-dnl
-dnl Allow the user to enable or disable the use of a function.
-dnl Works similar to MPD_OPTIONAL_FUNC, however MPD_OPTIONAL_FUNC_NODEF
-dnl does not invoke AC_DEFINE when function is enabled. Shell variable
-dnl enable_$name is set to "yes" instead.
-AC_DEFUN([MPD_OPTIONAL_FUNC_NODEF], [
-	AC_ARG_ENABLE([$1],
-		AS_HELP_STRING([--enable-$1],
-			[use the function "$1" (default: auto)]),,
-		[AC_CHECK_FUNC([$2], [enable_$1=yes],)])
-])
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,214 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
--- a/m4/pretty_print.m4
+++ b/m4/pretty_print.m4
@@ -1,19 +0,0 @@
-AC_DEFUN([results], [
-	dnl This is a hack to allow "with" names, otherwise "enable".
-	num=`expr $1 : 'with'`
-	if test "$num" != "0"; then
-		var="`echo '$'$1`"
-	else
-		var="`echo '$'enable_$1`"
-	fi
-
-	printf '('
-	if eval "test x$var = xyes"; then
-		printf '+'
-	elif test -n "$3" && eval "test x$var = x$3"; then
-		printf '+'
-	else
-		printf '-'
-	fi
-	printf '%s) ' "$2"
-])
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,18 +0,0 @@
-# Check if "struct ucred" is available.
-#
-# Author: Max Kellermann <max@duempel.org>
-
-AC_DEFUN([STRUCT_UCRED],[
-	AC_MSG_CHECKING([for struct ucred])
-	AC_CACHE_VAL(mpd_cv_have_struct_ucred, [
-		AC_TRY_COMPILE([#include <sys/socket.h>],
-			[struct ucred cred;],
-			mpd_cv_have_struct_ucred=yes,
-			mpd_cv_have_struct_ucred=no)
-		])
-
-	AC_MSG_RESULT($mpd_cv_have_struct_ucred)
-	if test x$mpd_cv_have_struct_ucred = xyes; then
-		AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if struct ucred is present from sys/socket.h])
-	fi
-])
--- a/meson.build
+++ b/meson.build
@@ -0,0 +1,472 @@
+project(
+  'mpd',
+  ['c', 'cpp'],
+  version: '0.21.3',
+  meson_version: '>= 0.47.2',
+  default_options: [
+    'c_std=c99',
+    'cpp_std=c++14'
+  ],
+  license: 'GPLv2+',
+)
+
+version_cxx = vcs_tag(input: 'src/GitVersion.cxx', output: 'GitVersion.cxx')
+
+compiler = meson.get_compiler('cpp')
+c_compiler = meson.get_compiler('c')
+
+conf = configuration_data()
+conf.set_quoted('PACKAGE', meson.project_name())
+conf.set_quoted('PACKAGE_NAME', meson.project_name())
+conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('VERSION', meson.project_version())
+conf.set_quoted('PROTOCOL_VERSION', '0.21.0')
+conf.set_quoted('SYSTEM_CONFIG_FILE_LOCATION', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpd.conf'))
+
+common_cppflags = [
+  '-D_GNU_SOURCE',
+]
+
+common_cflags = [
+]
+
+common_cxxflags = [
+]
+
+test_common_flags = [
+  '-Wall',
+  '-Wextra',
+
+  '-fvisibility=hidden',
+
+  '-ffast-math',
+  '-ftree-vectorize',
+]
+
+test_cxxflags = test_common_flags + [
+  '-fno-threadsafe-statics',
+  '-fmerge-all-constants',
+
+  '-Wmissing-declarations',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-Wsign-compare',
+
+  '-Wno-non-virtual-dtor',
+
+  # work around bogus GCC7 warning "mangled name for ... will change
+  # in C++17 because the exception specification is part of a function
+  # type"
+  '-Wno-noexcept-type',
+]
+
+if compiler.get_id() == 'clang'
+  # Workaround for clang bug
+  # https://bugs.llvm.org/show_bug.cgi?id=32611
+  test_cxxflags += '-funwind-tables'
+endif
+
+test_cflags = test_common_flags + [
+  '-Wmissing-prototypes',
+  '-Wshadow',
+  '-Wpointer-arith',
+  '-Wstrict-prototypes',
+  '-Wcast-qual',
+  '-Wwrite-strings',
+  '-pedantic',
+]
+
+test_ldflags = [
+]
+
+if get_option('buildtype') != 'debug'
+  test_cflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
+  test_ldflags += [
+    '-Wl,--gc-sections',
+  ]
+endif
+
+add_global_arguments(common_cxxflags + compiler.get_supported_arguments(test_cxxflags), language: 'cpp')
+add_global_arguments(common_cflags + c_compiler.get_supported_arguments(test_cflags), language: 'c')
+add_global_link_arguments(compiler.get_supported_link_arguments(test_ldflags), language: 'cpp')
+
+is_linux = host_machine.system() == 'linux'
+is_android = get_option('android_ndk') != ''
+is_darwin = host_machine.system() == 'darwin'
+is_windows = host_machine.system() == 'windows'
+is_haiku = host_machine.system() == 'haiku' # TODO is this correct?
+
+if is_android
+  common_cppflags += '-DANDROID'
+endif
+
+if is_windows
+  common_cppflags += [
+    '-DWIN32_LEAN_AND_MEAN',
+    '-DWINVER=0x0600', '-D_WIN32_WINNT=0x0600',
+    '-DSTRICT',
+    '-DUNICODE', '-D_UNICODE',
+  ]
+
+  subdir('win32')
+endif
+
+if is_android
+  subdir('android')
+endif
+
+add_global_arguments(common_cppflags, language: 'c')
+add_global_arguments(common_cppflags, language: 'cpp')
+
+enable_daemon = not is_windows and not is_android and get_option('daemon')
+conf.set('ENABLE_DAEMON', enable_daemon)
+
+conf.set('HAVE_LOCALE_H', compiler.has_header('locale.h'))
+
+conf.set('HAVE_GETPWNAM_R', compiler.has_function('getpwnam_r'))
+conf.set('HAVE_GETPWUID_R', compiler.has_function('getpwuid_r'))
+conf.set('HAVE_INITGROUPS', compiler.has_function('initgroups'))
+conf.set('HAVE_FNMATCH', compiler.has_function('fnmatch'))
+conf.set('HAVE_STRNDUP', compiler.has_function('strndup', prefix: '#define _GNU_SOURCE\n#include <string.h>'))
+conf.set('HAVE_STRCASESTR', compiler.has_function('strcasestr'))
+
+conf.set('HAVE_PRCTL', is_linux)
+
+conf.set('USE_EVENTFD', is_linux and get_option('eventfd'))
+conf.set('USE_SIGNALFD', is_linux and get_option('signalfd'))
+
+if is_windows
+  conf.set('USE_WINSELECT', true)
+elif is_linux and get_option('epoll')
+  conf.set('USE_EPOLL', true)
+else
+  conf.set('USE_POLL', true)
+endif
+
+if not get_option('syslog').disabled()
+  if compiler.has_function('syslog')
+    conf.set('HAVE_SYSLOG', true)
+  elif get_option('syslog').enabled()
+    error('syslog() not found')
+  endif
+endif
+
+enable_database = get_option('database')
+conf.set('ENABLE_DATABASE', enable_database)
+
+enable_inotify = get_option('inotify') and is_linux and enable_database
+conf.set('ENABLE_INOTIFY', enable_inotify)
+
+conf.set('ENABLE_DSD', get_option('dsd'))
+
+inc = include_directories(
+  'src',
+
+  # for the generated config.h
+  '.',
+)
+
+boost_dep = dependency('boost', version: '>= 1.58')
+if boost_dep.version() == '1.67'
+  # https://github.com/MusicPlayerDaemon/MPD/pull/384
+  # https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2
+  warning('Your Boost version 1.67 is known to be buggy, and the MPD build will fail. Please upgrade to Boost 1.68 or later.')
+endif
+
+sources = [
+  version_cxx,
+  'src/Main.cxx',
+  'src/protocol/Ack.cxx',
+  'src/protocol/ArgParser.cxx',
+  'src/protocol/Result.cxx',
+  'src/command/CommandError.cxx',
+  'src/command/AllCommands.cxx',
+  'src/command/QueueCommands.cxx',
+  'src/command/TagCommands.cxx',
+  'src/command/PlayerCommands.cxx',
+  'src/command/PlaylistCommands.cxx',
+  'src/command/FileCommands.cxx',
+  'src/command/OutputCommands.cxx',
+  'src/command/MessageCommands.cxx',
+  'src/command/ClientCommands.cxx',
+  'src/command/PartitionCommands.cxx',
+  'src/command/OtherCommands.cxx',
+  'src/command/CommandListBuilder.cxx',
+  'src/Idle.cxx',
+  'src/IdleFlags.cxx',
+  'src/decoder/Domain.cxx',
+  'src/decoder/Thread.cxx',
+  'src/decoder/Control.cxx',
+  'src/decoder/Bridge.cxx',
+  'src/decoder/DecoderPrint.cxx',
+  'src/client/Listener.cxx',
+  'src/client/Client.cxx',
+  'src/client/ClientEvent.cxx',
+  'src/client/ClientExpire.cxx',
+  'src/client/ClientGlobal.cxx',
+  'src/client/ClientIdle.cxx',
+  'src/client/ClientList.cxx',
+  'src/client/ClientNew.cxx',
+  'src/client/ClientProcess.cxx',
+  'src/client/ClientRead.cxx',
+  'src/client/ClientWrite.cxx',
+  'src/client/ClientMessage.cxx',
+  'src/client/ClientSubscribe.cxx',
+  'src/client/ClientFile.cxx',
+  'src/client/Response.cxx',
+  'src/Listen.cxx',
+  'src/LogInit.cxx',
+  'src/LogBackend.cxx',
+  'src/Log.cxx',
+  'src/ls.cxx',
+  'src/Instance.cxx',
+  'src/win32/Win32Main.cxx',
+  'src/MusicBuffer.cxx',
+  'src/MusicPipe.cxx',
+  'src/MusicChunk.cxx',
+  'src/MusicChunkPtr.cxx',
+  'src/Mapper.cxx',
+  'src/Partition.cxx',
+  'src/Permission.cxx',
+  'src/player/CrossFade.cxx',
+  'src/player/Thread.cxx',
+  'src/player/Control.cxx',
+  'src/PlaylistError.cxx',
+  'src/PlaylistPrint.cxx',
+  'src/PlaylistSave.cxx',
+  'src/playlist/PlaylistStream.cxx',
+  'src/playlist/PlaylistMapper.cxx',
+  'src/playlist/PlaylistAny.cxx',
+  'src/playlist/PlaylistSong.cxx',
+  'src/playlist/PlaylistQueue.cxx',
+  'src/playlist/Print.cxx',
+  'src/db/PlaylistVector.cxx',
+  'src/queue/Queue.cxx',
+  'src/queue/QueuePrint.cxx',
+  'src/queue/QueueSave.cxx',
+  'src/queue/Playlist.cxx',
+  'src/queue/PlaylistControl.cxx',
+  'src/queue/PlaylistEdit.cxx',
+  'src/queue/PlaylistTag.cxx',
+  'src/queue/PlaylistState.cxx',
+  'src/ReplayGainGlobal.cxx',
+  'src/LocateUri.cxx',
+  'src/SongUpdate.cxx',
+  'src/SongLoader.cxx',
+  'src/SongPrint.cxx',
+  'src/SongSave.cxx',
+  'src/StateFile.cxx',
+  'src/StateFileConfig.cxx',
+  'src/Stats.cxx',
+  'src/TagPrint.cxx',
+  'src/TagSave.cxx',
+  'src/TagFile.cxx',
+  'src/TagStream.cxx',
+  'src/TimePrint.cxx',
+  'src/mixer/Volume.cxx',
+  'src/PlaylistFile.cxx',
+]
+
+if not is_android
+  sources += [
+    'src/CommandLine.cxx',
+    'src/unix/SignalHandlers.cxx',
+  ]
+else
+  sources += [
+    'src/android/Context.cxx',
+    'src/android/Environment.cxx',
+    'src/android/LogListener.cxx',
+  ]
+endif
+
+if enable_daemon
+  sources += 'src/unix/Daemon.cxx'
+endif
+
+if enable_database
+  sources += [
+    'src/queue/PlaylistUpdate.cxx',
+    'src/command/StorageCommands.cxx',
+    'src/command/DatabaseCommands.cxx',
+  ]
+endif
+
+subdir('src/util')
+subdir('src/system')
+subdir('src/thread')
+subdir('src/event')
+
+subdir('src/lib/dbus')
+subdir('src/lib/icu')
+subdir('src/lib/smbclient')
+subdir('src/lib/zlib')
+
+subdir('src/lib/alsa')
+subdir('src/lib/curl')
+subdir('src/lib/expat')
+subdir('src/lib/ffmpeg')
+subdir('src/lib/gcrypt')
+subdir('src/lib/wrap')
+subdir('src/lib/nfs')
+subdir('src/lib/oss')
+subdir('src/lib/pcre')
+subdir('src/lib/pulse')
+subdir('src/lib/sndio')
+subdir('src/lib/sqlite')
+subdir('src/lib/systemd')
+subdir('src/lib/upnp')
+subdir('src/lib/yajl')
+
+subdir('src/fs')
+subdir('src/config')
+subdir('src/net')
+subdir('src/tag')
+subdir('src/pcm')
+subdir('src/neighbor')
+subdir('src/input')
+subdir('src/archive')
+subdir('src/filter')
+subdir('src/mixer')
+subdir('src/output')
+subdir('src/lib/xiph')
+subdir('src/decoder')
+subdir('src/encoder')
+subdir('src/song')
+subdir('src/playlist')
+subdir('src/zeroconf')
+
+if curl_dep.found()
+  sources += 'src/RemoteTagCache.cxx'
+endif
+
+if sqlite_dep.found()
+  sources += [
+    'src/command/StickerCommands.cxx',
+    'src/sticker/StickerDatabase.cxx',
+    'src/sticker/StickerPrint.cxx',
+    'src/sticker/SongSticker.cxx',
+  ]
+endif
+
+basic = static_library(
+  'basic',
+  'src/ReplayGainInfo.cxx',
+  'src/ReplayGainMode.cxx',
+  'src/SingleMode.cxx',
+  include_directories: inc,
+)
+
+basic_dep = declare_dependency(
+  link_with: basic,
+)
+
+if enable_database
+  subdir('src/storage')
+  subdir('src/db')
+endif
+
+if neighbor_glue_dep.found()
+  sources += 'src/command/NeighborCommands.cxx'
+endif
+
+if archive_glue_dep.found()
+  sources += [
+    'src/TagArchive.cxx',
+    'src/db/update/Archive.cxx',
+  ]
+endif
+
+if is_windows
+  sources += windows_resources
+endif
+
+link_args = []
+more_deps = []
+if is_android
+  subdir('src/java')
+  target_type = 'shared_library'
+  link_args += [
+    '-Wl,--no-undefined,-shared,-Bsymbolic',
+    '-llog',
+    '-lz',
+  ]
+  more_deps += [
+    declare_dependency(sources: [classes_jar]),
+    java_dep,
+  ]
+else
+  target_type = 'executable'
+endif
+
+mpd = build_target(
+  'mpd',
+  sources,
+  target_type: target_type,
+  include_directories: inc,
+  dependencies: [
+    basic_dep,
+    config_dep,
+    dbus_dep,
+    fs_dep,
+    net_dep,
+    util_dep,
+    event_dep,
+    thread_dep,
+    neighbor_glue_dep,
+    input_glue_dep,
+    archive_glue_dep,
+    output_glue_dep,
+    mixer_glue_dep,
+    decoder_glue_dep,
+    encoder_glue_dep,
+    playlist_glue_dep,
+    db_glue_dep,
+    storage_glue_dep,
+    song_dep,
+    systemd_dep,
+    sqlite_dep,
+    zeroconf_dep,
+    libwrap_dep,
+    more_deps,
+  ],
+  link_args: link_args,
+  install: not is_android and not is_haiku,
+)
+
+if is_android
+  subdir('android/apk')
+endif
+
+if is_haiku
+  subdir('src/haiku')
+endif
+
+configure_file(output: 'config.h', configuration: conf)
+
+if systemd_dep.found()
+  subdir('systemd')
+endif
+
+install_data(
+  'mpd.svg',
+  install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
+)
+
+install_data(
+  'AUTHORS', 'COPYING', 'NEWS', 'README.md',
+  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+)
+
+if get_option('documentation')
+  subdir('doc')
+endif
+
+if get_option('test')
+  subdir('test')
+endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,187 @@
+option('documentation', type: 'boolean', value: false, description: 'Build documentation')
+
+option('test', type: 'boolean', value: false, description: 'Build the unit tests and debug programs')
+
+option('syslog', type: 'feature', description: 'syslog support')
+option('inotify', type: 'boolean', value: true, description: 'inotify support (for automatic database update)')
+
+option('daemon', type: 'boolean', value: true, description: 'enable daemonization')
+option('systemd', type: 'feature', description: 'systemd support')
+
+option('systemd_system_unit_dir', type: 'string', description: 'systemd system service directory')
+option('systemd_user_unit_dir', type: 'string', description: 'systemd user service directory')
+
+#
+# Android
+#
+
+option('android_sdk', type: 'string', description: 'The path where Android SDK is installed')
+option('android_ndk', type: 'string', description: 'The path where Android NDK is installed')
+option('android_abi', type: 'string', value: 'armeabi-v7a', description: 'The Android ABI to be built')
+
+option('android_strip', type: 'string', value: 'strip', description: 'The "strip" tool from the NDK')
+
+option('android_debug_keystore', type: 'string', description: 'The keystore file used to sign debug APK files')
+
+option('android_keystore', type: 'string', description: 'The keystore file used to sign APK files')
+option('android_keyalias', type: 'string', description: 'The key alias used to sign APK files')
+option('android_keypass', type: 'string', description: 'The password of the keystore used to sign APK files')
+
+#
+# System call support
+#
+
+option('epoll', type: 'boolean', value: true, description: 'Use epoll on Linux')
+option('eventfd', type: 'boolean', value: true, description: 'Use eventfd() on Linux')
+option('signalfd', type: 'boolean', value: true, description: 'Use signalfd() on Linux')
+
+#
+# Network support
+#
+
+option('tcp', type: 'boolean', value: true, description: 'Support for clients connecting via TCP')
+option('ipv6', type: 'feature', description: 'Support for IPv6')
+option('local_socket', type: 'boolean', value: true, description: 'Support for clients connecting via local sockets')
+
+#
+# Audio formats
+#
+
+option('dsd', type: 'boolean', value: true, description: 'Support the DSD audio format')
+
+#
+# Database plugins
+#
+
+option('database', type: 'boolean', value: true, description: 'enable support for the music database')
+option('upnp', type: 'feature', description: 'UPnP client support')
+option('libmpdclient', type: 'feature', description: 'libmpdclient support (for the proxy database plugin)')
+
+#
+# Neighbor plugins
+#
+
+option('neighbor', type: 'boolean', value: true, description: 'enable support for neighbor discovery')
+
+#
+# Storage plugins
+#
+
+option('udisks', type: 'feature', description: 'Support for removable media using udisks2')
+option('webdav', type: 'feature', description: 'WebDAV support using CURL and Expat')
+
+#
+# Playlist plugins
+#
+
+option('cue', type: 'boolean', value: true, description: 'CUE sheet support')
+
+#
+# Input plugins
+#
+
+option('cdio_paranoia', type: 'feature', description: 'libcdio_paranoia input plugin')
+option('curl', type: 'feature', description: 'HTTP client using CURL')
+option('mms', type: 'feature', description: 'MMS protocol support using libmms')
+option('nfs', type: 'feature', description: 'NFS protocol support using libnfs')
+option('smbclient', type: 'feature', description: 'SMB support using libsmbclient')
+
+#
+# Commercial services
+#
+
+option('qobuz', type: 'feature', description: 'Qobuz client')
+option('soundcloud', type: 'feature', description: 'SoundCloud client')
+option('tidal', type: 'feature', description: 'Tidal client')
+
+#
+# Archive plugins
+#
+
+option('bzip2', type: 'feature', description: 'bzip2 support using libbz2')
+option('iso9660', type: 'feature', description: 'ISO9660 support using libiso9660')
+option('zzip', type: 'feature', description: 'ZIP support using zziplib')
+
+#
+# Tag plugins
+#
+
+option('id3tag', type: 'feature', description: 'ID3 support using libid3tag')
+option('chromaprint', type: 'feature', description: 'ChromaPrint / AcoustID support')
+
+#
+# Decoder plugins
+#
+
+option('adplug', type: 'feature', description: 'AdPlug decoder plugin')
+option('audiofile', type: 'feature', description: 'libaudiofile decoder plugin')
+option('faad', type: 'feature', description: 'AAC decoder using libfaad')
+option('ffmpeg', type: 'feature', description: 'FFmpeg codec support')
+option('flac', type: 'feature', description: 'FLAC decoder plugin')
+option('fluidsynth', type: 'feature', description: 'fluidsynth MIDI decoder plugin')
+option('gme', type: 'feature', description: 'Game Music Emulator decoder plugin')
+option('mad', type: 'feature', description: 'MP3 decoder using libmad')
+option('mikmod', type: 'feature', description: 'MikMod decoder plugin')
+option('modplug', type: 'feature', description: 'Modplug decoder plugin')
+option('mpcdec', type: 'feature', description: 'Musepack decoder plugin')
+option('mpg123', type: 'feature', description: 'MP3 decoder using libmpg123')
+option('opus', type: 'feature', description: 'Opus decoder plugin')
+option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2')
+option('sndfile', type: 'feature', description: 'libsndfile decoder plugin')
+option('vorbis', type: 'feature', description: 'Vorbis decoder plugin')
+option('wavpack', type: 'feature', description: 'WavPack decoder plugin')
+option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin')
+
+#
+# Encoder plugins
+#
+
+option('vorbisenc', type: 'feature', description: 'Vorbis encoder plugin')
+option('lame', type: 'feature', description: 'LAME MP3 encoder plugin')
+option('twolame', type: 'feature', description: 'TwoLAME MP2 encoder plugin')
+option('shine', type: 'feature', description: 'shine MP3 encoder plugin')
+option('wave_encoder', type: 'boolean', value: true, description: 'PCM wave encoder encoder plugin')
+
+#
+# Filter plugins
+#
+
+option('libsamplerate', type: 'feature', description: 'libsamplerate resampler')
+option('soxr', type: 'feature', description: 'libsoxr resampler')
+
+#
+# Output plugins
+#
+
+option('alsa', type: 'feature', description: 'ALSA support')
+option('ao', type: 'feature', description: 'libao output plugin')
+option('fifo', type: 'boolean', value: true, description: 'FIFO output plugin')
+option('httpd', type: 'boolean', value: true, description: 'HTTP streaming output plugin')
+option('jack', type: 'feature', description: 'JACK output plugin')
+option('openal', type: 'feature', description: 'OpenAL output plugin')
+option('oss', type: 'feature', description: 'Open Sound System support')
+option('pipe', type: 'boolean', value: true, description: 'Pipe output plugin')
+option('pulse', type: 'feature', description: 'PulseAudio support')
+option('recorder', type: 'boolean', value: true, description: 'Recorder output plugin')
+option('shout', type: 'feature', description: 'Shoutcast streaming support using libshout')
+option('sndio', type: 'feature', description: 'sndio output plugin')
+option('solaris_output', type: 'feature', description: 'Solaris /dev/audio support')
+
+#
+# Misc libraries
+#
+
+option('dbus', type: 'feature', description: 'D-Bus support')
+option('expat', type: 'feature', description: 'Expat XML support')
+option('icu', type: 'feature', description: 'Use libicu for Unicode')
+option('iconv', type: 'feature', description: 'Use iconv() for character set conversion')
+option('libwrap', type: 'feature', description: 'libwrap support')
+option('pcre', type: 'feature', description: 'Enable regular expression support (using libpcre)')
+option('sqlite', type: 'feature', description: 'SQLite database support (for stickers)')
+option('yajl', type: 'feature', description: 'libyajl for YAML support')
+option('zlib', type: 'feature', description: 'zlib support (for database compression)')
+
+option('zeroconf', type: 'combo',
+       choices: ['auto', 'avahi', 'bonjour', 'disabled'],
+       value: 'auto',
+       description: 'Zeroconf support')
--- a/python/build/autotools.py
+++ b/python/build/autotools.py
@@ -0,0 +1,64 @@
+import os.path, subprocess, sys
+
+from build.makeproject import MakeProject
+
+class AutotoolsProject(MakeProject):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 autogen=False,
+                 autoreconf=False,
+                 cppflags='',
+                 ldflags='',
+                 libs='',
+                 subdirs=None,
+                 **kwargs):
+        MakeProject.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.autogen = autogen
+        self.autoreconf = autoreconf
+        self.cppflags = cppflags
+        self.ldflags = ldflags
+        self.libs = libs
+        self.subdirs = subdirs
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        if self.autogen:
+            if sys.platform == 'darwin':
+                subprocess.check_call(['glibtoolize', '--force'], cwd=src)
+            else:
+                subprocess.check_call(['libtoolize', '--force'], cwd=src)
+            subprocess.check_call(['aclocal'], cwd=src)
+            subprocess.check_call(['automake', '--add-missing', '--force-missing', '--foreign'], cwd=src)
+            subprocess.check_call(['autoconf'], cwd=src)
+        if self.autoreconf:
+            subprocess.check_call(['autoreconf', '-vif'], cwd=src)
+
+        build = self.make_build_path(toolchain)
+
+        configure = [
+            os.path.join(src, 'configure'),
+            'CC=' + toolchain.cc,
+            'CXX=' + toolchain.cxx,
+            'CFLAGS=' + toolchain.cflags,
+            'CXXFLAGS=' + toolchain.cxxflags,
+            'CPPFLAGS=' + toolchain.cppflags + ' ' + self.cppflags,
+            'LDFLAGS=' + toolchain.ldflags + ' ' + self.ldflags,
+            'LIBS=' + toolchain.libs + ' ' + self.libs,
+            'AR=' + toolchain.ar,
+            'RANLIB=' + toolchain.ranlib,
+            'STRIP=' + toolchain.strip,
+            '--host=' + toolchain.arch,
+            '--prefix=' + toolchain.install_prefix,
+            '--enable-silent-rules',
+        ] + self.configure_args
+
+        subprocess.check_call(configure, cwd=build, env=toolchain.env)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        if self.subdirs is not None:
+            for subdir in self.subdirs:
+                MakeProject.build(self, toolchain, os.path.join(build, subdir))
+        else:
+            MakeProject.build(self, toolchain, build)
--- a/python/build/boost.py
+++ b/python/build/boost.py
@@ -0,0 +1,23 @@
+import os, shutil
+import re
+
+from build.project import Project
+
+class BoostProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        m = re.match(r'.*/boost_(\d+)_(\d+)_(\d+)\.tar\.bz2$', url)
+        version = "%s.%s.%s" % (m.group(1), m.group(2), m.group(3))
+        Project.__init__(self, url, md5, installed,
+                         name='boost', version=version,
+                         **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+
+        # install the headers manually; don't build any library
+        # (because right now, we only use header-only libraries)
+        includedir = os.path.join(toolchain.install_prefix, 'include')
+        dest = os.path.join(includedir, 'boost')
+        shutil.rmtree(dest, ignore_errors=True)
+        shutil.copytree(os.path.join(src, 'boost'), dest)
--- a/python/build/dirs.py
+++ b/python/build/dirs.py
@@ -0,0 +1,9 @@
+import os.path
+
+lib_path = os.path.abspath('lib')
+
+shared_path = lib_path
+if 'MPD_SHARED_LIB' in os.environ:
+    shared_path = os.environ['MPD_SHARED_LIB']
+tarball_path = os.path.join(shared_path, 'download')
+src_path = os.path.join(shared_path, 'src')
--- a/python/build/download.py
+++ b/python/build/download.py
@@ -0,0 +1,26 @@
+from build.verify import verify_file_digest
+import os
+import urllib.request
+
+def download_and_verify(url, md5, parent_path):
+    """Download a file, verify its MD5 checksum and return the local path."""
+
+    os.makedirs(parent_path, exist_ok=True)
+    path = os.path.join(parent_path, os.path.basename(url))
+
+    try:
+        if verify_file_digest(path, md5): return path
+        os.unlink(path)
+    except FileNotFoundError:
+        pass
+
+    tmp_path = path + '.tmp'
+
+    print("download", url)
+    urllib.request.urlretrieve(url, tmp_path)
+    if not verify_file_digest(tmp_path, md5):
+        os.unlink(tmp_path)
+        raise RuntimeError("Digest mismatch")
+
+    os.rename(tmp_path, path)
+    return path
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -0,0 +1,56 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class FfmpegProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 cppflags='',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+        self.cppflags = cppflags
+
+    def _filter_cflags(self, flags):
+        # FFmpeg expects the GNU as syntax
+        flags = flags.replace(' -integrated-as ', ' -no-integrated-as ')
+        return flags
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+
+        if toolchain.is_arm:
+            arch = 'arm'
+        elif toolchain.is_aarch64:
+            arch = 'aarch64'
+        else:
+            arch = 'x86'
+
+        if toolchain.is_windows:
+            target_os = 'mingw32'
+        else:
+            target_os = 'linux'
+
+        configure = [
+            os.path.join(src, 'configure'),
+            '--cc=' + toolchain.cc,
+            '--cxx=' + toolchain.cxx,
+            '--nm=' + toolchain.nm,
+            '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-ldflags=' + toolchain.ldflags,
+            '--extra-libs=' + toolchain.libs,
+            '--ar=' + toolchain.ar,
+            '--ranlib=' + toolchain.ranlib,
+            '--enable-cross-compile',
+            '--arch=' + arch,
+            '--target-os=' + target_os,
+            '--prefix=' + toolchain.install_prefix,
+        ] + self.configure_args
+
+        if toolchain.is_armv7:
+            configure.append('--cpu=cortex-a8')
+
+        subprocess.check_call(configure, cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], cwd=build, env=toolchain.env)
+        subprocess.check_call(['/usr/bin/make', '--quiet', 'install'], cwd=build, env=toolchain.env)
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -0,0 +1,398 @@
+import re
+from os.path import abspath
+
+from build.project import Project
+from build.zlib import ZlibProject
+from build.meson import MesonProject
+from build.autotools import AutotoolsProject
+from build.ffmpeg import FfmpegProject
+from build.boost import BoostProject
+
+libmpdclient = MesonProject(
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz',
+    'fa6bdab67c0e0490302b38f00c27b4959735c3ec8aef7a88327adb1407654464',
+    'lib/libmpdclient.a',
+)
+
+libogg = AutotoolsProject(
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz',
+    '4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08',
+    'lib/libogg.a',
+    [
+        '--disable-shared', '--enable-static',
+    ],
+)
+
+libvorbis = AutotoolsProject(
+    'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz',
+    'af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415',
+    'lib/libvorbis.a',
+    [
+        '--disable-shared', '--enable-static',
+    ],
+
+    edits={
+        # this option is not understood by clang
+        'configure': lambda data: data.replace('-mno-ieee-fp', ' '),
+    }
+)
+
+opus = AutotoolsProject(
+    'https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz',
+    '4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550',
+    'lib/libopus.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-doc',
+        '--disable-extra-programs',
+    ],
+
+    # suppress "visibility default" from opus_defines.h
+    cppflags='-DOPUS_EXPORT=',
+)
+
+flac = AutotoolsProject(
+    'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz',
+    '91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f',
+    'lib/libFLAC.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-xmms-plugin', '--disable-cpplibs',
+        '--disable-doxygen-docs',
+    ],
+    subdirs=['include', 'src/libFLAC'],
+)
+
+zlib = ZlibProject(
+    'http://zlib.net/zlib-1.2.11.tar.xz',
+    '4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066',
+    'lib/libz.a',
+)
+
+libid3tag = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz',
+    'e5808ad997ba32c498803822078748c3',
+    'lib/libid3tag.a',
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libid3tag's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
+    autogen=True,
+
+    edits={
+        # fix bug in libid3tag's configure.ac which discards all but the last optimization flag
+        'configure.ac': lambda data: re.sub(r'optimize="\$1"', r'optimize="$optimize $1"', data, count=1),
+    }
+)
+
+libmad = AutotoolsProject(
+    'ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz',
+    '1be543bc30c56fb6bea1d7bf6a64e66c',
+    'lib/libmad.a',
+    [
+        '--disable-shared', '--enable-static',
+
+        # without this, libmad's configure.ac ignores -O* and -f*
+        '--disable-debugging',
+    ],
+    autogen=True,
+)
+
+liblame = AutotoolsProject(
+    'http://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz',
+    'ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e',
+    'lib/libmp3lame.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-gtktest', '--disable-analyzer-hooks',
+        '--disable-decoder', '--disable-frontend',
+    ],
+)
+
+ffmpeg = FfmpegProject(
+    'http://ffmpeg.org/releases/ffmpeg-4.1.tar.xz',
+    'a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994',
+    'lib/libavcodec.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--enable-gpl',
+        '--enable-small',
+        '--disable-pthreads',
+        '--disable-programs',
+        '--disable-doc',
+        '--disable-avdevice',
+        '--disable-swresample',
+        '--disable-swscale',
+        '--disable-postproc',
+        '--disable-avfilter',
+        '--disable-lzo',
+        '--disable-faan',
+        '--disable-pixelutils',
+        '--disable-network',
+        '--disable-encoders',
+        '--disable-muxers',
+        '--disable-protocols',
+        '--disable-devices',
+        '--disable-filters',
+        '--disable-v4l2_m2m',
+
+        '--disable-parser=bmp',
+        '--disable-parser=cavsvideo',
+        '--disable-parser=dvbsub',
+        '--disable-parser=dvdsub',
+        '--disable-parser=dvd_nav',
+        '--disable-parser=flac',
+        '--disable-parser=g729',
+        '--disable-parser=gsm',
+        '--disable-parser=h261',
+        '--disable-parser=h263',
+        '--disable-parser=h264',
+        '--disable-parser=hevc',
+        '--disable-parser=mjpeg',
+        '--disable-parser=mlp',
+        '--disable-parser=mpeg4video',
+        '--disable-parser=mpegvideo',
+        '--disable-parser=opus',
+        '--disable-parser=vc1',
+        '--disable-parser=vp3',
+        '--disable-parser=vp8',
+        '--disable-parser=vp9',
+        '--disable-parser=png',
+        '--disable-parser=pnm',
+        '--disable-parser=xma',
+
+        '--disable-demuxer=aqtitle',
+        '--disable-demuxer=ass',
+        '--disable-demuxer=bethsoftvid',
+        '--disable-demuxer=bink',
+        '--disable-demuxer=cavsvideo',
+        '--disable-demuxer=cdxl',
+        '--disable-demuxer=dvbsub',
+        '--disable-demuxer=dvbtxt',
+        '--disable-demuxer=h261',
+        '--disable-demuxer=h263',
+        '--disable-demuxer=h264',
+        '--disable-demuxer=ico',
+        '--disable-demuxer=image2',
+        '--disable-demuxer=jacosub',
+        '--disable-demuxer=lrc',
+        '--disable-demuxer=microdvd',
+        '--disable-demuxer=mjpeg',
+        '--disable-demuxer=mjpeg_2000',
+        '--disable-demuxer=mpegps',
+        '--disable-demuxer=mpegvideo',
+        '--disable-demuxer=mpl2',
+        '--disable-demuxer=mpsub',
+        '--disable-demuxer=pjs',
+        '--disable-demuxer=rawvideo',
+        '--disable-demuxer=realtext',
+        '--disable-demuxer=sami',
+        '--disable-demuxer=scc',
+        '--disable-demuxer=srt',
+        '--disable-demuxer=stl',
+        '--disable-demuxer=subviewer',
+        '--disable-demuxer=subviewer1',
+        '--disable-demuxer=swf',
+        '--disable-demuxer=tedcaptions',
+        '--disable-demuxer=vobsub',
+        '--disable-demuxer=vplayer',
+        '--disable-demuxer=webvtt',
+        '--disable-demuxer=yuv4mpegpipe',
+
+        # we don't need these decoders, because we have the dedicated
+        # libraries
+        '--disable-decoder=flac',
+        '--disable-decoder=opus',
+        '--disable-decoder=vorbis',
+
+        # audio codecs nobody uses
+        '--disable-decoder=atrac1',
+        '--disable-decoder=atrac3',
+        '--disable-decoder=atrac3al',
+        '--disable-decoder=atrac3p',
+        '--disable-decoder=atrac3pal',
+        '--disable-decoder=binkaudio_dct',
+        '--disable-decoder=binkaudio_rdft',
+        '--disable-decoder=bmv_audio',
+        '--disable-decoder=dsicinaudio',
+        '--disable-decoder=dvaudio',
+        '--disable-decoder=metasound',
+        '--disable-decoder=paf_audio',
+        '--disable-decoder=ra_144',
+        '--disable-decoder=ra_288',
+        '--disable-decoder=ralf',
+        '--disable-decoder=qdm2',
+        '--disable-decoder=qdmc',
+
+        # disable lots of image and video codecs
+        '--disable-decoder=ass',
+        '--disable-decoder=asv1',
+        '--disable-decoder=asv2',
+        '--disable-decoder=apng',
+        '--disable-decoder=avrn',
+        '--disable-decoder=avrp',
+        '--disable-decoder=bethsoftvid',
+        '--disable-decoder=bink',
+        '--disable-decoder=bmp',
+        '--disable-decoder=bmv_video',
+        '--disable-decoder=cavs',
+        '--disable-decoder=ccaption',
+        '--disable-decoder=cdgraphics',
+        '--disable-decoder=clearvideo',
+        '--disable-decoder=dirac',
+        '--disable-decoder=dsicinvideo',
+        '--disable-decoder=dvbsub',
+        '--disable-decoder=dvdsub',
+        '--disable-decoder=dvvideo',
+        '--disable-decoder=exr',
+        '--disable-decoder=ffv1',
+        '--disable-decoder=ffvhuff',
+        '--disable-decoder=ffwavesynth',
+        '--disable-decoder=flic',
+        '--disable-decoder=flv',
+        '--disable-decoder=fraps',
+        '--disable-decoder=gif',
+        '--disable-decoder=h261',
+        '--disable-decoder=h263',
+        '--disable-decoder=h263i',
+        '--disable-decoder=h263p',
+        '--disable-decoder=h264',
+        '--disable-decoder=hevc',
+        '--disable-decoder=hnm4_video',
+        '--disable-decoder=hq_hqa',
+        '--disable-decoder=hqx',
+        '--disable-decoder=idcin',
+        '--disable-decoder=iff_ilbm',
+        '--disable-decoder=indeo2',
+        '--disable-decoder=indeo3',
+        '--disable-decoder=indeo4',
+        '--disable-decoder=indeo5',
+        '--disable-decoder=interplay_video',
+        '--disable-decoder=jacosub',
+        '--disable-decoder=jpeg2000',
+        '--disable-decoder=jpegls',
+        '--disable-decoder=microdvd',
+        '--disable-decoder=mimic',
+        '--disable-decoder=mjpeg',
+        '--disable-decoder=mmvideo',
+        '--disable-decoder=mpl2',
+        '--disable-decoder=motionpixels',
+        '--disable-decoder=mpeg1video',
+        '--disable-decoder=mpeg2video',
+        '--disable-decoder=mpeg4',
+        '--disable-decoder=mpegvideo',
+        '--disable-decoder=mscc',
+        '--disable-decoder=msmpeg4_crystalhd',
+        '--disable-decoder=msmpeg4v1',
+        '--disable-decoder=msmpeg4v2',
+        '--disable-decoder=msmpeg4v3',
+        '--disable-decoder=msvideo1',
+        '--disable-decoder=mszh',
+        '--disable-decoder=mvc1',
+        '--disable-decoder=mvc2',
+        '--disable-decoder=on2avc',
+        '--disable-decoder=paf_video',
+        '--disable-decoder=png',
+        '--disable-decoder=qdraw',
+        '--disable-decoder=qpeg',
+        '--disable-decoder=rawvideo',
+        '--disable-decoder=realtext',
+        '--disable-decoder=roq',
+        '--disable-decoder=roq_dpcm',
+        '--disable-decoder=rscc',
+        '--disable-decoder=rv10',
+        '--disable-decoder=rv20',
+        '--disable-decoder=rv30',
+        '--disable-decoder=rv40',
+        '--disable-decoder=sami',
+        '--disable-decoder=sheervideo',
+        '--disable-decoder=snow',
+        '--disable-decoder=srt',
+        '--disable-decoder=stl',
+        '--disable-decoder=subrip',
+        '--disable-decoder=subviewer',
+        '--disable-decoder=subviewer1',
+        '--disable-decoder=svq1',
+        '--disable-decoder=svq3',
+        '--disable-decoder=tiff',
+        '--disable-decoder=tiertexseqvideo',
+        '--disable-decoder=truemotion1',
+        '--disable-decoder=truemotion2',
+        '--disable-decoder=truemotion2rt',
+        '--disable-decoder=twinvq',
+        '--disable-decoder=utvideo',
+        '--disable-decoder=vc1',
+        '--disable-decoder=vmdvideo',
+        '--disable-decoder=vp3',
+        '--disable-decoder=vp5',
+        '--disable-decoder=vp6',
+        '--disable-decoder=vp7',
+        '--disable-decoder=vp8',
+        '--disable-decoder=vp9',
+        '--disable-decoder=vqa',
+        '--disable-decoder=webvtt',
+        '--disable-decoder=wmv1',
+        '--disable-decoder=wmv2',
+        '--disable-decoder=wmv3',
+        '--disable-decoder=yuv4',
+    ],
+)
+
+curl = AutotoolsProject(
+    'http://curl.haxx.se/download/curl-7.62.0.tar.xz',
+    'dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1',
+    'lib/libcurl.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-debug',
+        '--enable-http',
+        '--enable-ipv6',
+        '--disable-ftp', '--disable-file',
+        '--disable-ldap', '--disable-ldaps',
+        '--disable-rtsp', '--disable-proxy', '--disable-dict', '--disable-telnet',
+        '--disable-tftp', '--disable-pop3', '--disable-imap', '--disable-smtp',
+        '--disable-smb',
+        '--disable-gopher',
+        '--disable-manual',
+        '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
+        '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
+        '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
+    ],
+
+    patches='src/lib/curl/patches',
+)
+
+libexpat = AutotoolsProject(
+    'https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2',
+    '17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2',
+    'lib/libexpat.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--without-docbook',
+    ],
+)
+
+libnfs = AutotoolsProject(
+    'https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz',
+    '445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5',
+    'lib/libnfs.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-debug',
+
+        # work around -Wtautological-compare
+        '--disable-werror',
+
+        '--disable-utils', '--disable-examples',
+    ],
+    base='libnfs-libnfs-3.0.0',
+    autoreconf=True,
+)
+
+boost = BoostProject(
+    'http://downloads.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.bz2',
+    '7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7',
+    'include/boost/version.hpp',
+)
--- a/python/build/makeproject.py
+++ b/python/build/makeproject.py
@@ -0,0 +1,28 @@
+import subprocess
+
+from build.project import Project
+
+class MakeProject(Project):
+    def __init__(self, url, md5, installed,
+                 install_target='install',
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.install_target = install_target
+
+    def get_simultaneous_jobs(self):
+        return 12
+
+    def get_make_args(self, toolchain):
+        return ['--quiet', '-j' + str(self.get_simultaneous_jobs())]
+
+    def get_make_install_args(self, toolchain):
+        return ['--quiet', self.install_target]
+
+    def make(self, toolchain, wd, args):
+        subprocess.check_call(['/usr/bin/make'] + args,
+                              cwd=wd, env=toolchain.env)
+
+    def build(self, toolchain, wd, install=True):
+        self.make(toolchain, wd, self.get_make_args(toolchain))
+        if install:
+            self.make(toolchain, wd, self.get_make_install_args(toolchain))
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -0,0 +1,111 @@
+import os.path, subprocess, sys
+
+from build.project import Project
+
+def make_cross_file(toolchain):
+    if toolchain.is_windows:
+        system = 'windows'
+        windres = "windres = '%s'" % toolchain.windres
+    else:
+        system = 'linux'
+        windres = ''
+
+    if toolchain.is_arm:
+        cpu_family = 'arm'
+        if toolchain.is_armv7:
+            cpu = 'armv7'
+        else:
+            cpu = 'armv6'
+    elif toolchain.is_aarch64:
+        cpu_family = 'aarch64'
+        cpu = 'arm64-v8a'
+    else:
+        cpu_family = 'x86'
+        if 'x86_64' in toolchain.arch:
+            cpu = 'x86_64'
+        else:
+            cpu = 'i686'
+
+    # TODO: support more CPUs
+    endian = 'little'
+
+    # TODO: write pkg-config wrapper
+
+    path = os.path.join(toolchain.build_path, 'meson.cross')
+    os.makedirs(toolchain.build_path, exist_ok=True)
+    with open(path, 'w') as f:
+        f.write("""
+[binaries]
+c = '%s'
+cpp = '%s'
+ar = '%s'
+strip = '%s'
+pkgconfig = '%s'
+%s
+
+[properties]
+root = '%s'
+
+c_args = %s
+c_link_args = %s
+
+cpp_args = %s
+cpp_link_args = %s
+
+# Keep Meson from executing Android-x86 test binariees
+needs_exe_wrapper = true
+
+[host_machine]
+system = '%s'
+cpu_family = '%s'
+cpu = '%s'
+endian = '%s'
+            """ % (toolchain.cc, toolchain.cxx, toolchain.ar, toolchain.strip,
+                   toolchain.pkg_config,
+                   windres,
+                   toolchain.install_prefix,
+                   repr((toolchain.cppflags + ' ' + toolchain.cflags).split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
+                   repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split()),
+                   repr(toolchain.ldflags.split() + toolchain.libs.split()),
+                   system, cpu_family, cpu, endian))
+    return path
+
+def configure(toolchain, src, build, args=()):
+    cross_file = make_cross_file(toolchain)
+    configure = [
+        'meson',
+        src, build,
+
+        '--prefix', toolchain.install_prefix,
+
+        # this is necessary because Meson uses Debian's build machine
+        # MultiArch path (e.g. "lib/x86_64-linux-gnu") for cross
+        # builds, which is obviously wrong
+        '--libdir', 'lib',
+
+        '--buildtype', 'plain',
+
+        '--default-library=static',
+
+        '--cross-file', cross_file,
+    ] + args
+
+    subprocess.check_call(configure, env=toolchain.env)
+
+class MesonProject(Project):
+    def __init__(self, url, md5, installed, configure_args=[],
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+        self.configure_args = configure_args
+
+    def configure(self, toolchain):
+        src = self.unpack(toolchain)
+        build = self.make_build_path(toolchain)
+        configure(toolchain, src, build, self.configure_args)
+        return build
+
+    def build(self, toolchain):
+        build = self.configure(toolchain)
+        subprocess.check_call(['ninja', 'install'],
+                              cwd=build, env=toolchain.env)
--- a/python/build/project.py
+++ b/python/build/project.py
@@ -0,0 +1,81 @@
+import os, shutil
+import re
+
+from build.download import download_and_verify
+from build.tar import untar
+from build.quilt import push_all
+
+class Project:
+    def __init__(self, url, md5, installed, name=None, version=None,
+                 base=None,
+                 patches=None,
+                 edits=None,
+                 use_cxx=False):
+        if base is None:
+            basename = os.path.basename(url)
+            m = re.match(r'^(.+)\.(tar(\.(gz|bz2|xz|lzma))?|zip)$', basename)
+            if not m: raise
+            self.base = m.group(1)
+        else:
+            self.base = base
+
+        if name is None or version is None:
+            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*)$', self.base)
+            if name is None: name = m.group(1)
+            if version is None: version = m.group(2)
+
+        self.name = name
+        self.version = version
+
+        self.url = url
+        self.md5 = md5
+        self.installed = installed
+
+        if patches is not None:
+            srcdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+            patches = os.path.join(srcdir, patches)
+        self.patches = patches
+        self.edits = edits
+        self.use_cxx = use_cxx
+
+    def download(self, toolchain):
+        return download_and_verify(self.url, self.md5, toolchain.tarball_path)
+
+    def is_installed(self, toolchain):
+        tarball = self.download(toolchain)
+        installed = os.path.join(toolchain.install_prefix, self.installed)
+        tarball_mtime = os.path.getmtime(tarball)
+        try:
+            return os.path.getmtime(installed) >= tarball_mtime
+        except FileNotFoundError:
+            return False
+
+    def unpack(self, toolchain, out_of_tree=True):
+        if out_of_tree:
+            parent_path = toolchain.src_path
+        else:
+            parent_path = toolchain.build_path
+        path = untar(self.download(toolchain), parent_path, self.base)
+
+        if self.patches is not None:
+            push_all(toolchain, path, self.patches)
+
+        if self.edits is not None:
+            for filename, function in self.edits.items():
+                with open(os.path.join(path, filename), 'r+t') as f:
+                    old_data = f.read()
+                    new_data = function(old_data)
+                    f.seek(0)
+                    f.truncate(0)
+                    f.write(new_data)
+
+        return path
+
+    def make_build_path(self, toolchain):
+        path = os.path.join(toolchain.build_path, self.base)
+        try:
+            shutil.rmtree(path)
+        except FileNotFoundError:
+            pass
+        os.makedirs(path, exist_ok=True)
+        return path
--- a/python/build/quilt.py
+++ b/python/build/quilt.py
@@ -0,0 +1,9 @@
+import subprocess
+
+def run_quilt(toolchain, cwd, patches_path, *args):
+    env = dict(toolchain.env)
+    env['QUILT_PATCHES'] = patches_path
+    subprocess.check_call(['quilt'] + list(args), cwd=cwd, env=env)
+
+def push_all(toolchain, src_path, patches_path):
+    run_quilt(toolchain, src_path, patches_path, 'push', '-a')
--- a/python/build/tar.py
+++ b/python/build/tar.py
@@ -0,0 +1,11 @@
+import os, shutil, subprocess
+
+def untar(tarball_path, parent_path, base):
+    path = os.path.join(parent_path, base)
+    try:
+        shutil.rmtree(path)
+    except FileNotFoundError:
+        pass
+    os.makedirs(parent_path, exist_ok=True)
+    subprocess.check_call(['/bin/tar', 'xfC', tarball_path, parent_path])
+    return path
--- a/python/build/verify.py
+++ b/python/build/verify.py
@@ -0,0 +1,42 @@
+import hashlib
+
+def feed_file(h, f):
+    """Feed data read from an open file into the hashlib instance."""
+
+    while True:
+        data = f.read(65536)
+        if len(data) == 0:
+            # end of file
+            break
+        h.update(data)
+
+def feed_file_path(h, path):
+    """Feed data read from a file (to be opened by this function) into the hashlib instance."""
+
+    with open(path, 'rb') as f:
+        feed_file(h, f)
+
+def file_digest(algorithm, path):
+    """Calculate the digest of a file and return it in hexadecimal notation."""
+
+    h = algorithm()
+    feed_file_path(h, path)
+    return h.hexdigest()
+
+def guess_digest_algorithm(digest):
+    l = len(digest)
+    if l == 32:
+        return hashlib.md5
+    elif l == 40:
+        return hashlib.sha1
+    elif l == 64:
+        return hashlib.sha256
+    else:
+        return None
+
+def verify_file_digest(path, expected_digest):
+    """Verify the digest of a file, and return True if the digest matches with the given expected digest."""
+
+    algorithm = guess_digest_algorithm(expected_digest)
+    assert(algorithm is not None)
+    return file_digest(algorithm, path) == expected_digest
--- a/python/build/zlib.py
+++ b/python/build/zlib.py
@@ -0,0 +1,22 @@
+import os.path, subprocess
+
+from build.project import Project
+
+class ZlibProject(Project):
+    def __init__(self, url, md5, installed,
+                 **kwargs):
+        Project.__init__(self, url, md5, installed, **kwargs)
+
+    def build(self, toolchain):
+        src = self.unpack(toolchain, out_of_tree=False)
+
+        subprocess.check_call(['/usr/bin/make', '--quiet',
+            '-f', 'win32/Makefile.gcc',
+            'PREFIX=' + toolchain.arch + '-',
+            '-j12',
+            'install',
+            'INCLUDE_PATH='+ os.path.join(toolchain.install_prefix, 'include'),
+            'LIBRARY_PATH=' + os.path.join(toolchain.install_prefix, 'lib'),
+            'BINARY_PATH=' + os.path.join(toolchain.install_prefix, 'bin'),
+            ],
+            cwd=src, env=toolchain.env)
--- a/src/AudioConfig.cxx
+++ b/src/AudioConfig.cxx
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "AudioConfig.hxx"
-#include "AudioFormat.hxx"
-#include "AudioParser.hxx"
-#include "config/ConfigData.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "util/Error.hxx"
-#include "system/FatalError.hxx"
-
-static AudioFormat configured_audio_format;
-
-AudioFormat
-getOutputAudioFormat(AudioFormat inAudioFormat)
-{
-	AudioFormat out_audio_format = inAudioFormat;
-	out_audio_format.ApplyMask(configured_audio_format);
-	return out_audio_format;
-}
-
-void initAudioConfig(void)
-{
-	const struct config_param *param = config_get_param(CONF_AUDIO_OUTPUT_FORMAT);
-
-	if (param == nullptr)
-		return;
-
-	Error error;
-	if (!audio_format_parse(configured_audio_format, param->value.c_str(),
-				true, error))
-		FormatFatalError("error parsing line %i: %s",
-				 param->line, error.GetMessage());
-}
--- a/src/AudioFormat.cxx
+++ b/src/AudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -18,12 +18,13 @@
 */

 #include "AudioFormat.hxx"
+#include "util/StringBuffer.hxx"
+#include "util/StringFormat.hxx"

 #include <assert.h>
-#include <stdio.h>

 void
-AudioFormat::ApplyMask(AudioFormat mask)
+AudioFormat::ApplyMask(AudioFormat mask) noexcept
 {
 	assert(IsValid());
 	assert(mask.IsMaskValid());
@@ -40,46 +41,35 @@ AudioFormat::ApplyMask(AudioFormat mask)
 	assert(IsValid());
 }

-const char *
-sample_format_to_string(SampleFormat format)
+StringBuffer<24>
+ToString(const AudioFormat af) noexcept
 {
-	switch (format) {
-	case SampleFormat::UNDEFINED:
-		return "?";
+	StringBuffer<24> buffer;
+	char *p = buffer.data();

-	case SampleFormat::S8:
-		return "8";
+	if (af.format == SampleFormat::DSD && af.sample_rate > 0 &&
+	    af.sample_rate % 44100 == 0) {
+		/* use shortcuts such as "dsd64" which implies the
+		   sample rate */
+		p += sprintf(p, "dsd%u:", af.sample_rate * 8 / 44100);
+	} else {
+		const char *sample_format = af.format != SampleFormat::UNDEFINED
+			? sample_format_to_string(af.format)
+			: "*";

-	case SampleFormat::S16:
-		return "16";
-
-	case SampleFormat::S24_P32:
-		return "24";
-
-	case SampleFormat::S32:
-		return "32";
-
-	case SampleFormat::FLOAT:
-		return "f";
-
-	case SampleFormat::DSD:
-		return "dsd";
+		if (af.sample_rate > 0)
+			p += sprintf(p, "%u:%s:", af.sample_rate,
+				     sample_format);
+		else
+			p += sprintf(p, "*:%s:", sample_format);
 	}

-	/* unreachable */
-	assert(false);
-	gcc_unreachable();
-}
-
-const char *
-audio_format_to_string(const AudioFormat af,
-		       struct audio_format_string *s)
-{
-	assert(s != nullptr);
-
-	snprintf(s->buffer, sizeof(s->buffer), "%u:%s:%u",
-		 af.sample_rate, sample_format_to_string(af.format),
-		 af.channels);
-
-	return s->buffer;
+	if (af.channels > 0)
+		p += sprintf(p, "%u", af.channels);
+	else {
+		*p++ = '*';
+		*p = 0;
+	}
+
+	return buffer;
 }
--- a/src/AudioFormat.hxx
+++ b/src/AudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,47 +20,15 @@
 #ifndef MPD_AUDIO_FORMAT_HXX
 #define MPD_AUDIO_FORMAT_HXX

-#include "Compiler.h"
+#include "pcm/SampleFormat.hxx"
+#include "util/Compiler.h"
+
+#include <chrono>

 #include <stdint.h>
-#include <assert.h>
+#include <stddef.h>

-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
-/* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
-enum class SampleFormat : uint8_t {
-	UNDEFINED = 0,
-
-	S8,
-	S16,
-
-	/**
-	 * Signed 24 bit integer samples, packed in 32 bit integers
-	 * (the most significant byte is filled with the sign bit).
-	 */
-	S24_P32,
-
-	S32,
-
-	/**
-	 * 32 bit floating point samples in the host's format.  The
-	 * range is -1.0f to +1.0f.
-	 */
-	FLOAT,
-
-	/**
-	 * Direct Stream Digital.  1-bit samples; each frame has one
-	 * byte (8 samples) per channel.
-	 */
-	DSD,
-};
-
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
-#pragma GCC diagnostic pop
-#endif
+template<size_t CAPACITY> class StringBuffer;

 static constexpr unsigned MAX_CHANNELS = 8;

@@ -82,8 +50,19 @@ struct AudioFormat {
 	SampleFormat format;

 	/**
-	 * The number of channels.  Only mono (1) and stereo (2) are
-	 * fully supported currently.
+	 * The number of channels.
+	 *
+	 * Channel order follows the FLAC convention
+	 * (https://xiph.org/flac/format.html):
+	 *
+	 * - 1 channel: mono
+	 * - 2 channels: left, right
+	 * - 3 channels: left, right, center
+	 * - 4 channels: front left, front right, back left, back right
+	 * - 5 channels: front left, front right, front center, back/surround left, back/surround right
+	 * - 6 channels: front left, front right, front center, LFE, back/surround left, back/surround right
+	 * - 7 channels: front left, front right, front center, LFE, back center, side left, side right
+	 * - 8 channels: front left, front right, front center, LFE, back left, back right, side left, side right
 	 */
 	uint8_t channels;

@@ -99,8 +78,8 @@ struct AudioFormat {
 	}

 	/**
-	 * Clears the #audio_format object, i.e. sets all attributes to an
-	 * undefined (invalid) value.
+	 * Clears the object, i.e. sets all attributes to an undefined
+	 * (invalid) value.
 	 */
 	void Clear() {
 		sample_rate = 0;
@@ -146,7 +125,19 @@ struct AudioFormat {
 		return !(*this == other);
 	}

-	void ApplyMask(AudioFormat mask);
+	void ApplyMask(AudioFormat mask) noexcept;
+
+	gcc_pure
+	AudioFormat WithMask(AudioFormat mask) const noexcept {
+		AudioFormat result = *this;
+		result.ApplyMask(mask);
+		return result;
+	}
+
+	gcc_pure
+	bool MatchMask(AudioFormat mask) const noexcept {
+		return WithMask(mask) == *this;
+	}

 	/**
 	 * Returns the size of each (mono) sample in bytes.
@@ -158,18 +149,28 @@ struct AudioFormat {
 	 */
 	unsigned GetFrameSize() const;

-	/**
-	 * Returns the floating point factor which converts a time
-	 * span to a storage size in bytes.
-	 */
-	double GetTimeToSize() const;
-};
+	template<typename D>
+	constexpr auto TimeToFrames(D t) const noexcept {
+		using Period = typename D::period;
+		return ((t.count() * sample_rate) / Period::den) * Period::num;
+	}

-/**
- * Buffer for audio_format_string().
- */
-struct audio_format_string {
-	char buffer[24];
+	template<typename D>
+	constexpr size_t TimeToSize(D t) const noexcept {
+		return size_t(size_t(TimeToFrames(t)) * GetFrameSize());
+	}
+
+	template<typename D>
+	constexpr D FramesToTime(std::uintmax_t size) const noexcept {
+		using Rep = typename D::rep;
+		using Period = typename D::period;
+		return D(((Rep(1) * size / Period::num) * Period::den) / sample_rate);
+	}
+
+	template<typename D>
+	constexpr D SizeToTime(std::uintmax_t size) const noexcept {
+		return FramesToTime<D>(size / GetFrameSize());
+	}
 };

 /**
@@ -183,30 +184,6 @@ audio_valid_sample_rate(unsigned sample_rate)
 	return sample_rate > 0 && sample_rate < (1 << 30);
 }

-/**
- * Checks whether the sample format is valid.
- *
- * @param bits the number of significant bits per sample
- */
-static inline bool
-audio_valid_sample_format(SampleFormat format)
-{
-	switch (format) {
-	case SampleFormat::S8:
-	case SampleFormat::S16:
-	case SampleFormat::S24_P32:
-	case SampleFormat::S32:
-	case SampleFormat::FLOAT:
-	case SampleFormat::DSD:
-		return true;
-
-	case SampleFormat::UNDEFINED:
-		break;
-	}
-
-	return false;
-}
-
 /**
 * Checks whether the number of channels is valid.
 */
@@ -242,34 +219,6 @@ AudioFormat::IsMaskValid() const
 		(channels == 0 || audio_valid_channel_count(channels));
 }

-gcc_const
-static inline unsigned
-sample_format_size(SampleFormat format)
-{
-	switch (format) {
-	case SampleFormat::S8:
-		return 1;
-
-	case SampleFormat::S16:
-		return 2;
-
-	case SampleFormat::S24_P32:
-	case SampleFormat::S32:
-	case SampleFormat::FLOAT:
-		return 4;
-
-	case SampleFormat::DSD:
-		/* each frame has 8 samples per channel */
-		return 1;
-
-	case SampleFormat::UNDEFINED:
-		return 0;
-	}
-
-	assert(false);
-	gcc_unreachable();
-}
-
 inline unsigned
 AudioFormat::GetSampleSize() const
 {
@@ -282,34 +231,15 @@ AudioFormat::GetFrameSize() const
 	return GetSampleSize() * channels;
 }

-inline double
-AudioFormat::GetTimeToSize() const
-{
-	return sample_rate * GetFrameSize();
-}
-
 /**
- * Renders a #sample_format enum into a string, e.g. for printing it
- * in a log file.
- *
- * @param format a #sample_format enum value
- * @return the string
- */
-gcc_pure gcc_malloc
-const char *
-sample_format_to_string(SampleFormat format);
-
-/**
- * Renders the #audio_format object into a string, e.g. for printing
+ * Renders the #AudioFormat object into a string, e.g. for printing
 * it in a log file.
 *
- * @param af the #audio_format object
- * @param s a buffer to print into
- * @return the string, or nullptr if the #audio_format object is invalid
+ * @param af the #AudioFormat object
+ * @return the string buffer
 */
-gcc_pure gcc_malloc
-const char *
-audio_format_to_string(AudioFormat af,
-		       struct audio_format_string *s);
+gcc_const
+StringBuffer<24>
+ToString(AudioFormat af) noexcept;

 #endif
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,73 +25,58 @@
 #include "config.h"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
-#include "CheckAudioFormat.hxx"
-#include "util/Error.hxx"
-#include "Compiler.h"
+#include "util/RuntimeError.hxx"

 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>

-static bool
-parse_sample_rate(const char *src, bool mask, uint32_t *sample_rate_r,
-		  const char **endptr_r, Error &error)
+static uint32_t
+ParseSampleRate(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;

 	if (mask && *src == '*') {
-		*sample_rate_r = 0;
 		*endptr_r = src + 1;
-		return true;
+		return 0;
 	}

 	value = strtoul(src, &endptr, 10);
 	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the sample rate");
-		return false;
-	} else if (!audio_check_sample_rate(value, error))
-		return false;
+		throw std::invalid_argument("Failed to parse the sample rate");
+	} else if (!audio_valid_sample_rate(value))
+		throw FormatInvalidArgument("Invalid sample rate: %lu", value);

-	*sample_rate_r = value;
 	*endptr_r = endptr;
-	return true;
+	return value;
 }

-static bool
-parse_sample_format(const char *src, bool mask,
-		    SampleFormat *sample_format_r,
-		    const char **endptr_r, Error &error)
+static SampleFormat
+ParseSampleFormat(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;
 	SampleFormat sample_format;

 	if (mask && *src == '*') {
-		*sample_format_r = SampleFormat::UNDEFINED;
 		*endptr_r = src + 1;
-		return true;
+		return SampleFormat::UNDEFINED;
 	}

 	if (*src == 'f') {
-		*sample_format_r = SampleFormat::FLOAT;
 		*endptr_r = src + 1;
-		return true;
+		return SampleFormat::FLOAT;
 	}

 	if (memcmp(src, "dsd", 3) == 0) {
-		*sample_format_r = SampleFormat::DSD;
 		*endptr_r = src + 3;
-		return true;
+		return SampleFormat::DSD;
 	}

 	value = strtoul(src, &endptr, 10);
-	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the sample format");
-		return false;
-	}
+	if (endptr == src)
+		throw std::invalid_argument("Failed to parse the sample format");

 	switch (value) {
 	case 8:
@@ -115,99 +100,89 @@ parse_sample_format(const char *src, bool mask,
 		break;

 	default:
-		error.Format(audio_format_domain,
-			     "Invalid sample format: %lu", value);
-		return false;
+		throw FormatInvalidArgument("Invalid sample format: %lu",
+					    value);
 	}

 	assert(audio_valid_sample_format(sample_format));

-	*sample_format_r = sample_format;
 	*endptr_r = endptr;
-	return true;
+	return sample_format;
 }

-static bool
-parse_channel_count(const char *src, bool mask, uint8_t *channels_r,
-		    const char **endptr_r, Error &error)
+static uint8_t
+ParseChannelCount(const char *src, bool mask, const char **endptr_r)
 {
 	unsigned long value;
 	char *endptr;

 	if (mask && *src == '*') {
-		*channels_r = 0;
 		*endptr_r = src + 1;
-		return true;
+		return 0;
 	}

 	value = strtoul(src, &endptr, 10);
-	if (endptr == src) {
-		error.Set(audio_format_domain,
-			  "Failed to parse the channel count");
-		return false;
-	} else if (!audio_check_channel_count(value, error))
-		return false;
+	if (endptr == src)
+		throw std::invalid_argument("Failed to parse the channel count");
+	else if (!audio_valid_channel_count(value))
+		throw FormatInvalidArgument("Invalid channel count: %u",
+					    value);

-	*channels_r = value;
 	*endptr_r = endptr;
-	return true;
+	return value;
 }

-bool
-audio_format_parse(AudioFormat &dest, const char *src,
-		   bool mask, Error &error)
+AudioFormat
+ParseAudioFormat(const char *src, bool mask)
 {
-	uint32_t rate;
-	SampleFormat sample_format;
-	uint8_t channels;
-
+	AudioFormat dest;
 	dest.Clear();

+	if (strncmp(src, "dsd", 3) == 0) {
+		/* allow format specifications such as "dsd64" which
+		   implies the sample rate */
+
+		char *endptr;
+		auto dsd = strtoul(src + 3, &endptr, 10);
+		if (endptr > src + 3 && *endptr == ':' &&
+		    dsd >= 32 && dsd <= 4096 && dsd % 2 == 0) {
+			dest.sample_rate = dsd * 44100 / 8;
+			dest.format = SampleFormat::DSD;
+
+			src = endptr + 1;
+			dest.channels = ParseChannelCount(src, mask, &src);
+			if (*src != 0)
+				throw FormatInvalidArgument("Extra data after channel count: %s",
+							    src);
+
+			return dest;
+		}
+	}
+
 	/* parse sample rate */

-#if GCC_CHECK_VERSION(4,7)
-	/* workaround -Wmaybe-uninitialized false positive */
-	rate = 0;
-#endif
+	dest.sample_rate = ParseSampleRate(src, mask, &src);

-	if (!parse_sample_rate(src, mask, &rate, &src, error))
-		return false;
-
-	if (*src++ != ':') {
-		error.Set(audio_format_domain, "Sample format missing");
-		return false;
-	}
+	if (*src++ != ':')
+		throw std::invalid_argument("Sample format missing");

 	/* parse sample format */

-#if GCC_CHECK_VERSION(4,7)
-	/* workaround -Wmaybe-uninitialized false positive */
-	sample_format = SampleFormat::UNDEFINED;
-#endif
+	dest.format = ParseSampleFormat(src, mask, &src);

-	if (!parse_sample_format(src, mask, &sample_format, &src, error))
-		return false;
-
-	if (*src++ != ':') {
-		error.Set(audio_format_domain, "Channel count missing");
-		return false;
-	}
+	if (*src++ != ':')
+		throw std::invalid_argument("Channel count missing");

 	/* parse channel count */

-	if (!parse_channel_count(src, mask, &channels, &src, error))
-		return false;
+	dest.channels = ParseChannelCount(src, mask, &src);

-	if (*src != 0) {
-		error.Format(audio_format_domain,
-			    "Extra data after channel count: %s", src);
-		return false;
-	}
+	if (*src != 0)
+		throw FormatInvalidArgument("Extra data after channel count: %s",
+					    src);

-	dest = AudioFormat(rate, sample_format, channels);
 	assert(mask
 	       ? dest.IsMaskValid()
 	       : dest.IsValid());
-
-	return true;
+	return dest;
 }
--- a/src/AudioParser.hxx
+++ b/src/AudioParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -26,21 +26,17 @@
 #define MPD_AUDIO_PARSER_HXX

 struct AudioFormat;
-class Error;

 /**
 * Parses a string in the form "SAMPLE_RATE:BITS:CHANNELS" into an
- * #audio_format.
+ * #AudioFormat.
+ *
+ * Throws #std::runtime_error on error.
 *
- * @param dest the destination #audio_format struct
 * @param src the input string
 * @param mask if true, then "*" is allowed for any number of items
- * @param error_r location to store the error occurring, or NULL to
- * ignore errors
- * @return true on success
 */
-bool
-audio_format_parse(AudioFormat &dest, const char *src,
-		   bool mask, Error &error);
+AudioFormat
+ParseAudioFormat(const char *src, bool mask);

 #endif
--- a/src/BulkEdit.hxx
+++ b/src/BulkEdit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
--- a/src/CheckAudioFormat.cxx
+++ b/src/CheckAudioFormat.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,61 +20,43 @@
 #include "config.h"
 #include "CheckAudioFormat.hxx"
 #include "AudioFormat.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
+#include "util/RuntimeError.hxx"
+
+#include <stdexcept>

 #include <assert.h>

-const Domain audio_format_domain("audio_format");
-
-bool
-audio_check_sample_rate(unsigned long sample_rate, Error &error)
+void
+CheckSampleRate(unsigned long sample_rate)
 {
-	if (!audio_valid_sample_rate(sample_rate)) {
-		error.Format(audio_format_domain,
-			     "Invalid sample rate: %lu", sample_rate);
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_sample_rate(sample_rate))
+		throw FormatRuntimeError("Invalid sample rate: %lu",
+					 sample_rate);
 }

-bool
-audio_check_sample_format(SampleFormat sample_format, Error &error)
+void
+CheckSampleFormat(SampleFormat sample_format)
 {
-	if (!audio_valid_sample_format(sample_format)) {
-		error.Format(audio_format_domain,
-			     "Invalid sample format: %u",
-			     unsigned(sample_format));
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_sample_format(sample_format))
+		throw FormatRuntimeError("Invalid sample format: %u",
+					 unsigned(sample_format));
 }

-bool
-audio_check_channel_count(unsigned channels, Error &error)
+void
+CheckChannelCount(unsigned channels)
 {
-	if (!audio_valid_channel_count(channels)) {
-		error.Format(audio_format_domain,
-			     "Invalid channel count: %u", channels);
-		return false;
-	}
-
-	return true;
+	if (!audio_valid_channel_count(channels))
+		throw FormatRuntimeError("Invalid channel count: %u",
+					 channels);
 }

-bool
-audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
-			  SampleFormat sample_format, unsigned channels,
-			  Error &error)
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels)
 {
-	if (audio_check_sample_rate(sample_rate, error) &&
-	    audio_check_sample_format(sample_format, error) &&
-	    audio_check_channel_count(channels, error)) {
-		af = AudioFormat(sample_rate, sample_format, channels);
-		assert(af.IsValid());
-		return true;
-	} else
-		return false;
+	CheckSampleRate(sample_rate);
+	CheckSampleFormat(sample_format);
+	CheckChannelCount(channels);
+
+	return AudioFormat(sample_rate, sample_format, channels);
 }
--- a/src/CheckAudioFormat.hxx
+++ b/src/CheckAudioFormat.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,25 +22,23 @@

 #include "AudioFormat.hxx"

-class Error;
+void
+CheckSampleRate(unsigned long sample_rate);

-extern const class Domain audio_format_domain;
+void
+CheckSampleFormat(SampleFormat sample_format);

-bool
-audio_check_sample_rate(unsigned long sample_rate, Error &error);
-
-bool
-audio_check_sample_format(SampleFormat sample_format, Error &error);
-
-bool
-audio_check_channel_count(unsigned sample_format, Error &error);
+void
+CheckChannelCount(unsigned sample_format);

 /**
- * Wrapper for audio_format_init(), which checks all attributes.
+ * Check #AudioFormat attributes and construct an #AudioFormat
+ * instance.
+ *
+ * Throws #std::runtime_error on error.
 */
-bool
-audio_format_init_checked(AudioFormat &af, unsigned long sample_rate,
-			  SampleFormat sample_format, unsigned channels,
-			  Error &error);
+AudioFormat
+CheckAudioFormat(unsigned long sample_rate,
+		 SampleFormat sample_format, unsigned channels);

 #endif
--- a/src/Chrono.hxx
+++ b/src/Chrono.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,18 +20,11 @@
 #ifndef MPD_CHRONO_HXX
 #define MPD_CHRONO_HXX

-#include "Compiler.h"
-
 #include <chrono>
 #include <utility>
 #include <cstdint>

-#if defined(__GNUC__) && !GCC_CHECK_VERSION(4,7) && !defined(__clang__)
-/* std::chrono::duration operators are "constexpr" since gcc 4.7 */
-#define chrono_constexpr gcc_pure
-#else
-#define chrono_constexpr constexpr
-#endif
+using FloatDuration = std::chrono::duration<double>;

 /**
 * A time stamp within a song.  Granularity is 1 millisecond and the
@@ -39,7 +32,6 @@
 */
 class SongTime : public std::chrono::duration<std::uint32_t, std::milli> {
 	typedef std::chrono::duration<std::uint32_t, std::milli> Base;
-	typedef Base::rep rep;

 public:
 	SongTime() = default;
@@ -51,6 +43,11 @@ public:
 		return SongTime(Base::zero());
 	}

+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
 	static constexpr SongTime FromS(unsigned s) {
 		return SongTime(rep(s) * 1000);
 	}
@@ -108,11 +105,11 @@ public:
 		return count() > 0;
 	}

-	chrono_constexpr SongTime operator+(const SongTime &other) const {
+	constexpr SongTime operator+(const SongTime &other) const {
 		return SongTime(*(const Base *)this + (const Base &)other);
 	}

-	chrono_constexpr SongTime operator-(const SongTime &other) const {
+	constexpr SongTime operator-(const SongTime &other) const {
 		return SongTime(*(const Base *)this - (const Base &)other);
 	}
 };
@@ -123,7 +120,6 @@ public:
 */
 class SignedSongTime : public std::chrono::duration<std::int32_t, std::milli> {
 	typedef std::chrono::duration<std::int32_t, std::milli> Base;
-	typedef Base::rep rep;

 public:
 	SignedSongTime() = default;
@@ -147,6 +143,11 @@ public:
 		return SignedSongTime(-1);
 	}

+	template<typename D>
+	static constexpr SongTime Cast(D src) {
+		return SongTime(std::chrono::duration_cast<Base>(src));
+	}
+
 	static constexpr SignedSongTime FromS(int s) {
 		return SignedSongTime(rep(s) * 1000);
 	}
@@ -212,15 +213,13 @@ public:
 		return count() < 0;
 	}

-	chrono_constexpr SignedSongTime operator+(const SignedSongTime &other) const {
+	constexpr SignedSongTime operator+(const SignedSongTime &other) const {
 		return SignedSongTime(*(const Base *)this + (const Base &)other);
 	}

-	chrono_constexpr SignedSongTime operator-(const SignedSongTime &other) const {
+	constexpr SignedSongTime operator-(const SignedSongTime &other) const {
 		return SignedSongTime(*(const Base *)this - (const Base &)other);
 	}
 };

-#undef chrono_constexpr
-
 #endif
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,11 @@

 #include "config.h"
 #include "CommandLine.hxx"
+#include "GitVersion.hxx"
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/File.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "output/Registry.hxx"
@@ -35,7 +36,9 @@
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/StandardDirectory.hxx"
-#include "util/Error.hxx"
+#include "system/Error.hxx"
+#include "util/Macros.hxx"
+#include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 #include "util/OptionDef.hxx"
 #include "util/OptionParser.hxx"
@@ -65,73 +68,81 @@
 #include <stdio.h>
 #include <stdlib.h>

-#ifdef WIN32
-#define CONFIG_FILE_LOCATION		"mpd\\mpd.conf"
-#define APP_CONFIG_FILE_LOCATION	"conf\\mpd.conf"
+namespace {
+#ifdef _WIN32
+constexpr auto CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("mpd\\mpd.conf"));
+constexpr auto APP_CONFIG_FILE_LOCATION = Path::FromFS(PATH_LITERAL("conf\\mpd.conf"));
 #else
-#define USER_CONFIG_FILE_LOCATION1	".mpdconf"
-#define USER_CONFIG_FILE_LOCATION2	".mpd/mpd.conf"
-#define USER_CONFIG_FILE_LOCATION_XDG	"mpd/mpd.conf"
+constexpr auto USER_CONFIG_FILE_LOCATION1 = Path::FromFS(PATH_LITERAL(".mpdconf"));
+constexpr auto USER_CONFIG_FILE_LOCATION2 = Path::FromFS(PATH_LITERAL(".mpd/mpd.conf"));
+constexpr auto USER_CONFIG_FILE_LOCATION_XDG = Path::FromFS(PATH_LITERAL("mpd/mpd.conf"));
 #endif
+}

-static constexpr OptionDef opt_kill(
-	"kill", "kill the currently running mpd session");
-static constexpr OptionDef opt_no_config(
-	"no-config", "don't read from config");
-static constexpr OptionDef opt_no_daemon(
-	"no-daemon", "don't detach from console");
-static constexpr OptionDef opt_stdout(
-	"stdout", nullptr); // hidden, compatibility with old versions
-static constexpr OptionDef opt_stderr(
-	"stderr", "print messages to stderr");
-static constexpr OptionDef opt_verbose(
-	"verbose", 'v', "verbose logging");
-static constexpr OptionDef opt_version(
-	"version", 'V', "print version number");
-static constexpr OptionDef opt_help(
-	"help", 'h', "show help options");
-static constexpr OptionDef opt_help_alt(
-	nullptr, '?', nullptr); // hidden, standard alias for --help
+enum Option {
+	OPTION_KILL,
+	OPTION_NO_CONFIG,
+	OPTION_NO_DAEMON,
+	OPTION_STDOUT,
+	OPTION_STDERR,
+	OPTION_VERBOSE,
+	OPTION_VERSION,
+	OPTION_HELP,
+	OPTION_HELP2,
+};
+
+static constexpr OptionDef option_defs[] = {
+	{"kill", "kill the currently running mpd session"},
+	{"no-config", "don't read from config"},
+	{"no-daemon", "don't detach from console"},
+	{"stdout", nullptr}, // hidden, compatibility with old versions
+	{"stderr", "print messages to stderr"},
+	{"verbose", 'v', "verbose logging"},
+	{"version", 'V', "print version number"},
+	{"help", 'h', "show help options"},
+	{nullptr, '?', nullptr}, // hidden, standard alias for --help
+};

 static constexpr Domain cmdline_domain("cmdline");

 gcc_noreturn
 static void version(void)
 {
-	puts("Music Player Daemon " VERSION
-#ifdef GIT_COMMIT
-	     " (" GIT_COMMIT ")"
-#endif
-	     "\n"
-	     "\n"
-	     "Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
-	     "Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>\n"
-	     "This is free software; see the source for copying conditions.  There is NO\n"
-	     "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
+	printf("Music Player Daemon " VERSION " (%s)\n"
+	       "\n"
+	       "Copyright 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
+	       "Copyright 2008-2018 Max Kellermann <max.kellermann@gmail.com>\n"
+	       "This is free software; see the source for copying conditions.  There is NO\n"
+	       "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"

 #ifdef ENABLE_DATABASE
-	puts("\n"
-	     "Database plugins:");
+	       "\n"
+	       "Database plugins:\n",
+	       GIT_VERSION);

 	for (auto i = database_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);

-	puts("\n\n"
-	     "Storage plugins:");
+	printf("\n\n"
+	       "Storage plugins:\n");

 	for (auto i = storage_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);
+
+	printf("\n"
 #endif

 #ifdef ENABLE_NEIGHBOR_PLUGINS
-	puts("\n\n"
-	     "Neighbor plugins:");
+	       "\n"
+	       "Neighbor plugins:\n");
 	for (auto i = neighbor_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);
+
+	printf("\n"
 #endif

-	puts("\n\n"
-	     "Decoders plugins:");
+	       "\n"
+	       "Decoders plugins:\n");

 	decoder_plugins_for_each([](const DecoderPlugin &plugin){
 			printf(" [%s]", plugin.name);
@@ -141,26 +152,39 @@ static void version(void)
 				for (; *suffixes != nullptr; ++suffixes)
 					printf(" %s", *suffixes);

-			puts("");
+			printf("\n");
 		});

-	puts("\n"
-	     "Output plugins:");
+	printf("\n"
+	       "Filters:\n"
+#ifdef ENABLE_LIBSAMPLERATE
+	       " libsamplerate"
+#endif
+#ifdef ENABLE_SOXR
+	       " soxr"
+#endif
+	       "\n\n"
+	       "Tag plugins:\n"
+#ifdef ENABLE_ID3TAG
+	       " id3tag"
+#endif
+	       "\n\n"
+	       "Output plugins:\n");
 	audio_output_plugins_for_each(plugin)
 		printf(" %s", plugin->name);
-	puts("");
+	printf("\n"

 #ifdef ENABLE_ENCODER
-	puts("\n"
-	     "Encoder plugins:");
+	       "\n"
+	       "Encoder plugins:\n");
 	encoder_plugins_for_each(plugin)
 		printf(" %s", plugin->name);
-	puts("");
+	printf("\n"
 #endif

 #ifdef ENABLE_ARCHIVE
-	puts("\n"
-	     "Archive plugins:");
+	       "\n"
+	       "Archive plugins:\n");
 	archive_plugins_for_each(plugin) {
 		printf(" [%s]", plugin->name);

@@ -169,24 +193,68 @@ static void version(void)
 			for (; *suffixes != nullptr; ++suffixes)
 				printf(" %s", *suffixes);

-		puts("");
+		printf("\n");
 	}
+
+	printf(""
 #endif

-	puts("\n"
-	     "Input plugins:");
+	       "\n"
+	       "Input plugins:\n"
+	       " file"
+#ifdef ENABLE_ARCHIVE
+	       " archive"
+#endif
+	       );
 	input_plugins_for_each(plugin)
 		printf(" %s", plugin->name);

-	puts("\n\n"
-	     "Playlist plugins:");
+	printf("\n\n"
+	       "Playlist plugins:\n");
 	playlist_plugins_for_each(plugin)
 		printf(" %s", plugin->name);

-	puts("\n\n"
-	     "Protocols:");
+	printf("\n\n"
+	       "Protocols:\n");
 	print_supported_uri_schemes_to_fp(stdout);

+	printf("\n"
+	       "Other features:\n"
+#ifdef HAVE_AVAHI
+	       " avahi"
+#endif
+#ifdef ENABLE_DBUS
+	       " dbus"
+#endif
+#ifdef ENABLE_UDISKS
+	       " udisks"
+#endif
+#ifdef USE_EPOLL
+	       " epoll"
+#endif
+#ifdef HAVE_ICONV
+	       " iconv"
+#endif
+#ifdef HAVE_ICU
+	       " icu"
+#endif
+#ifdef ENABLE_INOTIFY
+	       " inotify"
+#endif
+#ifdef HAVE_IPV6
+	       " ipv6"
+#endif
+#ifdef ENABLE_SYSTEMD_DAEMON
+	       " systemd"
+#endif
+#ifdef HAVE_TCP
+	       " tcp"
+#endif
+#ifdef HAVE_UN
+	       " un"
+#endif
+	       "\n");
+
 	exit(EXIT_SUCCESS);
 }

@@ -206,135 +274,132 @@ static void PrintOption(const OptionDef &opt)
 gcc_noreturn
 static void help(void)
 {
-	puts("Usage:\n"
-	     "  mpd [OPTION...] [path/to/mpd.conf]\n"
-	     "\n"
-	     "Music Player Daemon - a daemon for playing music.\n"
-	     "\n"
-	     "Options:");
+	printf("Usage:\n"
+	       "  mpd [OPTION...] [path/to/mpd.conf]\n"
+	       "\n"
+	       "Music Player Daemon - a daemon for playing music.\n"
+	       "\n"
+	       "Options:\n");

-	PrintOption(opt_help);
-	PrintOption(opt_kill);
-	PrintOption(opt_no_config);
-	PrintOption(opt_no_daemon);
-	PrintOption(opt_stderr);
-	PrintOption(opt_verbose);
-	PrintOption(opt_version);
+	for (const auto &i : option_defs)
+		if(i.HasDescription() == true) // hide hidden options from help print
+			PrintOption(i);

 	exit(EXIT_SUCCESS);
 }

 class ConfigLoader
 {
-	Error &error;
-	bool result;
-public:
-	ConfigLoader(Error &_error) : error(_error), result(false) { }
+	ConfigData &config;

-	bool GetResult() const { return result; }
+public:
+	explicit ConfigLoader(ConfigData &_config) noexcept
+		:config(_config) {}

 	bool TryFile(const Path path);
-	bool TryFile(const AllocatedPath &base_path,
-		     PathTraitsFS::const_pointer path);
+	bool TryFile(const AllocatedPath &base_path, Path path);
 };

 bool ConfigLoader::TryFile(Path path)
 {
 	if (FileExists(path)) {
-		result = ReadConfigFile(path, error);
+		ReadConfigFile(config, path);
 		return true;
 	}
 	return false;
 }

-bool ConfigLoader::TryFile(const AllocatedPath &base_path,
-			   PathTraitsFS::const_pointer path)
+bool ConfigLoader::TryFile(const AllocatedPath &base_path, Path path)
 {
 	if (base_path.IsNull())
 		return false;
-	auto full_path = AllocatedPath::Build(base_path, path);
+	auto full_path = base_path / path;
 	return TryFile(full_path);
 }

-bool
-parse_cmdline(int argc, char **argv, struct options *options,
-	      Error &error)
+void
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config)
 {
 	bool use_config_file = true;
-	options->kill = false;
-	options->daemon = true;
-	options->log_stderr = false;
-	options->verbose = false;

 	// First pass: handle command line options
-	OptionParser parser(argc, argv);
-	while (parser.HasEntries()) {
-		if (!parser.ParseNext())
-			continue;
-		if (parser.CheckOption(opt_kill)) {
-			options->kill = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_no_config)) {
-			use_config_file = false;
-			continue;
-		}
-		if (parser.CheckOption(opt_no_daemon)) {
-			options->daemon = false;
-			continue;
-		}
-		if (parser.CheckOption(opt_stderr, opt_stdout)) {
-			options->log_stderr = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_verbose)) {
-			options->verbose = true;
-			continue;
-		}
-		if (parser.CheckOption(opt_version))
-			version();
-		if (parser.CheckOption(opt_help, opt_help_alt))
-			help();
+	OptionParser parser(option_defs, argc, argv);
+	while (auto o = parser.Next()) {
+		switch (Option(o.index)) {
+		case OPTION_KILL:
+			options.kill = true;
+			break;

-		error.Format(cmdline_domain, "invalid option: %s",
-			     parser.GetOption());
-		return false;
+		case OPTION_NO_CONFIG:
+			use_config_file = false;
+			break;
+
+		case OPTION_NO_DAEMON:
+			options.daemon = false;
+			break;
+
+		case OPTION_STDOUT:
+		case OPTION_STDERR:
+			options.log_stderr = true;
+			break;
+
+		case OPTION_VERBOSE:
+			options.verbose = true;
+			break;
+
+		case OPTION_VERSION:
+			version();
+
+		case OPTION_HELP:
+		case OPTION_HELP2:
+			help();
+		}
 	}

 	/* initialize the logging library, so the configuration file
 	   parser can use it already */
-	log_early_init(options->verbose);
+	log_early_init(options.verbose);

 	if (!use_config_file) {
 		LogDebug(cmdline_domain,
 			 "Ignoring config, using daemon defaults");
-		return true;
+		return;
 	}

 	// Second pass: find non-option parameters (i.e. config file)
 	const char *config_file = nullptr;
-	for (int i = 1; i < argc; ++i) {
-		if (OptionParser::IsOption(argv[i]))
-			continue;
+	for (const char *i : parser.GetRemaining()) {
 		if (config_file == nullptr) {
-			config_file = argv[i];
+			config_file = i;
 			continue;
 		}
-		error.Set(cmdline_domain, "too many arguments");
-		return false;
+
+		throw std::runtime_error("too many arguments");
 	}

 	if (config_file != nullptr) {
 		/* use specified configuration file */
-		return ReadConfigFile(Path::FromFS(config_file), error);
+#ifdef _UNICODE
+		wchar_t buffer[MAX_PATH];
+		auto result = MultiByteToWideChar(CP_ACP, 0, config_file, -1,
+						  buffer, ARRAY_SIZE(buffer));
+		if (result <= 0)
+			throw MakeLastError("MultiByteToWideChar() failed");
+
+		ReadConfigFile(config, Path::FromFS(buffer));
+#else
+		ReadConfigFile(config, Path::FromFS(config_file));
+#endif
+		return;
 	}

 	/* use default configuration file path */

-	ConfigLoader loader(error);
+	ConfigLoader loader(config);

 	bool found =
-#ifdef WIN32
+#ifdef _WIN32
 		loader.TryFile(GetUserConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetSystemConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetAppBaseDir(), APP_CONFIG_FILE_LOCATION);
@@ -345,10 +410,6 @@ parse_cmdline(int argc, char **argv, struct options *options,
 		loader.TryFile(GetHomeDir(), USER_CONFIG_FILE_LOCATION2) ||
 		loader.TryFile(Path::FromFS(SYSTEM_CONFIG_FILE_LOCATION));
 #endif
-	if (!found) {
-		error.Set(cmdline_domain, "No configuration file found");
-		return false;
-	}
-
-	return loader.GetResult();
+	if (!found)
+		throw std::runtime_error("No configuration file found");
 }
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,17 +20,17 @@
 #ifndef MPD_COMMAND_LINE_HXX
 #define MPD_COMMAND_LINE_HXX

-class Error;
+struct ConfigData;

 struct options {
-	bool kill;
-	bool daemon;
-	bool log_stderr;
-	bool verbose;
+	bool kill = false;
+	bool daemon = true;
+	bool log_stderr = false;
+	bool verbose = false;
 };

-bool
-parse_cmdline(int argc, char **argv, struct options *options,
-	      Error &error);
+void
+ParseCommandLine(int argc, char **argv, struct options &options,
+		 ConfigData &config);

 #endif
--- a/src/GitVersion.cxx
+++ b/src/GitVersion.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "Domain.hxx"
-#include "util/Domain.hxx"
+#include "GitVersion.hxx"

-const Domain pcm_domain("pcm");
+char GIT_VERSION[] = "@VCS_TAG@";
--- a/src/output/OutputControl.hxx
+++ b/src/output/OutputControl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_OUTPUT_CONTROL_HXX
-#define MPD_OUTPUT_CONTROL_HXX
+#ifndef MPD_GIT_VERSION_HXX
+#define MPD_GIT_VERSION_HXX

-struct AudioOutput;
+extern char GIT_VERSION[];

 #endif
--- a/src/GlobalEvents.cxx
+++ b/src/GlobalEvents.cxx
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "GlobalEvents.hxx"
-#include "util/Manual.hxx"
-#include "event/DeferredMonitor.hxx"
-
-#include <atomic>
-
-#include <assert.h>
-
-namespace GlobalEvents {
-	class Monitor final : public DeferredMonitor {
-	public:
-		Monitor(EventLoop &_loop):DeferredMonitor(_loop) {}
-
-	protected:
-		virtual void RunDeferred() override;
-	};
-
-	static Manual<Monitor> monitor;
-
-	static std::atomic_uint flags;
-	static Handler handlers[MAX];
-}
-
-/**
- * Invoke the callback for a certain event.
- */
-static void
-InvokeGlobalEvent(GlobalEvents::Event event)
-{
-	assert((unsigned)event < GlobalEvents::MAX);
-	assert(GlobalEvents::handlers[event] != nullptr);
-
-	GlobalEvents::handlers[event]();
-}
-
-void
-GlobalEvents::Monitor::RunDeferred()
-{
-	const unsigned f = flags.exchange(0);
-
-	for (unsigned i = 0; i < MAX; ++i)
-		if (f & (1u << i))
-			/* invoke the event handler */
-			InvokeGlobalEvent(Event(i));
-}
-
-void
-GlobalEvents::Initialize(EventLoop &loop)
-{
-	monitor.Construct(loop);
-}
-
-void
-GlobalEvents::Deinitialize()
-{
-	monitor.Destruct();
-}
-
-void
-GlobalEvents::Register(Event event, Handler callback)
-{
-	assert((unsigned)event < MAX);
-	assert(handlers[event] == nullptr);
-
-	handlers[event] = callback;
-}
-
-void
-GlobalEvents::Emit(Event event)
-{
-	assert((unsigned)event < MAX);
-
-	const unsigned mask = 1u << unsigned(event);
-	if (GlobalEvents::flags.fetch_or(mask) == 0)
-		monitor->Schedule();
-}
--- a/src/IOThread.cxx
+++ b/src/IOThread.cxx
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "IOThread.hxx"
-#include "thread/Mutex.hxx"
-#include "thread/Cond.hxx"
-#include "thread/Thread.hxx"
-#include "thread/Name.hxx"
-#include "event/Loop.hxx"
-#include "system/FatalError.hxx"
-#include "util/Error.hxx"
-
-#include <assert.h>
-
-static struct {
-	Mutex mutex;
-	Cond cond;
-
-	EventLoop *loop;
-	Thread thread;
-} io;
-
-void
-io_thread_run(void)
-{
-	assert(io_thread_inside());
-	assert(io.loop != nullptr);
-
-	io.loop->Run();
-}
-
-static void
-io_thread_func(gcc_unused void *arg)
-{
-	SetThreadName("io");
-
-	/* lock+unlock to synchronize with io_thread_start(), to be
-	   sure that io.thread is set */
-	io.mutex.lock();
-	io.mutex.unlock();
-
-	io_thread_run();
-}
-
-void
-io_thread_init(void)
-{
-	assert(io.loop == nullptr);
-	assert(!io.thread.IsDefined());
-
-	io.loop = new EventLoop();
-}
-
-void
-io_thread_start()
-{
-	assert(io.loop != nullptr);
-	assert(!io.thread.IsDefined());
-
-	const ScopeLock protect(io.mutex);
-
-	Error error;
-	if (!io.thread.Start(io_thread_func, nullptr, error))
-		FatalError(error);
-}
-
-void
-io_thread_quit(void)
-{
-	assert(io.loop != nullptr);
-
-	io.loop->Break();
-}
-
-void
-io_thread_deinit(void)
-{
-	if (io.thread.IsDefined()) {
-		io_thread_quit();
-		io.thread.Join();
-	}
-
-	delete io.loop;
-}
-
-EventLoop &
-io_thread_get()
-{
-	assert(io.loop != nullptr);
-
-	return *io.loop;
-}
-
-bool
-io_thread_inside(void)
-{
-	return io.thread.IsInside();
-}
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,9 @@
 #include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/Domain.hxx"
+#include "util/StringView.hxx"
 #include "Log.hxx"

 #include <assert.h>
@@ -30,7 +31,7 @@
 static constexpr Domain icy_metadata_domain("icy_metadata");

 void
-IcyMetaDataParser::Reset()
+IcyMetaDataParser::Reset() noexcept
 {
 	if (!IsDefined())
 		return;
@@ -38,14 +39,14 @@ IcyMetaDataParser::Reset()
 	if (data_rest == 0 && meta_size > 0)
 		delete[] meta_data;

-	delete tag;
+	tag.reset();

 	data_rest = data_size;
 	meta_size = 0;
 }

 size_t
-IcyMetaDataParser::Data(size_t length)
+IcyMetaDataParser::Data(size_t length) noexcept
 {
 	assert(length > 0);

@@ -65,7 +66,7 @@ IcyMetaDataParser::Data(size_t length)
 }

 static void
-icy_add_item(TagBuilder &tag, TagType type, const char *value)
+icy_add_item(TagBuilder &tag, TagType type, const char *value) noexcept
 {
 	size_t length = strlen(value);

@@ -76,11 +77,12 @@ icy_add_item(TagBuilder &tag, TagType type, const char *value)
 	}

 	if (length > 0)
-		tag.AddItem(type, value, length);
+		tag.AddItem(type, {value, length});
 }

 static void
-icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
+icy_parse_tag_item(TagBuilder &tag,
+		   const char *name, const char *value) noexcept
 {
 	if (strcmp(name, "StreamTitle") == 0)
 		icy_add_item(tag, TAG_TITLE, value);
@@ -95,7 +97,7 @@ icy_parse_tag_item(TagBuilder &tag, const char *name, const char *value)
 * that also fails, return #end.
 */
 static char *
-find_end_quote(char *p, char *const end)
+find_end_quote(char *p, char *const end) noexcept
 {
 	char *fallback = std::find(p, end, '\'');
 	if (fallback >= end - 1 || fallback[1] == ';')
@@ -114,8 +116,8 @@ find_end_quote(char *p, char *const end)
 	}
 }

-static Tag *
-icy_parse_tag(char *p, char *const end)
+static std::unique_ptr<Tag>
+icy_parse_tag(char *p, char *const end) noexcept
 {
 	assert(p != nullptr);
 	assert(end != nullptr);
@@ -164,7 +166,7 @@ icy_parse_tag(char *p, char *const end)
 }

 size_t
-IcyMetaDataParser::Meta(const void *data, size_t length)
+IcyMetaDataParser::Meta(const void *data, size_t length) noexcept
 {
 	const unsigned char *p = (const unsigned char *)data;

@@ -207,8 +209,6 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 	if (meta_position == meta_size) {
 		/* parse */

-		delete tag;
-
 		tag = icy_parse_tag(meta_data, meta_data + meta_size);
 		delete[] meta_data;

@@ -222,7 +222,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
 }

 size_t
-IcyMetaDataParser::ParseInPlace(void *data, size_t length)
+IcyMetaDataParser::ParseInPlace(void *data, size_t length) noexcept
 {
 	uint8_t *const dest0 = (uint8_t *)data;
 	uint8_t *dest = dest0;
--- a/src/IcyMetaDataParser.hxx
+++ b/src/IcyMetaDataParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,21 +20,22 @@
 #ifndef MPD_ICY_META_DATA_PARSER_HXX
 #define MPD_ICY_META_DATA_PARSER_HXX

+#include "tag/Tag.hxx"
+
+#include <memory>
+
 #include <stddef.h>

-struct Tag;
-
 class IcyMetaDataParser {
-	size_t data_size, data_rest;
+	size_t data_size = 0, data_rest;

 	size_t meta_size, meta_position;
 	char *meta_data;

-	Tag *tag;
+	std::unique_ptr<Tag> tag;

 public:
-	IcyMetaDataParser():data_size(0) {}
-	~IcyMetaDataParser() {
+	~IcyMetaDataParser() noexcept {
 		Reset();
 	}

@@ -42,7 +43,7 @@ public:
 	 * Initialize an enabled icy_metadata object with the specified
 	 * data_size (from the icy-metaint HTTP response header).
 	 */
-	void Start(size_t _data_size) {
+	void Start(size_t _data_size) noexcept {
 		data_size = data_rest = _data_size;
 		meta_size = 0;
 		tag = nullptr;
@@ -51,12 +52,12 @@ public:
 	/**
 	 * Resets the icy_metadata.  Call this after rewinding the stream.
 	 */
-	void Reset();
+	void Reset() noexcept;

 	/**
 	 * Checks whether the icy_metadata object is enabled.
 	 */
-	bool IsDefined() const {
+	bool IsDefined() const noexcept {
 		return data_size > 0;
 	}

@@ -66,26 +67,24 @@ public:
 	 * return value is smaller than "length", the caller should invoke
 	 * icy_meta().
 	 */
-	size_t Data(size_t length);
+	size_t Data(size_t length) noexcept;

 	/**
 	 * Reads metadata from the stream.  Returns the number of bytes
 	 * consumed.  If the return value is smaller than "length", the caller
 	 * should invoke icy_data().
 	 */
-	size_t Meta(const void *data, size_t length);
+	size_t Meta(const void *data, size_t length) noexcept;

 	/**
 	 * Parse data and eliminate metadata.
 	 *
 	 * @return the number of data bytes remaining in the buffer
 	 */
-	size_t ParseInPlace(void *data, size_t length);
+	size_t ParseInPlace(void *data, size_t length) noexcept;

-	Tag *ReadTag() {
-		Tag *result = tag;
-		tag = nullptr;
-		return result;
+	std::unique_ptr<Tag> ReadTag() noexcept {
+		return std::exchange(tag, nullptr);
 	}
 };

--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -24,63 +24,15 @@

 #include "config.h"
 #include "Idle.hxx"
-#include "GlobalEvents.hxx"
-#include "util/ASCII.hxx"
-
-#include <atomic>
+#include "Main.hxx"
+#include "Instance.hxx"

 #include <assert.h>

-static std::atomic_uint idle_flags;
-
-static const char *const idle_names[] = {
-	"database",
-	"stored_playlist",
-	"playlist",
-	"player",
-	"mixer",
-	"output",
-	"options",
-	"sticker",
-	"update",
-	"subscription",
-	"message",
-	"neighbor",
-	"mount",
-	nullptr
-};
-
 void
 idle_add(unsigned flags)
 {
 	assert(flags != 0);

-	unsigned old_flags = idle_flags.fetch_or(flags);
-
-	if ((old_flags & flags) != flags)
-		GlobalEvents::Emit(GlobalEvents::IDLE);
-}
-
-unsigned
-idle_get(void)
-{
-	return idle_flags.exchange(0);
-}
-
-const char*const*
-idle_get_names(void)
-{
-        return idle_names;
-}
-
-unsigned
-idle_parse_name(const char *name)
-{
-	assert(name != nullptr);
-
-	for (unsigned i = 0; idle_names[i] != nullptr; ++i)
-		if (StringEqualsCaseASCII(name, idle_names[i]))
-			return 1 << i;
-
-	return 0;
+	instance->EmitIdle(flags);
 }
--- a/src/Idle.hxx
+++ b/src/Idle.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -25,47 +25,7 @@
 #ifndef MPD_IDLE_HXX
 #define MPD_IDLE_HXX

-#include "Compiler.h"
-
-/** song database has been updated*/
-static constexpr unsigned IDLE_DATABASE = 0x1;
-
-/** a stored playlist has been modified, created, deleted or
-    renamed */
-static constexpr unsigned IDLE_STORED_PLAYLIST = 0x2;
-
-/** the current playlist has been modified */
-static constexpr unsigned IDLE_PLAYLIST = 0x4;
-
-/** the player state has changed: play, stop, pause, seek, ... */
-static constexpr unsigned IDLE_PLAYER = 0x8;
-
-/** the volume has been modified */
-static constexpr unsigned IDLE_MIXER = 0x10;
-
-/** an audio output device has been enabled or disabled */
-static constexpr unsigned IDLE_OUTPUT = 0x20;
-
-/** options have changed: crossfade; random; repeat; ... */
-static constexpr unsigned IDLE_OPTIONS = 0x40;
-
-/** a sticker has been modified. */
-static constexpr unsigned IDLE_STICKER = 0x80;
-
-/** a database update has started or finished. */
-static constexpr unsigned IDLE_UPDATE = 0x100;
-
-/** a client has subscribed or unsubscribed to/from a channel */
-static constexpr unsigned IDLE_SUBSCRIPTION = 0x200;
-
-/** a message on the subscribed channel was received */
-static constexpr unsigned IDLE_MESSAGE = 0x400;
-
-/** a neighbor was found or lost */
-static constexpr unsigned IDLE_NEIGHBOR = 0x800;
-
-/** the mount list has changed */
-static constexpr unsigned IDLE_MOUNT = 0x1000;
+#include "IdleFlags.hxx"

 /**
 * Adds idle flag (with bitwise "or") and queues notifications to all
@@ -74,24 +34,4 @@ static constexpr unsigned IDLE_MOUNT = 0x1000;
 void
 idle_add(unsigned flags);

-/**
- * Atomically reads and resets the global idle flags value.
- */
-unsigned
-idle_get(void);
-
-/**
- * Get idle names
- */
-const char*const*
-idle_get_names(void);
-
-/**
- * Parse an idle name and return its mask.  Returns 0 if the given
- * name is unknown.
- */
-gcc_nonnull_all gcc_pure
-unsigned
-idle_parse_name(const char *name);
-
 #endif
--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Support library for the "idle" command.
+ *
+ */
+
+#include "config.h"
+#include "IdleFlags.hxx"
+#include "util/ASCII.hxx"
+
+#include <assert.h>
+
+static const char *const idle_names[] = {
+	"database",
+	"stored_playlist",
+	"playlist",
+	"player",
+	"mixer",
+	"output",
+	"options",
+	"sticker",
+	"update",
+	"subscription",
+	"message",
+	"neighbor",
+	"mount",
+	"partition",
+	nullptr
+};
+
+const char*const*
+idle_get_names() noexcept
+{
+        return idle_names;
+}
+
+unsigned
+idle_parse_name(const char *name) noexcept
+{
+#if !CLANG_CHECK_VERSION(3,6)
+	/* disabled on clang due to -Wtautological-pointer-compare */
+	assert(name != nullptr);
+#endif
+
+	for (unsigned i = 0; idle_names[i] != nullptr; ++i)
+		if (StringEqualsCaseASCII(name, idle_names[i]))
+			return 1 << i;
+
+	return 0;
+}
--- a/src/IdleFlags.hxx
+++ b/src/IdleFlags.hxx
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2003-2018 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Support library for the "idle" command.
+ *
+ */
+
+#ifndef MPD_IDLE_FLAGS_HXX
+#define MPD_IDLE_FLAGS_HXX
+
+#include "util/Compiler.h"
+
+/** song database has been updated*/
+static constexpr unsigned IDLE_DATABASE = 0x1;
+
+/** a stored playlist has been modified, created, deleted or
+    renamed */
+static constexpr unsigned IDLE_STORED_PLAYLIST = 0x2;
+
+/** the current playlist has been modified */
+static constexpr unsigned IDLE_PLAYLIST = 0x4;
+
+/** the player state has changed: play, stop, pause, seek, ... */
+static constexpr unsigned IDLE_PLAYER = 0x8;
+
+/** the volume has been modified */
+static constexpr unsigned IDLE_MIXER = 0x10;
+
+/** an audio output device has been enabled or disabled */
+static constexpr unsigned IDLE_OUTPUT = 0x20;
+
+/** options have changed: crossfade; random; repeat; ... */
+static constexpr unsigned IDLE_OPTIONS = 0x40;
+
+/** a sticker has been modified. */
+static constexpr unsigned IDLE_STICKER = 0x80;
+
+/** a database update has started or finished. */
+static constexpr unsigned IDLE_UPDATE = 0x100;
+
+/** a client has subscribed or unsubscribed to/from a channel */
+static constexpr unsigned IDLE_SUBSCRIPTION = 0x200;
+
+/** a message on the subscribed channel was received */
+static constexpr unsigned IDLE_MESSAGE = 0x400;
+
+/** a neighbor was found or lost */
+static constexpr unsigned IDLE_NEIGHBOR = 0x800;
+
+/** the mount list has changed */
+static constexpr unsigned IDLE_MOUNT = 0x1000;
+
+/** the partition list has changed */
+static constexpr unsigned IDLE_PARTITION = 0x2000;
+
+/**
+ * Get idle names
+ */
+gcc_const
+const char*const*
+idle_get_names() noexcept;
+
+/**
+ * Parse an idle name and return its mask.  Returns 0 if the given
+ * name is unknown.
+ */
+gcc_nonnull_all gcc_pure
+unsigned
+idle_parse_name(const char *name) noexcept;
+
+#endif
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright 2003-2018 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -23,39 +23,55 @@
 #include "Idle.hxx"
 #include "Stats.hxx"

+#ifdef ENABLE_CURL
+#include "RemoteTagCache.hxx"
+#include "util/UriUtil.hxx"
+#endif
+
 #ifdef ENABLE_DATABASE
 #include "db/DatabaseError.hxx"
-#include "db/LightSong.hxx"

 #ifdef ENABLE_SQLITE
 #include "sticker/StickerDatabase.hxx"
 #include "sticker/SongSticker.hxx"
 #endif
-
-Database *
-Instance::GetDatabase(Error &error)
-{
-	if (database == nullptr)
-		error.Set(db_domain, DB_DISABLED, "No database");
-	return database;
-}
-
 #endif

-void
-Instance::TagModified()
+#include <exception>
+
+Instance::Instance()
+	:rtio_thread(true),
+#ifdef ENABLE_SYSTEMD_DAEMON
+	 systemd_watchdog(event_loop),
+#endif
+	 idle_monitor(event_loop, BIND_THIS_METHOD(OnIdle))
 {
-	partition->TagModified();
 }

-void
-Instance::SyncWithPlayer()
+Instance::~Instance() noexcept = default;
+
+Partition *
+Instance::FindPartition(const char *name) noexcept
 {
-	partition->SyncWithPlayer();
+	for (auto &partition : partitions)
+		if (partition.name == name)
+			return &partition;
+
+	return nullptr;
 }

 #ifdef ENABLE_DATABASE

+const Database &
+Instance::GetDatabaseOrThrow() const
+{
+	if (database == nullptr)
+		throw DatabaseError(DatabaseErrorCode::DISABLED,
+				    "No database");
+
+	return *database;
+}
+
 void
 Instance::OnDatabaseModified()
 {
@@ -64,23 +80,28 @@ Instance::OnDatabaseModified()
 	/* propagate the change to all subsystems */

 	stats_invalidate();
-	partition->DatabaseModified(*database);
-	idle_add(IDLE_DATABASE);
+
+	for (auto &partition : partitions)
+		partition.DatabaseModified(*database);
 }

 void
-Instance::OnDatabaseSongRemoved(const LightSong &song)
+Instance::OnDatabaseSongRemoved(const char *uri)
 {
 	assert(database != nullptr);

 #ifdef ENABLE_SQLITE
 	/* if the song has a sticker, remove it */
-	if (sticker_enabled())
-		sticker_song_delete(song);
+	if (sticker_enabled()) {
+		try {
+			sticker_song_delete(uri);
+		} catch (...) {
+		}
+	}
 #endif

-	const auto uri = song.GetURI();
-	partition->DeleteSong(uri.c_str());
+	for (auto &partition : partitions)
+		partition.StaleSong(uri);
 }

 #endif
@@ -88,15 +109,45 @@ Instance::OnDatabaseSongRemoved(const LightSong &song)
 #ifdef ENABLE_NEIGHBOR_PLUGINS

 void
-Instance::FoundNeighbor(gcc_unused const NeighborInfo &info)
+Instance::FoundNeighbor(gcc_unused const NeighborInfo &info) noexcept
 {
-	idle_add(IDLE_NEIGHBOR);
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
 }

 void
-Instance::LostNeighbor(gcc_unused const NeighborInfo &info)
+Instance::LostNeighbor(gcc_unused const NeighborInfo &info) noexcept
 {
-	idle_add(IDLE_NEIGHBOR);
+	for (auto &partition : partitions)
+		partition.EmitIdle(IDLE_NEIGHBOR);
+}
+
+#endif
+
+#ifdef ENABLE_CURL
+
+void
+Instance::LookupRemoteTag(const char *uri) noexcept
+{
+	if (!uri_has_scheme(uri))
+		return;
+
+	if (!remote_tag_cache)
+		remote_tag_cache = std::make_unique<RemoteTagCache>(event_loop,
+								    *this);
+
+	remote_tag_cache->Lookup(uri);
+}
+
+void
+Instance::OnRemoteTag(const char *uri, const Tag &tag) noexcept
+{
+	if (!tag.IsDefined())
+		/* boring */
+		return;
+
+	for (auto &partition : partitions)
+		partition.TagModified(uri, tag);
 }

 #endif
--- a/Show More
+++ b/Show More