X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2Fpackages.mak;h=ebabb5005f3110657d816d7b7081b8fa071d7900;hb=fd795f7da62400a8c078823d9a7eb3970072e6f1;hp=8b55400fc03f9207f17ebfa2c882a22581e7d394;hpb=5035a950fdec0f6739592da5d6d98870352e7b5a;p=vlc

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 8b55400fc0..ebabb5005f 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -92,10 +92,8 @@ LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).
 LIBMATROSKA_VERSION=1.2.0
 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 #IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-FFMPEG_VERSION=0.4.8
-FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
-FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
-FFMPEG_SVN_REV=26400
+FFMPEG_GIT=git://git.videolan.org/ffmpeg.git
+#FFMPEG_GIT=git://git.libav.org/libav.git
 LIBDVDCSS_VERSION=1.2.10
 LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 LIBDVDNAV_VERSION=4.1.1
@@ -107,7 +105,7 @@ LIBDVDREAD_SVN_REV=1218
 LIBDVDREAD_VERSION=0.9.7
 LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 #LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-LIBDVBPSI_VERSION=0.2.0
+LIBDVBPSI_VERSION=0.2.1
 LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
@@ -146,7 +144,7 @@ GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VER
 GCRYPT_VERSION=1.4.6
 #GCRYPT_URL=$(CONTRIB_VIDEOLAN)/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=2.12.2
+GNUTLS_VERSION=2.12.7
 GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 OPENCDK_VERSION=0.6.6
 OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2
@@ -162,8 +160,7 @@ X264_URL=$(CONTRIB_VIDEOLAN)/x264-$(X264_VERSION).tar.gz
 JPEG_VERSION=8c
 JPEG_URL=http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
 TIFF_VERSION=3.9.5
-TIFF_URL=ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
-#TIFF_URL=http://dl.maptools.org/dl/libtiff/tiff-$(TIFF_VERSION).tar.gz
+TIFF_URL=http://download.osgeo.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
 SDL_VERSION=1.2.14
 SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
 SDL_IMAGE_VERSION=1.2.10