From 0c102a8f2fb576dae069a619c0b4ec8b7b7dccef Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 6 Mar 2023 20:06:41 +0100
Subject: [PATCH] meson.build: add missing libfmt dependencies

---
 src/StateFileConfig.cxx    | 2 +-
 src/fs/meson.build         | 1 +
 src/input/meson.build      | 3 +++
 src/lib/sqlite/meson.build | 1 +
 src/thread/meson.build     | 3 +++
 test/meson.build           | 4 ++++
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/StateFileConfig.cxx b/src/StateFileConfig.cxx
index 5dfe17dae..ac54052b1 100644
--- a/src/StateFileConfig.cxx
+++ b/src/StateFileConfig.cxx
@@ -5,7 +5,7 @@
 #include "config/Data.hxx"
 
 #ifdef ANDROID
-#include "fs/StandardDirectory.hxx"
+#include "fs/glue/StandardDirectory.hxx"
 #endif
 
 StateFileConfig::StateFileConfig(const ConfigData &config)
diff --git a/src/fs/meson.build b/src/fs/meson.build
index e19fd2426..018be1469 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -28,6 +28,7 @@ fs = static_library(
     shlwapi_dep,
     system_dep,
     icu_dep,
+    fmt_dep,
   ],
 )
 
diff --git a/src/input/meson.build b/src/input/meson.build
index 36026d425..490cd3370 100644
--- a/src/input/meson.build
+++ b/src/input/meson.build
@@ -10,6 +10,9 @@ input_api = static_library(
   'ProxyInputStream.cxx',
   'LastInputStream.cxx',
   include_directories: inc,
+  dependencies: [
+    thread_dep,
+  ],
 )
 
 input_api_dep = declare_dependency(
diff --git a/src/lib/sqlite/meson.build b/src/lib/sqlite/meson.build
index 2db7fc8ae..5e5bb3e56 100644
--- a/src/lib/sqlite/meson.build
+++ b/src/lib/sqlite/meson.build
@@ -18,6 +18,7 @@ sqlite = static_library(
   include_directories: inc,
   dependencies: [
     sqlite_dep,
+    fmt_dep,
   ],
 )
 
diff --git a/src/thread/meson.build b/src/thread/meson.build
index 408836481..ec4aa0ff6 100644
--- a/src/thread/meson.build
+++ b/src/thread/meson.build
@@ -21,4 +21,7 @@ thread = static_library(
 
 thread_dep = declare_dependency(
   link_with: thread,
+  dependencies: [
+    fmt_dep,
+  ],
 )
diff --git a/test/meson.build b/test/meson.build
index d1cc62c3d..20048deb7 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -39,6 +39,7 @@ executable(
   include_directories: inc,
   dependencies: [
     config_dep,
+    fmt_dep,
   ],
 )
 
@@ -254,6 +255,7 @@ if enable_database
     '../src/TagSave.cxx',
     include_directories: inc,
     dependencies: [
+      fmt_dep,
       pcm_basic_dep,
       song_dep,
       fs_dep,
@@ -383,6 +385,7 @@ executable(
   '../src/TagFile.cxx',
   include_directories: inc,
   dependencies: [
+    fmt_dep,
     playlist_glue_dep,
     input_glue_dep,
     archive_glue_dep,
@@ -446,6 +449,7 @@ executable(
   '../src/TagSave.cxx',
   include_directories: inc,
   dependencies: [
+      fmt_dep,
     decoder_glue_dep,
     input_glue_dep,
     archive_glue_dep,