Changeset 494e6f9a464c8cc5015baf1dc0ef17161b78597e

Show
Ignore:
Timestamp:
20/09/08 01:13:44 (2 months ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1221866024 +0200
git-parent:

[c66c59d7223081bc6c75c797676bd5c2f26ae198]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1221865959 +0200
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Distributions/darwin.mak

    re4e7928 r494e6f9  
    44    .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \ 
    55    .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig .asa \ 
    6     .png .gpg-error .gcrypt .opencdk .gnutls .cddb .cdio .vcdimager \ 
     6    .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ 
    77    .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ 
    88    .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \ 

  • extras/contrib/src/Distributions/win32.mak

    rdf952ae r494e6f9  
    44        .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \ 
    55        .live .goom2k4 .caca .mod .x264  .xml .twolame \ 
    6         .png .gpg-error .gcrypt .opencdk .gnutls .mpcdec \ 
     6        .png .gpg-error .gcrypt .gnutls .mpcdec \ 
    77        .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \ 
    88        .dx_headers .dshow_headers .gecko-win32 .dca \ 

  • extras/contrib/src/Makefile

    r129582f r494e6f9  
    19151915endif 
    19161916 
    1917 .gnutls: gnutls .opencdk .gcrypt .gpg-error  
     1917.gnutls: gnutls .gcrypt .gpg-error  
    19181918ifdef HAVE_WIN32 
    19191919    (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) 
    19201920else 
    1921     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install) 
     1921    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install) 
    19221922endif 
    19231923    $(INSTALL_NAME) 

  • extras/contrib/src/packages.mak

    refc1645 r494e6f9  
    148148#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 
    149149GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 
    150 GNUTLS_VERSION=2.2.5 
    151 GNUTLS_URL=http://www.gnu.org/software/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2 
     150GNUTLS_VERSION=2.4.2 
     151GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2 
    152152OPENCDK_VERSION=0.6.6 
    153153OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2