[vlc-commits] commit: Contribs: Keep an older libgpg-error as release is broken on Windows ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 18 20:37:02 2010 +0200| [5e3efc8e15a1ceed498dfa2f1ebab6feb6be84d7] | committer: Jean-Baptiste Kempf 

Contribs: Keep an older libgpg-error as release is broken on Windows

As reported by xxcv

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

 extras/contrib/src/Makefile     |    4 ++--
 extras/contrib/src/packages.mak |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6d6fcd0..1632a68 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1786,8 +1786,8 @@ 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)
+#	patch -p 0 < Patches/libgpg-error-win32.patch
+#	(cd $@; ./autogen.sh)
 endif
 
 .gpg-error: libgpg-error
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index df5d03c..eab3b7d 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -139,7 +139,7 @@ CDIO_VERSION=0.80
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.4.3
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
-GPGERROR_VERSION=1.9
+GPGERROR_VERSION=1.7
 #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.6