oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

This commit is contained in:
Max Kellermann 2021-09-21 14:02:45 +02:00
parent e98cef06c7
commit 520028dcfc
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/build.py
View File

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

3
meson.build
View File

@ -12,12 +12,15 @@ project(
# If we build those libraries as Meson subproject, they shall be # If we build those libraries as Meson subproject, they shall be
# linked statically into the MPD executable. # linked statically into the MPD executable.
'expat:default_library=static',
'fmt:default_library=static', 'fmt:default_library=static',
'gtest:default_library=static', 'gtest:default_library=static',
'sqlite3:default_library=static', 'sqlite3:default_library=static',
'vorbis:default_library=static', 'vorbis:default_library=static',
# Not interested in compiler warnings from subprojects. # Not interested in compiler warnings from subprojects.
'expat:werror=false',
'expat:warning_level=0',
'fmt:warning_level=0', 'fmt:warning_level=0',
'gtest:warning_level=0', 'gtest:warning_level=0',
'sqlite3:warning_level=0', 'sqlite3:warning_level=0',

13
python/build/libs.py
View File

@ -416,19 +416,6 @@ curl = CmakeProject(
patches='src/lib/curl/patches', 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( libnfs = AutotoolsProject(
'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz', 'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
'6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d', '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',

4
src/lib/expat/meson.build
View File

@ -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()) conf.set('ENABLE_EXPAT', expat_dep.found())
if not expat_dep.found() if not expat_dep.found()
subdir_done() subdir_done()

1
subprojects/.gitignore vendored
View File

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

9
subprojects/expat.wrap Normal file
View File

@ -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

1
win32/build.py
View File

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