diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap index 08c6fa83bcf07cb356a06062018ba944518e3eb2..d6fa936e739c019a0db780e96d3c47e8dd1a6862 100755 --- a/extras/tools/bootstrap +++ b/extras/tools/bootstrap @@ -71,11 +71,11 @@ fi } check autoconf 2.69 -check automake 1.14 -check m4 1.4.16 -check libtool 2.4 +check automake 1.15 +check m4 1.4.17 +check libtool 2.4.6 check pkg-config -check cmake 2.8.8 +check cmake 3.2.2 check yasm check_tar check_sed diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak index 74e6c9edc9fe0665c3e6990a89e896e1ff4aa09f..2fb29274957d366b49f453c6d0d530a34704045e 100644 --- a/extras/tools/packages.mak +++ b/extras/tools/packages.mak @@ -6,29 +6,29 @@ YASM_VERSION=1.2.0 #YASM_URL=$(CONTRIB_VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz -CMAKE_VERSION=2.8.12.2 -CMAKE_URL=http://www.cmake.org/files/v2.8/cmake-$(CMAKE_VERSION).tar.gz +CMAKE_VERSION=3.2.2 +CMAKE_URL=http://www.cmake.org/files/v3.2/cmake-$(CMAKE_VERSION).tar.gz -LIBTOOL_VERSION=2.4.2 -LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz +LIBTOOL_VERSION=2.4.6 +LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.xz AUTOCONF_VERSION=2.69 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz -AUTOMAKE_VERSION=1.14 +AUTOMAKE_VERSION=1.15 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz -M4_VERSION=1.4.16 +M4_VERSION=1.4.17 M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz PKGCFG_VERSION=0.28-1 #PKGCFG_URL=http://downloads.videolan.org/pub/videolan/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz PKGCFG_URL=$(SF)/pkgconfiglite/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz -TAR_VERSION=1.26 +TAR_VERSION=1.28 TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2 -XZ_VERSION=5.0.3 +XZ_VERSION=5.2.2 XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2 GAS_VERSION=72887b9 @@ -40,5 +40,5 @@ SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2 ANT_VERSION=1.9.5 ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2 -GETTEXT_VERSION=0.19.4 +GETTEXT_VERSION=0.19.6 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index 7b81585f8d9a4e418a8cc4e2aa8fc29ad4c889b5..2dcbb78f6a81dcb4bd889c3a01f1ff15dc6c4154 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -77,10 +77,10 @@ DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz # libtool -libtool-$(LIBTOOL_VERSION).tar.gz: +libtool-$(LIBTOOL_VERSION).tar.xz: $(call download,$(LIBTOOL_URL)) -libtool: libtool-$(LIBTOOL_VERSION).tar.gz +libtool: libtool-$(LIBTOOL_VERSION).tar.xz $(UNPACK) $(MOVE) @@ -91,7 +91,7 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz touch $@ CLEAN_PKG += libtool -DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz +DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.xz CLEAN_FILE += .libtool # GNU tar (with xz support)