[vlc-devel] commit: Revert "Contrib: attempt to fix gcrypt on mingw32." ( Pavlov Konstantin )

git version control git at videolan.org
Fri Apr 4 02:06:48 CEST 2008


vlc | branch: master | Pavlov Konstantin <thresh at videolan.org> | Fri Apr  4 04:06:47 2008 +0400| [1bd034706f0346cd6a65e074797e5e95d7d2aabb]

Revert "Contrib: attempt to fix gcrypt on mingw32."

As even mingw has automake 1.10 and buildbot is updated, this is not needed for contribs to build.

This reverts commit 3c16afd227beba8da6b5243952d90ef03f76dbe8.

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

 extras/contrib/src/Makefile                        |    3 ---
 .../src/Patches/gcrypt-win32-use-automake19.patch  |   12 ------------
 2 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5e8c315..f9d5975 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1827,9 +1827,6 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/gcrypt.patch
-ifdef HAVE_WIN32
-	patch -p0 < Patches/gcrypt-win32-use-automake19.patch
-endif
 
 CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa 
 
diff --git a/extras/contrib/src/Patches/gcrypt-win32-use-automake19.patch b/extras/contrib/src/Patches/gcrypt-win32-use-automake19.patch
deleted file mode 100644
index 08ff5b3..0000000
--- a/extras/contrib/src/Patches/gcrypt-win32-use-automake19.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgcrypt/configure.ac  2007-12-10 12:04:29 +0300
-+++ libgcrypt.p/configure.ac    2008-04-03 20:23:22 +0400
-@@ -21,7 +21,7 @@
- # (Process this file with autoconf to produce a configure script.)
- AC_REVISION($Revision: 1277 $)
- AC_PREREQ(2.60)
--min_automake_version="1.10"
-+min_automake_version="1.9"
-
-
- # Remember to change the version number immediately *after* a release.
-




More information about the vlc-devel mailing list