9 files changed, 26 insertions, 17 deletions
diff --git a/android/build.py b/android/build.py
index 5bee46304..982160783 100755
--- a/android/build.py
+++ b/android/build.py
@@ -103,7 +103,7 @@ class AndroidNdkToolchain:
         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
+        common_flags += ' -target ' + llvm_triple + ' -gcc-toolchain ' + toolchain_path
 
         common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'
 
diff --git a/doc/mpd.conf.5.rst b/doc/mpd.conf.5.rst
index 6b364c513..90d515c16 100644
--- a/doc/mpd.conf.5.rst
+++ b/doc/mpd.conf.5.rst
@@ -130,7 +130,8 @@ audio_output
 
 replaygain <off or album or track or auto>
   If specified, mpd will adjust the volume of songs played using ReplayGain
-  tags (see http://www.replaygain.org/). Setting this to "album" will
+  tags (see https://wiki.hydrogenaud.io/index.php?title=Replaygain).
+  Setting this to "album" will
   adjust volume using the album's ReplayGain tags, while setting it to "track"
   will adjust it using the track ReplayGain tags. "auto" uses the track
   ReplayGain tags if random play is activated otherwise the album ReplayGain
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index a097fc652..6f36cf8b5 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -372,7 +372,8 @@ input {
 # the argument "off", "album", "track" or "auto". "auto" is a special mode that
 # chooses between "track" and "album" depending on the current state of
 # random playback. If random playback is enabled then "track" mode is used.
-# See <http://www.replaygain.org> for more details about ReplayGain.
+# See <https://wiki.hydrogenaud.io/index.php?title=Replaygain> for
+# more details about ReplayGain.
 # This setting is off by default.
 #
 #replaygain			"album"
diff --git a/doc/protocol.rst b/doc/protocol.rst
index 73f810210..8d2eea243 100644
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
@@ -727,7 +727,7 @@ Whenever possible, ids should be used.
 
 .. _command_playlistfind:
 
-:command:`playlistfind {TAG} {NEEDLE}`
+:command:`playlistfind {FILTER}`
     Finds songs in the queue with strict
     matching.
 
@@ -748,7 +748,7 @@ Whenever possible, ids should be used.
 
 .. _command_playlistsearch:
 
-:command:`playlistsearch {TAG} {NEEDLE}`
+:command:`playlistsearch {FILTER}`
     Searches case-insensitively for partial matches in the
     queue.
 
diff --git a/doc/user.rst b/doc/user.rst
index 694ce0cc5..e21b07d36 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -167,7 +167,7 @@ Compiling for Android
 You need:
 
 * Android SDK
-* Android NDK 
+* `Android NDK r22 <https://developer.android.com/ndk/downloads>`_
 
 Just like with the native build, unpack the :program:`MPD` source
 tarball and change into the directory.  Then, instead of
diff --git a/python/build/ffmpeg.py b/python/build/ffmpeg.py
index 6c0753618..ae2ff6b00 100644
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -10,11 +10,6 @@ class FfmpegProject(Project):
         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)
@@ -36,8 +31,8 @@ class FfmpegProject(Project):
             '--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-cflags=' + toolchain.cflags + ' ' + toolchain.cppflags + ' ' + self.cppflags,
+            '--extra-cxxflags=' + toolchain.cxxflags + ' ' + toolchain.cppflags + ' ' + self.cppflags,
             '--extra-ldflags=' + toolchain.ldflags,
             '--extra-libs=' + toolchain.libs,
             '--ar=' + toolchain.ar,
diff --git a/python/build/libs.py b/python/build/libs.py
index c9cfd1d25..c17237c4b 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -377,8 +377,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.73.0.tar.xz',
-    '7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a',
+    'http://curl.haxx.se/download/curl-7.74.0.tar.xz',
+    '999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -434,7 +434,7 @@ libnfs = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2',
-    '83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1',
+    'https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2',
+    '953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb',
     'include/boost/version.hpp',
 )
diff --git a/src/lib/pcre/RegexPointer.hxx b/src/lib/pcre/RegexPointer.hxx
index 7311d0407..cb7e730ba 100644
--- a/src/lib/pcre/RegexPointer.hxx
+++ b/src/lib/pcre/RegexPointer.hxx
@@ -40,6 +40,13 @@
 
 #include <array>
 
+#if GCC_CHECK_VERSION(11,0)
+#pragma GCC diagnostic push
+/* bogus GCC 11 warning "ovector may be used uninitialized" in the
+   ovector.size() call */
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
 class RegexPointer {
 protected:
 	pcre *re = nullptr;
@@ -63,4 +70,8 @@ public:
 	}
 };
 
+#if GCC_CHECK_VERSION(11,0)
+#pragma GCC diagnostic pop
+#endif
+
 #endif
diff --git a/src/output/plugins/sles/SlesOutputPlugin.cxx b/src/output/plugins/sles/SlesOutputPlugin.cxx
index 61a815554..6c3978a9d 100644
--- a/src/output/plugins/sles/SlesOutputPlugin.cxx
+++ b/src/output/plugins/sles/SlesOutputPlugin.cxx
@@ -33,6 +33,7 @@
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
 
+#include <cassert>
 #include <iterator>
 #include <stdexcept>