From 771c46032f4dd60097d46524ef6873a49b051a01 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 15 Oct 2021 14:22:37 +0200
Subject: [PATCH] meson.build: add missing libfmt dependencies
Fixes https://github.com/MusicPlayerDaemon/MPD/discussions/1281
The problem occurred when there was libfmt-dev installed, but it was
too old (e.g. on Debian Buster), and Meson used the wrap fallback.
Those internal MPD libraries where the libfmt dependency was not
declared were still using the old system libfmt headers, which are not
ABI-compatible with MPD's own libfmt build.
---
NEWS | 1 +
src/lib/upnp/meson.build | 1 +
src/neighbor/plugins/meson.build | 1 +
src/playlist/plugins/meson.build | 1 +
src/storage/plugins/meson.build | 1 +
src/zeroconf/avahi/meson.build | 1 +
test/meson.build | 1 +
7 files changed, 7 insertions(+)
diff --git a/NEWS b/NEWS
index 9e0724371..4cd880a0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
ver 0.23.1 (not yet released)
+* fix libfmt linker problems
ver 0.23 (2021/10/14)
* protocol
diff --git a/src/lib/upnp/meson.build b/src/lib/upnp/meson.build
index 863f9d4a1..85ac8b648 100644
--- a/src/lib/upnp/meson.build
+++ b/src/lib/upnp/meson.build
@@ -51,6 +51,7 @@ upnp = static_library(
'Util.cxx',
include_directories: inc,
dependencies: [
+ log_dep,
upnp_dep,
curl_dep,
expat_dep,
diff --git a/src/neighbor/plugins/meson.build b/src/neighbor/plugins/meson.build
index a9531322e..f998d0159 100644
--- a/src/neighbor/plugins/meson.build
+++ b/src/neighbor/plugins/meson.build
@@ -25,6 +25,7 @@ neighbor_plugins = static_library(
neighbor_plugins_sources,
include_directories: inc,
dependencies: [
+ log_dep,
dbus_dep,
smbclient_dep,
upnp_dep,
diff --git a/src/playlist/plugins/meson.build b/src/playlist/plugins/meson.build
index 53310572c..f5375bf99 100644
--- a/src/playlist/plugins/meson.build
+++ b/src/playlist/plugins/meson.build
@@ -5,6 +5,7 @@ playlist_plugins_sources = [
]
playlist_plugins_deps = [
+ log_dep,
expat_dep,
flac_dep,
]
diff --git a/src/storage/plugins/meson.build b/src/storage/plugins/meson.build
index 0d2705fcb..f17c414b1 100644
--- a/src/storage/plugins/meson.build
+++ b/src/storage/plugins/meson.build
@@ -44,6 +44,7 @@ storage_plugins = static_library(
storage_plugins_sources,
include_directories: inc,
dependencies: [
+ log_dep,
curl_dep,
dbus_dep,
expat_dep,
diff --git a/src/zeroconf/avahi/meson.build b/src/zeroconf/avahi/meson.build
index ea8774900..a1d951921 100644
--- a/src/zeroconf/avahi/meson.build
+++ b/src/zeroconf/avahi/meson.build
@@ -13,6 +13,7 @@ avahi = static_library(
'Publisher.cxx',
include_directories: inc,
dependencies: [
+ log_dep,
libavahi_client,
],
)
diff --git a/test/meson.build b/test/meson.build
index 5e6c9066b..21db24294 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -127,6 +127,7 @@ if enable_inotify
'../src/db/update/InotifySource.cxx',
include_directories: inc,
dependencies: [
+ log_dep,
event_dep,
util_dep,
],