From a5cc13b0c5327ab742e2d3a66de63e1d0e02e7a6 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Fri, 17 Aug 2018 02:41:08 -0400 Subject: [PATCH] build: Add libexpat to the crosscompile build on Windows. The Curl plugin requires libexpat in order to work these days, so we should download and build it in order to get the plugin enabled on Windows. --- NEWS | 2 ++ python/build/libs.py | 9 +++++++++ win32/build.py | 1 + 3 files changed, 12 insertions(+) diff --git a/NEWS b/NEWS index 6e62fe1e8..33e0e0712 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ ver 0.20.21 (not yet released) * playlist - cue: support file type declaration "FLAC" (non-standard) * URI schemes are case insensitive +* Windows + - enable the "curl" storage plugin ver 0.20.20 (2018/05/22) * protocol diff --git a/python/build/libs.py b/python/build/libs.py index ceab85c09..04e14e829 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -364,6 +364,15 @@ curl = AutotoolsProject( patches='src/lib/curl/patches', ) +libexpat = AutotoolsProject( + 'https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2', + '17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2', + 'lib/libexpat.a', + [ + '--disable-shared', '--enable-static', + ], +) + libnfs = AutotoolsProject( 'https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz', '445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5', diff --git a/win32/build.py b/win32/build.py index 99203a6d6..b3ed4ae55 100755 --- a/win32/build.py +++ b/win32/build.py @@ -86,6 +86,7 @@ thirdparty_libs = [ liblame, ffmpeg, curl, + libexpat, libnfs, boost, ]