Commit 4142dc40 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update tested hash

parent 796b2710
From 83892278f64356185e76d3cd2669dbfc5c79790c Mon Sep 17 00:00:00 2001
From 4b65ca0e5492baf610522c288d0902ffbf5bd57a Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/16] arm_neon: added function macro to handle the underscore
......@@ -65,5 +65,5 @@ index 0000000000..d853255fec
+.endm
+
--
2.11.0
2.12.2
From 45cd9f190877a26154a1400de79e8886e55bfa43 Mon Sep 17 00:00:00 2001
From 25603283f8fe8f81897777d17f67a14edbdbe850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 02/16] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd779029ae..03e5042b28 100644
b 1b
+endfunc
--
2.11.0
2.12.2
From 3c7a9552361d2fba0ce65482575f076f2bded204 Mon Sep 17 00:00:00 2001
From 531e3166c6e2f532c677de7deeb10f07b59a13b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 03/16] arm_neon: work-around libtool issue
......@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.11.0
2.12.2
From 0d13b51af91847bae2ab074e74d1396ae0af117d Mon Sep 17 00:00:00 2001
From 89da1998c88b3ec87746705e704d26363ce8e542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/16] arm_neon: fix iOS linking
......@@ -194,5 +194,5 @@ index a94ae8539f..54b43a79e3 100644
pop {r4,pc}
+endfunc
--
2.11.0
2.12.2
From 92161246ca1767be31d2942f246f49b8f9f7e77b Mon Sep 17 00:00:00 2001
From b191554d75722caefceaf3a9dbf7123e3a3dfde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/16] disable neon volume plugin
......@@ -19,5 +19,5 @@ index e67e07e61c..690975235f 100644
libyuv_rgb_neon_plugin.la
endif
--
2.11.0
2.12.2
From 28192fe25bea1cce99d947bf8e82d3be0955a1d6 Mon Sep 17 00:00:00 2001
From 62047cf78c01a4d2e6d25865982546ea84507e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 4 May 2016 16:00:40 +0200
Subject: [PATCH 06/16] libvlc: create VT-zero-copy variable
......@@ -20,5 +20,5 @@ index f5ec04a10e..adf450d99e 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.11.0
2.12.2
From 2032d63f799351c0a1607f767563daa9c8c2950d Mon Sep 17 00:00:00 2001
From ed8110408e969e29648102f563d92875649b80b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=83=C2=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 09/16] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 07/16] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
......@@ -25,5 +25,5 @@ index 5725e8f11e..5ee8a6896a 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
else
--
2.11.0
2.12.2
From 24755de58771622a4937109d6dc59e61ecd714c6 Mon Sep 17 00:00:00 2001
From a98f54d9f426ebdaaa705075daef1127c5c27587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 10/16] Enable System DL
Subject: [PATCH 08/16] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......@@ -36,7 +36,7 @@ index 0000000000..2d60cf7140
+ in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
+ in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5ee8a6896a..e99e3ef68f 100644
index 5ee8a6896a..453e4566b8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -24,6 +24,9 @@ FFMPEGCONF = \
......@@ -58,5 +58,5 @@ index 5ee8a6896a..e99e3ef68f 100644
.ffmpeg: ffmpeg
--
2.11.0
2.12.2
From 44e2867581a44e2274af9c85b81489d702492d9b Mon Sep 17 00:00:00 2001
From 0e44c76ea1049e61cef8323307c157ea6a40059d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:04:05 +0200
Subject: [PATCH 12/16] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 09/16] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......@@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644
ret
+endfunc
--
2.11.0
2.12.2
From 2a12dcbf6eddd127044f1f2fb8143bc7537b2785 Mon Sep 17 00:00:00 2001
From 06eb293002a2e1e356ebeab73fa184b00575a42b Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 13/16] http: add vlc_http_cookies_clear
Subject: [PATCH 10/16] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......@@ -61,5 +61,5 @@ index 2e4d3a8663..0929758f62 100644
}
--
2.11.0
2.12.2
From 1c2d8162df070df6395d66b3c23c833e4f2d6879 Mon Sep 17 00:00:00 2001
From 9bb515f5f72df03b65fbfaab75cc48572a0899fe Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 14/16] libvlc_media: add cookie_jar API
Subject: [PATCH 11/16] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -164,5 +164,5 @@ index adf450d99e..e0cf0ee20e 100644
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
--
2.11.0
2.12.2
From a001708c77b5719d2688ef646517f46d0a2487b1 Mon Sep 17 00:00:00 2001
From 204fb45b53eed705bc4d7ac1aafc3cbbe4a9d311 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 18 Apr 2017 17:24:03 +0200
Subject: [PATCH 15/16] Revert "Contribs: update libpng to 1.6.29"
Subject: [PATCH 12/16] Revert "Contribs: update libpng to 1.6.29"
This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
---
......@@ -58,5 +58,5 @@ index 9a05170afc..c18cfdf214 100644
PKGS += png
--
2.11.0
2.12.2
From f652d5bdff7152bdad58a37b36e1f9460a03fac4 Mon Sep 17 00:00:00 2001
From 42a8f55a8dc85644d5a161414e8c537f5a894938 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 16/16] build: rename exported symbols by module
Subject: [PATCH 13/16] build: rename exported symbols by module
This is quite ugly and temporary. Ideally we should rename symbols in binaries
like the Android script do.
......@@ -31,7 +31,7 @@ index cb9b4b6066..69b6ee9d2c 100644
vlc_module_end ()
diff --git a/modules/codec/ttml/ttml.h b/modules/codec/ttml/ttml.h
index 94263eda2d..cac43528b6 100644
index 51f41126f9..5781a92a34 100644
--- a/modules/codec/ttml/ttml.h
+++ b/modules/codec/ttml/ttml.h
@@ -18,8 +18,8 @@
......@@ -89,7 +89,7 @@ index 5105dd1efd..7c97fc842a 100644
#define MUX_TEXT N_("Avformat mux")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 453e7247fd..e4d804a74e 100644
index 833a39d19b..d734774716 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -152,7 +152,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
......@@ -147,7 +147,7 @@ index 453e7247fd..e4d804a74e 100644
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 821860dcf0..504d491f54 100644
index 59a423525c..152ac2983d 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -84,7 +84,7 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
......@@ -169,10 +169,10 @@ index 821860dcf0..504d491f54 100644
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
diff --git a/modules/demux/ttml.c b/modules/demux/ttml.c
index f51569b7bb..f1bcbb0ac2 100644
index 6c81292bc4..0731e2139d 100644
--- a/modules/demux/ttml.c
+++ b/modules/demux/ttml.c
@@ -390,7 +390,7 @@ static int Demux( demux_t* p_demux )
@@ -391,7 +391,7 @@ static int Demux( demux_t* p_demux )
return VLC_DEMUXER_SUCCESS;
}
......@@ -181,7 +181,7 @@ index f51569b7bb..f1bcbb0ac2 100644
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -479,12 +479,12 @@ int OpenDemux( vlc_object_t* p_this )
@@ -522,12 +522,12 @@ int OpenDemux( vlc_object_t* p_this )
return VLC_SUCCESS;
error:
......@@ -320,5 +320,5 @@ index 618db45e7c..669f62ff34 100644
* frames, each algorithm is responsible for setting the offset correctly.
* (The default is 0, so if that is correct, there's no need to do anything.)
--
2.11.0
2.12.2
From 44a1b08c0d8cad4df6dca685d271211a9e62b6d6 Mon Sep 17 00:00:00 2001
From a4e30c8ea91de8937201b87cd3bf357e00369482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 07/16] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 14/16] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 07/16] contrib/gcrypt: work-around a libtool limitation
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 141b32d6b4..f9ead8e357 100644
index a7cbd8a3bd..bfb8e4e341 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
......@@ -18,9 +18,9 @@ index 141b32d6b4..f9ead8e357 100644
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
endif
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
new file mode 100644
index 0000000000..df97ffb488
......@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.11.0
2.12.2
From 3fbe401079ef24a8f91456655508be81069c9a0b Mon Sep 17 00:00:00 2001
From b2805e54de8eb1c208b5a7c5c63c8caf394775d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 08/16] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 15/16] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,7 +32,7 @@ index 0000000000..f1d3ccc71f
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index f9ead8e357..d1c421a8b8 100644
index bfb8e4e341..60ba2b725e 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......@@ -40,10 +40,10 @@ index f9ead8e357..d1c421a8b8 100644
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
+ $(APPLY) $(SRC)/gcrypt/fix-sha1-ssse3-for-clang.patch
$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
endif
@@ -42,6 +43,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
@@ -43,6 +44,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else
GCRYPT_EXTRA_CFLAGS =
endif
......@@ -56,5 +56,5 @@ index f9ead8e357..d1c421a8b8 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.11.0
2.12.2
From 38d8ec095ab02969fa692a2ccc91beb5c0bd51a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 16/16] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
.../gcrypt/work-around-libtool-limitation.patch | 16 +-
2 files changed, 310 insertions(+), 14 deletions(-)
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
index f1d3ccc71f..21d7a30c8d 100644
--- a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -1,16 +1,312 @@
+diff -ru libgcrypt/cipher/arcfour-amd64.S libgcrypt/cipher/arcfour-amd64.S
+--- libgcrypt/cipher/arcfour-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/arcfour-amd64.S 2016-09-13 10:41:44.000000000 +0200
+@@ -19,16 +19,20 @@
+ defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS))
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+
+ .text
+ .align 16
+-.globl _gcry_arcfour_amd64
++.globl __gcry_arcfour_amd64
+ ELF(.type _gcry_arcfour_amd64,@function)
+-_gcry_arcfour_amd64:
++__gcry_arcfour_amd64:
+ push %rbp
+ push %rbx
+ mov %rdi, %rbp # key = ARG(key)
+diff -ru libgcrypt/cipher/des-amd64.S libgcrypt/cipher/des-amd64.S
+--- libgcrypt/cipher/des-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/des-amd64.S 2016-09-13 10:44:32.000000000 +0200
+@@ -30,7 +30,11 @@
+ #endif
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -191,10 +195,10 @@
+ movl right##d, 4(io);
+
+ .align 8
+-.globl _gcry_3des_amd64_crypt_block
++.globl __gcry_3des_amd64_crypt_block
+ ELF(.type _gcry_3des_amd64_crypt_block,@function;)
+
+-_gcry_3des_amd64_crypt_block:
++__gcry_3des_amd64_crypt_block:
+ /* input:
+ * %rdi: round keys, CTX
+ * %rsi: dst
+@@ -466,7 +470,7 @@
+
+ .align 8
+ ELF(.type _gcry_3des_amd64_crypt_blk3,@function;)
+-_gcry_3des_amd64_crypt_blk3:
++__gcry_3des_amd64_crypt_blk3:
+ /* input:
+ * %rdi: round keys, CTX
+ * RL0d, RR0d, RL1d, RR1d, RL2d, RR2d: 3 input blocks
+@@ -538,9 +542,9 @@
+ ELF(.size _gcry_3des_amd64_crypt_blk3,.-_gcry_3des_amd64_crypt_blk3;)
+
+ .align 8
+-.globl _gcry_3des_amd64_cbc_dec
++.globl __gcry_3des_amd64_cbc_dec
+ ELF(.type _gcry_3des_amd64_cbc_dec,@function;)
+-_gcry_3des_amd64_cbc_dec:
++__gcry_3des_amd64_cbc_dec:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: dst (3 blocks)
+@@ -574,7 +578,7 @@
+ bswapl RL2d;
+ bswapl RR2d;
+
+- call _gcry_3des_amd64_crypt_blk3;
++ call __gcry_3des_amd64_crypt_blk3;
+
+ popq %rcx; /*iv*/
+ popq %rdx; /*src*/
+@@ -614,9 +618,9 @@
+ ELF(.size _gcry_3des_amd64_cbc_dec,.-_gcry_3des_amd64_cbc_dec;)
+
+ .align 8
+-.globl _gcry_3des_amd64_ctr_enc
++.globl __gcry_3des_amd64_ctr_enc
+ ELF(.type _gcry_3des_amd64_ctr_enc,@function;)
+-_gcry_3des_amd64_ctr_enc:
++__gcry_3des_amd64_ctr_enc:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: dst (3 blocks)
+@@ -655,7 +659,7 @@
+ /* store new IV */
+ movq RT0, (RW2);
+
+- call _gcry_3des_amd64_crypt_blk3;
++ call __gcry_3des_amd64_crypt_blk3;
+
+ popq %rdx; /*src*/
+ popq %rsi; /*dst*/
+@@ -692,9 +696,9 @@
+ ELF(.size _gcry_3des_amd64_cbc_dec,.-_gcry_3des_amd64_cbc_dec;)
+
+ .align 8
+-.globl _gcry_3des_amd64_cfb_dec
++.globl __gcry_3des_amd64_cfb_dec
+ ELF(.type _gcry_3des_amd64_cfb_dec,@function;)
+-_gcry_3des_amd64_cfb_dec:
++__gcry_3des_amd64_cfb_dec:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: dst (3 blocks)
+@@ -731,7 +735,7 @@
+ movq 4 * 4(%rdx), RW0;
+ movq RW0, (RW2);
+
+- call _gcry_3des_amd64_crypt_blk3;
++ call __gcry_3des_amd64_crypt_blk3;
+
+ popq %rdx; /*src*/
+ popq %rsi; /*dst*/
+diff -ru libgcrypt/cipher/poly1305-avx2-amd64.S libgcrypt/cipher/poly1305-avx2-amd64.S
+--- libgcrypt/cipher/poly1305-avx2-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/poly1305-avx2-amd64.S 2016-09-13 10:43:05.000000000 +0200
+@@ -30,7 +30,11 @@
+ defined(ENABLE_AVX2_SUPPORT)
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -40,9 +44,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_avx2_init_ext
++.globl __gcry_poly1305_amd64_avx2_init_ext
+ ELF(.type _gcry_poly1305_amd64_avx2_init_ext,@function;)
+-_gcry_poly1305_amd64_avx2_init_ext:
++__gcry_poly1305_amd64_avx2_init_ext:
+ .Lpoly1305_init_ext_avx2_local:
+ xor %edx, %edx
+ vzeroupper
+@@ -403,9 +407,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_avx2_blocks
++.globl __gcry_poly1305_amd64_avx2_blocks
+ ELF(.type _gcry_poly1305_amd64_avx2_blocks,@function;)
+-_gcry_poly1305_amd64_avx2_blocks:
++__gcry_poly1305_amd64_avx2_blocks:
+ .Lpoly1305_blocks_avx2_local:
+ vzeroupper
+ pushq %rbp
+@@ -729,9 +733,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_avx2_finish_ext
++.globl __gcry_poly1305_amd64_avx2_finish_ext
+ ELF(.type _gcry_poly1305_amd64_avx2_finish_ext,@function;)
+-_gcry_poly1305_amd64_avx2_finish_ext:
++__gcry_poly1305_amd64_avx2_finish_ext:
+ .Lpoly1305_finish_ext_avx2_local:
+ vzeroupper
+ pushq %rbp
+diff -ru libgcrypt/cipher/poly1305-sse2-amd64.S libgcrypt/cipher/poly1305-sse2-amd64.S
+--- libgcrypt/cipher/poly1305-sse2-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/poly1305-sse2-amd64.S 2016-09-13 10:42:49.000000000 +0200
+@@ -29,7 +29,11 @@
+ defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS))
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -39,9 +43,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_sse2_init_ext
++.globl __gcry_poly1305_amd64_sse2_init_ext
+ ELF(.type _gcry_poly1305_amd64_sse2_init_ext,@function;)
+-_gcry_poly1305_amd64_sse2_init_ext:
++__gcry_poly1305_amd64_sse2_init_ext:
+ .Lpoly1305_init_ext_x86_local:
+ xor %edx, %edx
+ pushq %r12
+@@ -285,9 +289,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_sse2_finish_ext
++.globl __gcry_poly1305_amd64_sse2_finish_ext
+ ELF(.type _gcry_poly1305_amd64_sse2_finish_ext,@function;)
+-_gcry_poly1305_amd64_sse2_finish_ext:
++__gcry_poly1305_amd64_sse2_finish_ext:
+ .Lpoly1305_finish_ext_x86_local:
+ pushq %rbp
+ movq %rsp, %rbp
+@@ -436,9 +440,9 @@
+
+
+ .align 8
+-.globl _gcry_poly1305_amd64_sse2_blocks
++.globl __gcry_poly1305_amd64_sse2_blocks
+ ELF(.type _gcry_poly1305_amd64_sse2_blocks,@function;)
+-_gcry_poly1305_amd64_sse2_blocks:
++__gcry_poly1305_amd64_sse2_blocks:
+ .Lpoly1305_blocks_x86_local:
+ pushq %rbp
+ movq %rsp, %rbp
+diff -ru libgcrypt/cipher/sha1-avx-amd64.S libgcrypt/cipher/sha1-avx-amd64.S
+--- libgcrypt/cipher/sha1-avx-amd64.S 2016-07-14 11:19:17.000000000 +0200
++++ libgcrypt/cipher/sha1-avx-amd64.S 2016-09-13 10:41:55.000000000 +0200
+@@ -41,7 +41,11 @@
+
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -215,10 +219,10 @@
+ * size_t nblks)
+ */
+ .text
+-.globl _gcry_sha1_transform_amd64_avx
++.globl __gcry_sha1_transform_amd64_avx
+ ELF(.type _gcry_sha1_transform_amd64_avx,@function)
+ .align 16
+-_gcry_sha1_transform_amd64_avx:
++__gcry_sha1_transform_amd64_avx:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: data (64*nblks bytes)
+diff -ru libgcrypt/cipher/sha1-avx-bmi2-amd64.S libgcrypt/cipher/sha1-avx-bmi2-amd64.S
+--- libgcrypt/cipher/sha1-avx-bmi2-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/sha1-avx-bmi2-amd64.S 2016-09-13 10:40:10.000000000 +0200
+@@ -42,7 +42,11 @@
+
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -213,10 +217,10 @@
+ * size_t nblks)
+ */
+ .text
+-.globl _gcry_sha1_transform_amd64_avx_bmi2
++.globl __gcry_sha1_transform_amd64_avx_bmi2
+ ELF(.type _gcry_sha1_transform_amd64_avx_bmi2,@function)
+ .align 16
+-_gcry_sha1_transform_amd64_avx_bmi2:
++__gcry_sha1_transform_amd64_avx_bmi2:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: data (64*nblks bytes)
diff -ru libgcrypt/cipher/sha1-ssse3-amd64.S libgcrypt/cipher/sha1-ssse3-amd64.S
---- libgcrypt/cipher/sha1-ssse3-amd64.S 2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt/cipher/sha1-ssse3-amd64.S 2015-10-03 22:40:21.000000000 +0200
-@@ -217,10 +217,9 @@
- * _gcry_sha1_transform_amd64_ssse3 (void *ctx, const unsigned char *data)
+--- libgcrypt/cipher/sha1-ssse3-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/sha1-ssse3-amd64.S 2016-09-13 10:43:14.000000000 +0200
+@@ -41,7 +41,11 @@
+
+
+ #ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
++#ifdef __APPLE__
++# define ELF(...) /*_*/
++#else
+ # define ELF(...) __VA_ARGS__
++#endif
+ #else
+ # define ELF(...) /*_*/
+ #endif
+@@ -227,10 +231,10 @@
+ * size_t nblks)
*/
.text
-.globl _gcry_sha1_transform_amd64_ssse3
--.type _gcry_sha1_transform_amd64_ssse3,@function
+.globl __gcry_sha1_transform_amd64_ssse3
+ ELF(.type _gcry_sha1_transform_amd64_ssse3,@function)
.align 16
-_gcry_sha1_transform_amd64_ssse3:
+__gcry_sha1_transform_amd64_ssse3:
/* input:
* %rdi: ctx, CTX
- * %rsi: data (64 bytes)
+ * %rsi: data (64*nblks bytes)
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
index df97ffb488..957f268ad2 100644
--- a/contrib/src/gcrypt/work-around-libtool-limitation.patch
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -1,18 +1,18 @@
-diff -ru libgcrypt-broken/cipher/Makefile.am libgcrypt/cipher/Makefile.am
---- libgcrypt-broken/cipher/Makefile.am 2013-11-06 23:05:24.000000000 +0100
-+++ libgcrypt/cipher/Makefile.am 2013-11-06 23:21:25.000000000 +0100
+diff -ru libgcrypt/cipher/Makefile.am libgcrypt/cipher/Makefile.am
+--- libgcrypt/cipher/Makefile.am 2016-08-17 13:21:22.000000000 +0200
++++ libgcrypt/cipher/Makefile.am 2016-09-12 15:13:54.000000000 +0200
@@ -19,6 +19,8 @@
# Process this file with automake to produce Makefile.in
+LIBTOOL=@LIBTOOL@ --tag=CC
+
- EXTRA_DIST = Manifest
-
# Need to include ../src in addition to top_srcdir because gcrypt.h is
-diff -ru libgcrypt-broken/mpi/Makefile.am libgcrypt/mpi/Makefile.am
---- libgcrypt-broken/mpi/Makefile.am 2013-11-06 23:05:24.000000000 +0100
-+++ libgcrypt/mpi/Makefile.am 2013-11-06 23:22:04.000000000 +0100
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+diff -ru libgcrypt/mpi/Makefile.am libgcrypt-fixed/mpi/Makefile.am
+--- libgcrypt/mpi/Makefile.am 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/mpi/Makefile.am 2016-09-12 15:13:28.000000000 +0200
@@ -23,6 +23,9 @@
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.12.2
......@@ -21,7 +21,7 @@ OSVERSIONMINCFLAG=miphoneos-version-min
OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
TESTEDHASH=1fe24f3
TESTEDHASH=6bc7a637
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
let MAKE_JOBS=$CORE_COUNT+1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment