[vlc-commits] contrib: libgcrypt 1.6.2

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Aug 21 15:56:40 2014 +0200| [c3144752ee5c18b48326554d16bd61b28fee0ebc] | committer: Jean-Baptiste Kempf

contrib: libgcrypt 1.6.2

(cherry picked from commit 5e1c1945e7b44141346e5ad2cbad7230568f7d60)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gcrypt/SHA512SUMS                      |    2 +-
 .../gcrypt-fix-x86_64-codepath-on-Darwin.patch     |   29 --------------------
 contrib/src/gcrypt/rules.mak                       |    3 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/contrib/src/gcrypt/SHA512SUMS b/contrib/src/gcrypt/SHA512SUMS
index 8dd1cfc..feb9cae 100644
--- a/contrib/src/gcrypt/SHA512SUMS
+++ b/contrib/src/gcrypt/SHA512SUMS
@@ -1 +1 @@
-83d502cf998736a5920df7324b7ff658041c34b2cfddccd8b96744ff940c0c84fe91fe7bfe03a69b10b9697a6f04f3007134bbc3c288b0fed78b60fc6ff15bc2  libgcrypt-1.6.1.tar.bz2
+86003bb61c1fd37d0e54f9b1f48a9d89adb5f623818f67392f19d0de9b28ccb911a728238f8a8d23b875afb3bf7698bbea4da7b3b3a10e049311b9b45fabe472  libgcrypt-1.6.2.tar.bz2
diff --git a/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch b/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
deleted file mode 100644
index e04787b..0000000
--- a/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3149e9b73a94b45a5126cc778fe03f0b686dced9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne at videolan.org>
-Date: Sat, 22 Mar 2014 19:55:52 +0100
-Subject: [PATCH] Fix code path selection for x86_64 on Darwin
-
----
- mpi/config.links | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mpi/config.links b/mpi/config.links
-index 0217d35..4f35ea2 100644
---- a/mpi/config.links
-+++ b/mpi/config.links
-@@ -127,6 +127,12 @@ case "${host}" in
- 	path="i586 i386"
-         mpi_cpu_arch="x86"
- 	;;
-+    x86_64-apple-darwin*)
-+	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
-+	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
-+	path="amd64"
-+        mpi_cpu_arch="x86"
-+	;;
-     x86_64-*-*)
- 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
- 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
--- 
-1.8.5.2 (Apple Git-48)
-
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index ced0f43..0cc1222 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,5 +1,5 @@
 # GCRYPT
-GCRYPT_VERSION := 1.6.1
+GCRYPT_VERSION := 1.6.2
 GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 PKGS += gcrypt
@@ -11,7 +11,6 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(UNPACK)
-	$(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
 	$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
 	$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
 	$(MOVE)