Merge branch 'v0.21.x'

meson.build

@@ -43,9 +43,6 @@ common_cxxflags = [
 ]
 
 test_common_flags = [
-  '-Wall',
-  '-Wextra',
-
   '-Wvla',
 
   '-fvisibility=hidden',

src/db/plugins/ProxyDatabasePlugin.cxx

@@ -494,9 +494,13 @@ ProxyDatabase::Connect()
 	try {
 		CheckError(connection);
 
-		if (mpd_connection_cmp_server_version(connection, 0, 19, 0) < 0)
+		if (mpd_connection_cmp_server_version(connection, 0, 19, 0) < 0) {
-			throw FormatRuntimeError("Connect to MPD %s, but this plugin requires at least version 0.19",
+			const unsigned *version =
-						 mpd_connection_get_server_version(connection));
+				mpd_connection_get_server_version(connection);
+			throw FormatRuntimeError("Connect to MPD %u.%u.%u, but this "
+						 "plugin requires at least version 0.19",
+						 version[0], version[1], version[2]);
+		}
 
 		if (!password.empty() &&
 		    !mpd_run_password(connection, password.c_str()))

src/output/plugins/OpenALOutputPlugin.cxx

@@ -29,6 +29,9 @@
 #else
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
+/* on macOS, OpenAL is deprecated, but since the user asked to enable
+   this plugin, let's ignore the compiler warnings */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 class OpenALOutput final : AudioOutput {

src/storage/StorageState.cxx

@@ -33,9 +33,16 @@
 #include "Instance.hxx"
 #include "Log.hxx"
 
-#include <set>
+#ifdef __clang__
+/* ignore -Wcomma due to strange code in boost/array.hpp (in Boost
+   1.72) */
+#pragma GCC diagnostic ignored "-Wcomma"
+#endif
+
 #include <boost/crc.hpp>
 
+#include <set>
+
 #define MOUNT_STATE_BEGIN        "mount_begin"
 #define MOUNT_STATE_END          "mount_end"
 #define MOUNT_STATE_STORAGE_URI  "uri: "