|
@@ -1,7 +1,7 @@
|
|
|
-From b2fd1fd905972efa93759525600fd24c89958751 Mon Sep 17 00:00:00 2001
|
|
|
+From 1b606fcf143286a099796cda60254d1ea9ea42af Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
|
|
|
Date: Thu, 31 Oct 2013 20:42:59 +0100
|
|
|
-Subject: [PATCH 19/19] contrib/gcrypt: use git version on iOS
|
|
|
+Subject: [PATCH] contrib/gcrypt: use git version on iOS
|
|
|
|
|
|
---
|
|
|
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
|
|
@@ -61,7 +61,7 @@ index 0000000..e63224e
|
|
|
+1.8.3.4 (Apple Git-47)
|
|
|
+
|
|
|
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
|
|
|
-index 0a4d7d5..71b4241 100644
|
|
|
+index 828a594..f6a9554 100644
|
|
|
--- a/contrib/src/gcrypt/rules.mak
|
|
|
+++ b/contrib/src/gcrypt/rules.mak
|
|
|
@@ -1,6 +1,7 @@
|
|
@@ -72,7 +72,7 @@ index 0a4d7d5..71b4241 100644
|
|
|
|
|
|
PKGS += gcrypt
|
|
|
|
|
|
-@@ -9,11 +10,23 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
|
|
|
+@@ -9,12 +10,24 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
|
|
|
|
|
|
.sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
|
|
|
|
|
@@ -84,6 +84,7 @@ index 0a4d7d5..71b4241 100644
|
|
|
$(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)
|
|
|
+else
|
|
|
+libgcrypt: libgcrypt-git.tar.xz
|
|
@@ -96,7 +97,7 @@ index 0a4d7d5..71b4241 100644
|
|
|
|
|
|
DEPS_gcrypt = gpg-error
|
|
|
|
|
|
-@@ -47,6 +60,6 @@ endif
|
|
|
+@@ -48,6 +61,6 @@ endif
|
|
|
|
|
|
.gcrypt: libgcrypt
|
|
|
$(RECONF)
|