[vlc-commits] commit: Contribs: update libgpg-error, gcrypt and gnuTLS... ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug  9 11:28:49 2010 +0200| [6c28114d8ba4ca42fc7834bb31e77d81f72cb312] | committer: Jean-Baptiste Kempf 

Contribs: update libgpg-error, gcrypt and gnuTLS...

And create new patches accordingly for new build hiccups...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c28114d8ba4ca42fc7834bb31e77d81f72cb312
---

 extras/contrib/src/Makefile                        |    4 ++++
 .../contrib/src/Patches/libgpg-error-win32.patch   |   11 +++++++++++
 extras/contrib/src/packages.mak                    |    6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1042fb7..860ab02 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1804,6 +1804,10 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
+ifdef HAVE_WIN32
+	patch -p 0 < Patches/libgpg-error-win32.patch
+	(cd $@; ./autogen.sh)
+endif
 
 .gpg-error: libgpg-error
 ifdef HAVE_DARWIN_OS_ON_INTEL
diff --git a/extras/contrib/src/Patches/libgpg-error-win32.patch b/extras/contrib/src/Patches/libgpg-error-win32.patch
new file mode 100644
index 0000000..b263871
--- /dev/null
+++ b/extras/contrib/src/Patches/libgpg-error-win32.patch
@@ -0,0 +1,11 @@
+--- libgpg-error/src/Makefile.am	2010-04-14 11:16:44.000000000 +0200
++++ libgpg-error.new/src/Makefile.am	2010-08-09 11:21:56.000000000 +0200
+@@ -60,7 +60,7 @@
+ arch_sources = w32-gettext.c
+ 
+ RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
++            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
+ LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
+ 
+ SUFFIXES = .rc .lo
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index c56deb5..7df99b8 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -139,13 +139,13 @@ CDIO_VERSION=0.80
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.44
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.7
+GPGERROR_VERSION=1.9
 #GPGERROR_URL=$(CONTRIB_VIDEOLAN)/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
-GCRYPT_VERSION=1.4.5
+GCRYPT_VERSION=1.4.6
 #GCRYPT_URL=$(CONTRIB_VIDEOLAN)/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=2.8.6
+GNUTLS_VERSION=2.10.1
 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