Fix libdvdnav compilation

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

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 54930f977f2a18c3e0bb88a5ac87ba1013187ebb..075344ea7a92235536060cb331d24c757ad45fa6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,8 +38,10 @@ LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.61
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
-CMAKE_VERSION=2.4.8
-CMAKE_URL=http://www.cmake.org/files/v2.4/cmake-$(CMAKE_VERSION).tar.gz
+GNUMAKE_VERSION=3.81
+GNUMAKE_URL=$(GNU)/make/make-$(GNUMAKE_VERSION).tar.bz2
+CMAKE_VERSION=2.6.0
+CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.24
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.9.6
@@ -76,7 +78,7 @@ OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.2.0
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
 #VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.0beta2
+THEORA_VERSION=1.0beta3
 THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 #THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.2.1
@@ -107,13 +109,15 @@ LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_V
 LIBDVDNAV_VERSION=4.1.1
 LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
 LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+LIBDVDREAD_VERSION=0.9.4
+LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 LIBDVBPSI_VERSION=0.1.6
 LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
-#GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
 GOOM2k4_VERSION=2k4-0
-GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
+GOOM2k4_URL=$(VIDEOLAN)/testing/contrib/goom-$(GOOM2k4_VERSION)-src.tar.gz
+#GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.99.beta13b
 LIBCACA_URL=$(VIDEOLAN)/testing/contrib/libcaca-$(LIBCACA_VERSION).tar.gz
 #LIBCACA_URL=http://libcaca.zoy.org/files/libcaca-$(LIBCACA_VERSION).tar.gz
@@ -136,15 +140,15 @@ VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.80
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
-PNG_VERSION=1.2.25
+PNG_VERSION=1.2.29
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.6
 GPGERROR_URL=$(VIDEOLAN)/testing/contrib/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.0
+GCRYPT_VERSION=1.4.1
 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=2.2.2
+GNUTLS_VERSION=2.2.5
 GNUTLS_URL=http://www.gnu.org/software/gnutls/releases/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