Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / extras / contrib / src / packages.mak

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 59624e42a9851d24ccff381440d3f97d43fe8814..08843377afbe11db68a6567cc18379979b2320c6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -40,7 +40,7 @@ GNUMAKE_VERSION=3.81
 GNUMAKE_URL=$(GNU)/make/make-$(GNUMAKE_VERSION).tar.bz2
 CMAKE_VERSION=2.6.4
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
-LIBTOOL_VERSION=1.5.26
+LIBTOOL_VERSION=2.2.10
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.11
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
@@ -50,12 +50,12 @@ PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION
 LIBICONV_VERSION=1.13.1
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONVMAC_URL=$(CONTRIB_VIDEOLAN)/libiconv-snowleopard.tar.bz2
-GETTEXT_VERSION=0.18
+GETTEXT_VERSION=0.18.1.1
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
-FONTCONFIG_VERSION=2.7.3
-FONTCONFIG_URL=$(CONTRIB_VIDEOLAN)/fontconfig-$(FONTCONFIG_VERSION).tar.gz
-#FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
-FREETYPE2_VERSION=2.4.1
+FONTCONFIG_VERSION=2.8.0
+#FONTCONFIG_URL=$(CONTRIB_VIDEOLAN)/fontconfig-$(FONTCONFIG_VERSION).tar.gz
+FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
+FREETYPE2_VERSION=2.4.2
 FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 FRIBIDI_VERSION=0.19.2
 FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
@@ -113,9 +113,9 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION)
 GOOM2k4_VERSION=2k4-0
 GOOM2k4_URL=$(CONTRIB_VIDEOLAN)/goom-$(GOOM2k4_VERSION)-src.tar.gz
 #GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
-LIBCACA_VERSION=0.99.beta16
-LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
-#LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBCACA_VERSION=0.99.beta17
+#LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDCA_VERSION=0.0.5
 LIBDCA_URL=ftp://ftp.videolan.org/pub/videolan/libdca/$(LIBDCA_VERSION)/libdca-$(LIBDCA_VERSION).tar.bz2
 LIBDC1394_VERSION=1.2.1
@@ -139,7 +139,7 @@ CDIO_VERSION=0.80
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.4.3
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.9
+GPGERROR_VERSION=1.7
 #GPGERROR_URL=$(CONTRIB_VIDEOLAN)/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GCRYPT_VERSION=1.4.6
@@ -206,12 +206,12 @@ NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
 PCRE_VERSION=8.00
 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
-FLUID_VERSION=1.0.9
+FLUID_VERSION=1.0.9# DO NOT update, this will require glib
 FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
-YASM_VERSION=0.7.2
+YASM_VERSION=1.1.0
 #YASM_URL=$(CONTRIB_VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz
 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
-KATE_VERSION=0.3.0
+KATE_VERSION=0.3.8
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
 TIGER_VERSION=0.3.1
 TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
@@ -219,7 +219,7 @@ ORC_VERSION=0.4.4
 ORC_URL=http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
 SCHROED_VERSION=1.0.9
 SCHROED_URL=http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
-ASS_VERSION=0.9.9
+ASS_VERSION=0.9.11
 ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2
 GSM_VERSION=1.0.12
 #GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
@@ -233,8 +233,8 @@ XCB_UTIL_VERSION=0.2
 XCB_UTIL_URL=$(XCB_URL)
 GLEW_VERSION=1.5.1
 GLEW_URL=$(SF)/glew/glew/$(GLEW_VERSION)/glew-$(GLEW_VERSION)-src.tgz
-LIBPROJECTM_VERSION=2.0.0
-LIBPROJECTM_URL=$(SF)/projectm/libprojectM/libprojectM-$(LIBPROJECTM_VERSION)/libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
+LIBPROJECTM_VERSION=2.0.1
+LIBPROJECTM_URL=$(SF)/projectm/$(LIBPROJECTM_VERSION)/projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
 LIBPROJECTM_SVN=https://projectm.svn.sourceforge.net/svnroot/projectm/trunk
 PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
 SQLITE_VERSION=3.6.20