From ae7d550a01bfcb3c4da7a69fc4d597709d40e1ee Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 28 May 2020 13:18:52 +0200
Subject: [PATCH 1/5] meson.build: remove `-Wall -Wextra`, to be set by Meson
---
meson.build | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
index fae9c488a..6ec4cb5fe 100644
--- a/meson.build
+++ b/meson.build
@@ -41,9 +41,6 @@ common_cxxflags = [
]
test_common_flags = [
- '-Wall',
- '-Wextra',
-
'-fvisibility=hidden',
'-ffast-math',
From 2c084781b04ed184941fa1b732d483ebca650a4d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 28 May 2020 13:22:33 +0200
Subject: [PATCH 2/5] output/openal: disable -Wdeprecated-declarations on Apple
---
src/output/plugins/OpenALOutputPlugin.cxx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/output/plugins/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx
index d832bae75..f68a8338b 100644
--- a/src/output/plugins/OpenALOutputPlugin.cxx
+++ b/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 {
From d751df0a73efe0645766d64a4c029b4803ebd60d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 28 May 2020 13:28:09 +0200
Subject: [PATCH 3/5] storage/State: disable -Wcomma to work around Boost
compiler warning
---
src/storage/StorageState.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/storage/StorageState.cxx b/src/storage/StorageState.cxx
index eea57fa26..d6a63601e 100644
--- a/src/storage/StorageState.cxx
+++ b/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: "
From 8e07ea7ad87ac25122f5f31985ae5e25b5600c96 Mon Sep 17 00:00:00 2001
From: Shen-Ta Hsieh <ibmibmibm.tw@gmail.com>
Date: Sat, 30 May 2020 00:30:00 +0800
Subject: [PATCH 4/5] src/db: fitting libmpdclient interface
---
src/db/plugins/ProxyDatabasePlugin.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index 5894c2c90..4f8f2ef1d 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -493,9 +493,13 @@ ProxyDatabase::Connect()
try {
CheckError(connection);
- 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",
- mpd_connection_get_server_version(connection));
+ if (mpd_connection_cmp_server_version(connection, 0, 19, 0) < 0) {
+ const unsigned *version =
+ 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()))
From 1008d5f67c030efdcc1a214ee4a359564fef5932 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 6 May 2020 17:15:05 -0700
Subject: [PATCH 5/5] use cwchar include
Needed for std::wmemchr under libcxx
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
src/util/WStringAPI.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/WStringAPI.hxx b/src/util/WStringAPI.hxx
index 1cbf5dcd5..703b09837 100644
--- a/src/util/WStringAPI.hxx
+++ b/src/util/WStringAPI.hxx
@@ -32,7 +32,7 @@
#include "Compiler.h"
-#include <wchar.h>
+#include <cwchar>
gcc_pure gcc_nonnull_all
static inline size_t