bump version expat-2.2.0 & lua-expat-1.3.0

diff --git a/make/archives.mk b/make/archives.mk
index b161f0d2130329fd1a90da68944d9210d964da17..246fc9e255912a9c8b14618baaad3ea0c3d71772 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -213,8 +213,8 @@ $(ARCHIVE)/inadyn-mt.v.$(INADYN_VER).tar.gz:
 $(ARCHIVE)/flac-1.3.0.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/flac-1.3.0.tar.gz
 
-$(ARCHIVE)/expat-$(EXPAT_VER).tar.gz:
-       $(WGET) http://downloads.sourceforge.net/expat/expat-$(EXPAT_VER).tar.gz
+$(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2:
+       $(WGET) http://downloads.sourceforge.net/expat/expat-$(EXPAT_VER).tar.bz2
 
 $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz:
        $(WGET) http://matthewwild.co.uk/projects/luaexpat/luaexpat-$(LUA_EXPAT_VER).tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 3aa6539b6cec90c6cfb83565f61ee70dc34d270f..a41acb9a1c6a12d88705ed4b333beb319fe2323c 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -758,9 +758,9 @@ $(D)/libflac: $(ARCHIVE)/flac-1.3.0.tar.gz | $(TARGETPREFIX)
        $(REMOVE)/flac-1.3.0
        touch $@
 
-$(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGETPREFIX)
+$(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX)
        rm -fr $(BUILD_TMP)/expat-$(EXPAT_VER)
-       $(UNTAR)/expat-$(EXPAT_VER).tar.gz
+       $(UNTAR)/expat-$(EXPAT_VER).tar.bz2
        set -e; cd $(BUILD_TMP)/expat-$(EXPAT_VER); \
                $(CONFIGURE) \
                        --prefix= \
@@ -779,9 +779,6 @@ $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGE
        $(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.gz
        set -e; cd $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER); \
                rm makefile*; \
-               patch -p1 < $(PATCHES)/lua-expat-makefile.diff; \
-               patch -p1 < $(PATCHES)/lua-expat-1.3.0-lua-5.2.patch; \
-               patch -p1 < $(PATCHES)/lua-expat-lua-5.2-test-fix.patch; \
                $(MAKE) \
                CC=$(TARGET)-gcc LUA_V=$(LUA_ABIVER) LDFLAGS=-L$(TARGETPREFIX)/lib \
                LUA_INC=-I$(TARGETPREFIX)/include EXPAT_INC=-I$(TARGETPREFIX)/include; \

diff --git a/make/versions.mk b/make/versions.mk
index 3a403019316a7fc000a2dbff36dd678bc3871f36..42b7c243c76652f7aa08120d2da16a9a6d939807 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -39,7 +39,7 @@ CURL_VER = 7.54.0
 E2FSPROGS_VER=1.42.13
 
 # C library for parsing XML
-EXPAT_VER = 2.1.0
+EXPAT_VER = 2.2.0
 
 # A complete, cross-platform solution to record, convert and stream audio and video
 FFMPEG_GIT = 25c81e4
@@ -93,7 +93,7 @@ LUA_VER=$(LUA_ABIVER).4
 
 LUACURL_VER=v3
 
-LUA_EXPAT_VER = 1.2.0
+LUA_EXPAT_VER = 1.3.0
 
 # lua-feedparser
 LUA_FEEDPARSER_VER=0.7