From 56cc2f4c65d5a73d670136ce08e7983b8ccd0efa Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Wed, 20 Dec 2023 17:06:15 +0100
Subject: [PATCH] subprojects: add libmpdclient wrap

---
 android/build.py              | 1 -
 meson.build                   | 3 +++
 python/build/libs.py          | 6 ------
 subprojects/.gitignore        | 1 +
 subprojects/libmpdclient.wrap | 6 ++++++
 win32/build.py                | 1 -
 6 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 subprojects/libmpdclient.wrap

diff --git a/android/build.py b/android/build.py
index f17c0ee84..434b5988b 100755
--- a/android/build.py
+++ b/android/build.py
@@ -31,7 +31,6 @@ from build.toolchain import AndroidNdkToolchain
 # a list of third-party libraries to be used by MPD on Android
 from build.libs import *
 thirdparty_libs = [
-    libmpdclient,
     libid3tag,
     libmodplug,
     wildmidi,
diff --git a/meson.build b/meson.build
index 8f6c45f59..fa204fc71 100644
--- a/meson.build
+++ b/meson.build
@@ -18,6 +18,7 @@ project(
     'fmt:default_library=static',
     'gtest:default_library=static',
     'libmicrohttpd:default_library=static',
+    'libmpdclient:default_library=static',
     'libnpupnp:default_library=static',
     'liburing:default_library=static',
     'ogg:default_library=static',
@@ -75,6 +76,8 @@ project(
     'curl:smtp=disabled',
     'curl:telnet=disabled',
     'curl:tftp=disabled',
+    'libmpdclient:documentation=false',
+    'libmpdclient:test=false',
     'openssl:build_cli=false',
     'openssl:asm=disabled',
     'opus:docs=disabled',
diff --git a/python/build/libs.py b/python/build/libs.py
index 9952eda74..6f10393bf 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -10,12 +10,6 @@ from build.ffmpeg import FfmpegProject
 from build.boost import BoostProject
 from build.jack import JackProject
 
-libmpdclient = MesonProject(
-    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.20.tar.xz',
-    '18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d',
-    'lib/libmpdclient.a',
-)
-
 libsamplerate = CmakeProject(
     'https://github.com/libsndfile/libsamplerate/releases/download/0.2.2/libsamplerate-0.2.2.tar.xz',
     '97c010fc25156c33cddc272c1935afab',
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 416503efb..0263a7068 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -6,6 +6,7 @@
 /fmt-*/
 /googletest-*/
 /libmicrohttpd*
+/libmpdclient/
 /libnpupnp-*/
 /libogg-*/
 /liburing-*/
diff --git a/subprojects/libmpdclient.wrap b/subprojects/libmpdclient.wrap
new file mode 100644
index 000000000..2610fb5df
--- /dev/null
+++ b/subprojects/libmpdclient.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/MusicPlayerDaemon/libmpdclient
+revision = v2.22
+
+[provide]
+libmpdclient = libmpdclient_dep
diff --git a/win32/build.py b/win32/build.py
index 8dd91fe70..07669a28d 100755
--- a/win32/build.py
+++ b/win32/build.py
@@ -38,7 +38,6 @@ root_path = os.path.join(arch_path, 'root')
 # a list of third-party libraries to be used by MPD on Android
 from build.libs import *
 thirdparty_libs = [
-    libmpdclient,
     zlib,
     libid3tag,
     liblame,