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.

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index ea1c1ab342cf0664a31fc0d2a3fb966142030a8a..88a84c2568634a6b5ce69748d2111278e121240d 100644 (file)
--- 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 40bda6759f57266539fd548ab3f9d53eb8bdd7c3..bbcbba7854a36871cb1cc042fa82472d8e80aec7 100644 (file)
--- 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 ed1e35295265a9193ec2611d75bcff82aed84735..4fdc1d40bb7cdf143f4755cab64d34a7f0b8507b 100644 (file)
--- 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 60ee2f15023b73222d350cb851ec7c9c100d6151..66b9ea983783ecce6149247110e7179fa207040f 100644 (file)
--- 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