[vlc-commits] contrib: bump libarchive version

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Thu Jan 12 19:21:16 2017 +0100| [ee241a4968d49f3dac4ee492bf3e9650601c558b] | committer: Jean-Baptiste Kempf

contrib: bump libarchive version

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ee241a4968d49f3dac4ee492bf3e9650601c558b
---

 contrib/src/libarchive/SHA512SUMS | 2 +-
 contrib/src/libarchive/rules.mak  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/libarchive/SHA512SUMS b/contrib/src/libarchive/SHA512SUMS
index 1f8af0c..f68eaae 100644
--- a/contrib/src/libarchive/SHA512SUMS
+++ b/contrib/src/libarchive/SHA512SUMS
@@ -1 +1 @@
-1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114  libarchive-3.1.2.tar.gz
+a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7  libarchive-3.2.2.tar.gz
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 41d17e0..0208513 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -1,9 +1,9 @@
 # LIBARCHIVE
-LIBARCHIVE_VERSION := 3.1.2
+LIBARCHIVE_VERSION := 3.2.2
 LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz
 
 PKGS += libarchive
-ifeq ($(call need_pkg,"libarchive >= 3.1.0"),)
+ifeq ($(call need_pkg,"libarchive >= 3.2.0"),)
 PKGS_FOUND += libarchive
 endif
 
@@ -22,7 +22,7 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
 
 .libarchive: libarchive
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \
-		--disable-bsdcpio --disable-bsdtar --without-nettle --without-bz2lib \
+		--disable-bsdcpio --disable-bsdtar --without-nettle \
 		--without-xml2 --without-lzmadec --without-iconv --without-expat
 	cd $< && $(MAKE) install
 	touch $@