From 520028dcfcfe277c7df5147bbe1e9ab048ce4622 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 21 Sep 2021 14:02:45 +0200
Subject: [PATCH] python/build/libs.py: remove libexpat, switch to Meson wrap

---
 android/build.py          |  1 -
 meson.build               |  3 +++
 python/build/libs.py      | 13 -------------
 src/lib/expat/meson.build |  4 +++-
 subprojects/.gitignore    |  1 +
 subprojects/expat.wrap    |  9 +++++++++
 win32/build.py            |  1 -
 7 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 subprojects/expat.wrap

diff --git a/android/build.py b/android/build.py
index 93d688c5b..40691d8f0 100755
--- a/android/build.py
+++ b/android/build.py
@@ -162,7 +162,6 @@ thirdparty_libs = [
     ffmpeg,
     openssl,
     curl,
-    libexpat,
     libnfs,
     boost,
 ]
diff --git a/meson.build b/meson.build
index ae9bb296a..b8f81ef28 100644
--- a/meson.build
+++ b/meson.build
@@ -12,12 +12,15 @@ project(
 
     # If we build those libraries as Meson subproject, they shall be
     # linked statically into the MPD executable.
+    'expat:default_library=static',
     'fmt:default_library=static',
     'gtest:default_library=static',
     'sqlite3:default_library=static',
     'vorbis:default_library=static',
 
     # Not interested in compiler warnings from subprojects.
+    'expat:werror=false',
+    'expat:warning_level=0',
     'fmt:warning_level=0',
     'gtest:warning_level=0',
     'sqlite3:warning_level=0',
diff --git a/python/build/libs.py b/python/build/libs.py
index e4e694fc1..fa419b11d 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -416,19 +416,6 @@ curl = CmakeProject(
     patches='src/lib/curl/patches',
 )
 
-libexpat = CmakeProject(
-    'https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2',
-    'f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237',
-    'lib/libexpat.a',
-    [
-        '-DEXPAT_BUILD_TOOLS=OFF',
-        '-DEXPAT_BUILD_EXAMPLES=OFF',
-        '-DEXPAT_BUILD_TESTS=OFF',
-        '-DEXPAT_SHARED_LIBS=OFF',
-        '-DEXPAT_BUILD_DOCS=OFF',
-    ],
-)
-
 libnfs = AutotoolsProject(
     'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
     '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',
diff --git a/src/lib/expat/meson.build b/src/lib/expat/meson.build
index a7c1b10ae..c5d3b1ed2 100644
--- a/src/lib/expat/meson.build
+++ b/src/lib/expat/meson.build
@@ -1,4 +1,6 @@
-expat_dep = dependency('expat', required: get_option('expat'))
+expat_dep = dependency('expat',
+                       fallback: ['expat', 'expat_dep'],
+                       required: get_option('expat'))
 conf.set('ENABLE_EXPAT', expat_dep.found())
 if not expat_dep.found()
   subdir_done()
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 31a36ad74..4eb01d547 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1,5 +1,6 @@
 /packagecache/
 
+/expat-*/
 /fmt-*/
 /googletest-*/
 /sqlite-*/
diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap
new file mode 100644
index 000000000..53b762397
--- /dev/null
+++ b/subprojects/expat.wrap
@@ -0,0 +1,9 @@
+[wrap-file]
+directory = expat-2.2.9
+source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz
+source_filename = expat-2.2.9.tar.bz2
+source_hash = 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.9/3/get_zip
+patch_filename = expat-2.2.9-3-wrap.zip
+patch_hash = e9aaace62e9a158b5e96f5c38c9f81f369179206acd87697653d777c0d3975d3
+
diff --git a/win32/build.py b/win32/build.py
index b79ad0954..6e8705d93 100755
--- a/win32/build.py
+++ b/win32/build.py
@@ -106,7 +106,6 @@ thirdparty_libs = [
     gme,
     ffmpeg,
     curl,
-    libexpat,
     libnfs,
     jack,
     boost,