[vlc-devel] commit: contrib: update gnutls to the new 2.4.2 stable (Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Sat Sep 20 01:12:39 2008 +0200| [494e6f9a464c8cc5015baf1dc0ef17161b78597e] | committer: Derk-Jan Hartman 

contrib: update gnutls to the new 2.4.2 stable

opencdk is apparently no longer available seperatly,
and the new gnutls is not yet in the gnu.org download archives for some reason.

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

 extras/contrib/src/Distributions/darwin.mak |    2 +-
 extras/contrib/src/Distributions/win32.mak  |    2 +-
 extras/contrib/src/Makefile                 |    4 ++--
 extras/contrib/src/packages.mak             |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index ea1c1ab..88a84c2 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -3,7 +3,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig .asa \
-    .png .gpg-error .gcrypt .opencdk .gnutls .cddb .cdio .vcdimager \
+    .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \
     .schroedinger .libass .aclocal
diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index 40bda67..bbcbba7 100644
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -3,7 +3,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
         .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
         .live .goom2k4 .caca .mod .x264  .xml .twolame \
-        .png .gpg-error .gcrypt .opencdk .gnutls .mpcdec \
+        .png .gpg-error .gcrypt .gnutls .mpcdec \
         .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
         .dx_headers .dshow_headers .gecko-win32 .dca \
         .lua .tag .fontconfig .portaudio .kate .libass \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ed1e352..4fdc1d4 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1914,11 +1914,11 @@ ifdef HAVE_WIN32
 	(cd $@; autoconf)
 endif
 
-.gnutls: gnutls .opencdk .gcrypt .gpg-error 
+.gnutls: gnutls .gcrypt .gpg-error 
 ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 60ee2f1..66b9ea9 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -147,8 +147,8 @@ GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz
 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.5
-GNUTLS_URL=http://www.gnu.org/software/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2
+GNUTLS_VERSION=2.4.2
+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
 DAAP_VERSION=0.4.0