[vlc-devel] commit: Patching fix ( Felix Paul Kühne )
git version control
git at videolan.org
Sat May 24 01:02:04 CEST 2008
vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Sat May 24 00:48:12 2008 +0200| [d98a1f050b3bd261bc638647b753e1ac2852170a]
Patching fix
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d98a1f050b3bd261bc638647b753e1ac2852170a
---
extras/contrib/src/Makefile | 2 +-
extras/contrib/src/Patches/gcrypt.patch | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 99d7469..e63b86f 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1613,7 +1613,7 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2:
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
$(EXTRACT_BZ2)
- patch -p 0 < Patches/gcrypt.patch
+ patch -p0 < Patches/gcrypt.patch
.gcrypt: libgcrypt .gpg-error
ifdef HAVE_WIN32
diff --git a/extras/contrib/src/Patches/gcrypt.patch b/extras/contrib/src/Patches/gcrypt.patch
index a4abf17..a6cf596 100644
--- a/extras/contrib/src/Patches/gcrypt.patch
+++ b/extras/contrib/src/Patches/gcrypt.patch
@@ -1,11 +1,11 @@
---- 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
+--- libgcrypt/Makefile.am.orig 2007-05-04 12:11:28.000000000 +0200
++++ libgcrypt/Makefile.am 2008-05-24 00:44:08.000000000 +0200
+@@ -23,7 +23,7 @@
+ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
- DIST_SUBDIRS = mpi cipher src doc tests w32-dll
+ DIST_SUBDIRS = m4 mpi cipher src doc tests
-SUBDIRS = mpi cipher src doc tests
-+SUBDIRS = mpi cipher src
- EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN
++SUBDIRS = mpi cipher src
+ EXTRA_DIST = BUGS autogen.sh README.SVN
DISTCLEANFILES =
More information about the vlc-devel
mailing list