[vlc-devel] commit: Fixed the gnutls upgrade to 2.2 by compiling it completely (!) and by adding opencdk to our list of deps, as its internal variant refuses to link correctly ( Felix Paul Kühne )
git version control
git at videolan.org
Thu Apr 3 20:30:58 CEST 2008
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Apr 3 20:31:36 2008 +0200| [12af43c54c4c0d4299defdd9771ba9b9e015eb76]
Fixed the gnutls upgrade to 2.2 by compiling it completely (!) and by adding opencdk to our list of deps, as its internal variant refuses to link correctly
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12af43c54c4c0d4299defdd9771ba9b9e015eb76
---
extras/contrib/src/Distributions/darwin.mak | 2 +-
extras/contrib/src/Distributions/win32.mak | 2 +-
extras/contrib/src/Makefile | 29 ++++++++++++++++++++------
extras/contrib/src/packages.mak | 10 ++++----
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 659aeb6..c8c2a7e 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -3,7 +3,7 @@ all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
- .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
+ .png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .nasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
# .expat .clinkcc don't work with SDK yet
diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index ac3a0ea..08eba48 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 .gnutls .mpcdec \
+ .png .gpg-error .gcrypt .opencdk .gnutls .mpcdec \
.dvdnav .dvbpsi .wxwidgets .qt4_win32 .dirac .SDL_image \
.dx_headers .dshow_headers .gecko-win32 .unicows .dca \
.lua .tag .fontconfig .portaudio \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 96d3031..36c3905 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,13 +1,13 @@
#***************************************************************************
# src/Makefile : Dearchive and compile all files necessary
# ***************************************************************************
-# Copyright (C) 2003 - 2007 the VideoLAN team
+# Copyright (C) 2003 - 2008 the VideoLAN team
# $Id$
#
# Authors: Christophe Massiot <massiot at via.ecp.fr>
# Derk-Jan Hartman <hartman at videolan dot org>
# Eric Petit <titer at m0k.org>
-# Felix Kühne <fkuehne at users.sourceforge.net>
+# Felix Paul Kühne <fkuehne at videolan.org>
# Christophe Mutricy <xtophe AT xtelevision.com>
# Gildas Bazin <gbazin at videolan dot org>
# Damien Fouilleul <damienf at videolan dot org>
@@ -1839,9 +1839,6 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
ifdef HAVE_WIN32
(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && sed -i 46s at sys/times.h at sys/time.h@ cipher/random.c && make && make install)
else
-ifdef HAVE_DARWIN_OS_ON_INTEL
- (cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
-endif
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
endif
$(INSTALL_NAME)
@@ -1852,6 +1849,24 @@ CLEAN_PKG += libgcrypt
DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2
# ***************************************************************************
+# opencdk (requires by gnutls 2.x)
+# ***************************************************************************
+
+opencdk-$(OPENCDK_VERSION).tar.bz2:
+ $(WGET) $(OPENCDK_URL)
+
+opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2
+ $(EXTRACT_BZ2)
+
+.opencdk: opencdk
+ (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
+ touch $@
+
+CLEAN_FILE += .opencdk
+CLEAN_PKG += opencdk
+DISTCLEAN_PKG += opencdk-$(OPENCDK_VERSION).tar.bz2
+
+# ***************************************************************************
# gnutls
# ***************************************************************************
@@ -1865,11 +1880,11 @@ ifdef HAVE_WIN32
(cd $@; cd lgl; ln -sf alloca_.h alloca.h)
endif
-.gnutls: gnutls .gcrypt .gpg-error
+.gnutls: gnutls .opencdk .gcrypt .gpg-error
ifdef HAVE_WIN32
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make && cd ../lgl && make && cd ../lib &&make && make install && cd ../includes && make install)
else
- (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx && cd gl && make && cd ../lgl && make && cd ../lib &&make && make install && cd ../includes && make install)
+ (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install)
endif
$(INSTALL_NAME)
touch $@
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 462c410..dec7da8 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -1,12 +1,12 @@
# ***************************************************************************
# src/packages.mak : Archive locations
# ***************************************************************************
-# Copyright © 2003 - 2008 the VideoLAN team
+# Copyright (C) 2003 - 2008 the VideoLAN team
# $Id$
#
# Authors: Christophe Massiot <massiot at via.ecp.fr>
# Derk-Jan Hartman <hartman at videolan dot org>
-# Felix Kühne <fkuehne at users.sourceforge.net>
+# Felix Paul Kühne <fkuehne at videolan dot org>
# Rafaël Carré <funman at videolanorg>
#
# This program is free software; you can redistribute it and/or modify
@@ -144,9 +144,9 @@ GCRYPT_VERSION=1.4.0
#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_URL=http://josefsson.org/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2
-#GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2
-#GNUTLS_URL=ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
+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
DAAP_VERSION=0.4.0
DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
GLIB_VERSION=1.2.10
More information about the vlc-devel
mailing list