all: Update libgcrypt,gpg-error and gnutls (closes #570 )

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 78e9df042146b6d1b5e2aed373d301c5809191eb..4008a8bbc73af6abbc36e6c87e6a73109c4f202b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1457,7 +1457,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
+       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
@@ -1481,7 +1481,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd crypto && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd crypto && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif

diff --git a/extras/contrib/src/Patches/gcrypt.patch b/extras/contrib/src/Patches/gcrypt.patch
index 869fbcc16078a3660c0a2f82fa6085d5bdaf969b..f381d8bf1bd46f0fa90b64c0b5cf03481d6aec4a 100644 (file)
--- a/extras/contrib/src/Patches/gcrypt.patch
+++ b/extras/contrib/src/Patches/gcrypt.patch
@@ -9,3 +9,14 @@
          ac_cv_sys_symbol_underscore=yes
          ;;
      *)
+--- libgcrypt/Makefile.am.orig 2006-03-02 16:46:35.000000000 +0100
++++ libgcrypt/Makefile.am      2006-03-02 16:47:19.000000000 +0100
+@@ -21,7 +21,7 @@
+ AUTOMAKE_OPTIONS = dist-bzip2
+ 
+ DIST_SUBDIRS = mpi cipher src doc tests w32-dll
+-SUBDIRS = mpi cipher src doc tests
++SUBDIRS = mpi cipher src 
+ EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN
+ DISTCLEANFILES = 
+ 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index f62504c674fcfbb246bb0a0984770735c3bd8620..b25e1614e24bf431718fb7d425cb8309f061d734 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -112,11 +112,13 @@ CDIO_VERSION=0.72
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.5
 PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.0
-GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
-GCRYPT_VERSION=1.2.1
-GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=1.2.7
+GPGERROR_VERSION=1.1
+GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz
+#GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
+GCRYPT_VERSION=1.2.2
+GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GNUTLS_VERSION=1.2.10
 GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 DAAP_VERSION=0.4.0
 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2