python/build/libs.py: remove libexpat, switch to Meson wrap

android/build.py

@@ -162,7 +162,6 @@ thirdparty_libs = [
     ffmpeg,
     openssl,
     curl,
-    libexpat,
     libnfs,
     boost,
 ]

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',

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',

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()

subprojects/.gitignore

@@ -1,5 +1,6 @@
 /packagecache/
 
+/expat-*/
 /fmt-*/
 /googletest-*/
 /sqlite-*/

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
+

win32/build.py

@@ -106,7 +106,6 @@ thirdparty_libs = [
     gme,
     ffmpeg,
     curl,
-    libexpat,
     libnfs,
     jack,
     boost,