Changeset 12af43c54c4c0d4299defdd9771ba9b9e015eb76

Timestamp:

04/03/08 20:31:36 (4 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1207247496 +0200

git-parent:

[3c16afd227beba8da6b5243952d90ef03f76dbe8]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1207247496 +0200

Message:

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

Files:

• extras/contrib/src/Distributions/darwin.mak (modified) (1 diff)
• extras/contrib/src/Distributions/win32.mak (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (5 diffs)
• extras/contrib/src/packages.mak (modified) (2 diffs)

extras/contrib/src/Distributions/darwin.mak

@@ -4 +4 @@
-    .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
-    .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
-
+opencdk .
-    .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
-    .dca .tag .nasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal

extras/contrib/src/Distributions/win32.mak

@@ -4 +4 @@
-        .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
-        .live .goom2k4 .caca .mod .x264  .xml .twolame \
-
+opencdk .
-        .dvdnav .dvbpsi .wxwidgets .qt4_win32 .dirac .SDL_image \
-        .dx_headers .dshow_headers .gecko-win32 .unicows .dca \

extras/contrib/src/Makefile

@@ -2 +2 @@
-# src/Makefile : Dearchive and compile all files necessary
-# ***************************************************************************
-7
+8
-# $Id$
-#
@@ -8 +8 @@
-#          Derk-Jan Hartman <hartman at videolan dot org>
-#          Eric Petit <titer@m0k.org>
-Kühne <fkuehne@users.sourceforge.net
+Paul Kühne <fkuehne@videolan.org
-#          Christophe Mutricy <xtophe AT xtelevision.com>
-#          Gildas Bazin <gbazin at videolan dot org>
@@ -1840 +1840 @@
-    (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && sed -i 46s@sys/times.h@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
@@ -1853 +1850 @@
-
-# ***************************************************************************
+# 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
-# ***************************************************************************
@@ -1866 +1881 @@
-endif
-
-gcrypt .gpg-error
+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 gl && make && cd ../lgl && make &&  cd ../lib &&make && make install && cd ../includes
+--with-libopencdk-prefix=$(PREFIX) --disable-guile && make
-endif
-    $(INSTALL_NAME)

extras/contrib/src/packages.mak

@@ -2 +2 @@
-# src/packages.mak : Archive locations
-# ***************************************************************************
-©
+(C)
-# $Id$
-#
-# Authors: Christophe Massiot <massiot@via.ecp.fr>
-#          Derk-Jan Hartman <hartman at videolan dot org>
-Kühne <fkuehne@users.sourceforge.net
+Paul Kühne <fkuehne at videolan dot org
-#          Rafaël Carré <funman@videolanorg>
-#
@@ -145 +145 @@
-GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=2.2.2
-josefsson.org
-
-#GNUTLS_URL=ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS
+www.gnu.org/software
+
+OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK
-DAAP_VERSION=0.4.0
-DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2