MobileVLCKit/patches: fix patch 21 and re-iterate the others

MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,7 +1,7 @@
-From 4599c045a12463ba244bee55e05a8014f6dd4b63 Mon Sep 17 00:00:00 2001
+From e11b759bdbf8982471f1115d3eee744ffcf6d063 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/17] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/21] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---

MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch

@@ -1,7 +1,7 @@
-From ab28b1dc53049462c1d393ebefba8e0d52041076 Mon Sep 17 00:00:00 2001
+From 55fca182c6cfccac1282ddfa6e721134444348e3 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:01:49 +0200
-Subject: [PATCH 02/17] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/21] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---

MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From 63555ddccf6a0c968e8fb61917166b23c1c63328 Mon Sep 17 00:00:00 2001
+From 639ab64fde139782bfa80435705f481b406cc169 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 03/17] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/21] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

MobileVLCKit/patches/0004-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch

@@ -1,7 +1,7 @@
-From 26f7bdf0222e79880e36e962fe8fda4d37e759e4 Mon Sep 17 00:00:00 2001
+From 812de71234533be42899b0d5aad10859d7387b63 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 11 Aug 2012 13:29:25 +0200
-Subject: [PATCH 04/17] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/21] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--

MobileVLCKit/patches/0005-posix-thread-add-a-hack-to-work-around-crashes-when-.patch

@@ -1,7 +1,7 @@
-From 0cb46acfbc9d388fa0a11116e4274f9257aeb9a8 Mon Sep 17 00:00:00 2001
+From e9163e34e5077975369eace94b5434bc36638172 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Oct 2012 18:38:17 +0200
-Subject: [PATCH 05/17] posix/thread: add a hack to work-around crashes when
+Subject: [PATCH 05/21] posix/thread: add a hack to work-around crashes when
  using the buggy iOS 6 runtime
 
 ---

MobileVLCKit/patches/0006-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,7 +1,7 @@
-From 9b2e1e55528bcc17ff7cc87e395e741dffe5a31f Mon Sep 17 00:00:00 2001
+From 5e846820550c44fd0b71170cf21de469e5d87b63 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 19 Jul 2013 18:38:41 +0700
-Subject: [PATCH 06/17] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 06/21] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---

MobileVLCKit/patches/0007-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,7 +1,7 @@
-From 1172ff072bfd48a998ab68983dbc185690bdb07b Mon Sep 17 00:00:00 2001
+From 6202d66eb5c2afeaca11eaf5b686b9c9ee93e3c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 29 May 2013 13:25:54 +0200
-Subject: [PATCH 07/17] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 07/21] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

MobileVLCKit/patches/0008-freetype-fix-corner-case-crash.patch

@@ -1,7 +1,7 @@
-From 4a0b343a4c84cc148cc5afa8805fc430741a0fee Mon Sep 17 00:00:00 2001
+From 206c4c192f5bd59180faab5f7ed9b2bd95e57d09 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 21 Jul 2013 18:18:33 +0200
-Subject: [PATCH 08/17] freetype: fix corner-case crash
+Subject: [PATCH 08/21] freetype: fix corner-case crash
 
 ---
  modules/text_renderer/freetype.c | 2 ++

MobileVLCKit/patches/0009-io-implement-network-timeout-default-60s.patch

@@ -1,7 +1,7 @@
-From 2c7bd9c90f1b043c5019367f81640a0c8c35543d Mon Sep 17 00:00:00 2001
+From 146735192b832b773625ae9d86d5a8787fbc6249 Mon Sep 17 00:00:00 2001
 From: Gleb Pinigin <gpinigin@gmail.com>
 Date: Sun, 28 Jul 2013 18:32:51 +0700
-Subject: [PATCH 09/17] io: implement network timeout(default 60s)
+Subject: [PATCH 09/21] io: implement network timeout(default 60s)
 
 ---
  src/network/io.c | 15 ++++++++++++++-

MobileVLCKit/patches/0010-deinterlace-added-a-hack-to-work-around-a-libtool-bu.patch

@@ -1,7 +1,7 @@
-From ad8a143c606423970d90252a8677e6ef84b477a2 Mon Sep 17 00:00:00 2001
+From 7cb0df42e76298434ddb2ce1805f3b483a24abf4 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:33 +0200
-Subject: [PATCH 10/17] deinterlace: added a hack to work-around a libtool bug
+Subject: [PATCH 10/21] deinterlace: added a hack to work-around a libtool bug
 
 ---
  modules/video_filter/Modules.am | 4 ++++

MobileVLCKit/patches/0011-contrib-png-fix-ARM-assembly-for-iOS.patch

@@ -1,7 +1,7 @@
-From b772c77fa3003cf5927c4b4855fd95a25004baef Mon Sep 17 00:00:00 2001
+From 94efd45db195bd0a370141a75463b92ab030f762 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
 Date: Sat, 20 Jul 2013 23:35:05 +0200
-Subject: [PATCH 11/17] contrib/png: fix ARM assembly for iOS
+Subject: [PATCH 11/21] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++

MobileVLCKit/patches/0012-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,7 +1,7 @@
-From 7636f3d41ba1efae6428cffaee5dd5178e46a605 Mon Sep 17 00:00:00 2001
+From d4e40b7c448dd9857bdf3cbf11431a159821fb86 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:27:43 +0200
-Subject: [PATCH 12/17] contrib: add arch option for platforms where the arch
+Subject: [PATCH 12/21] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---

MobileVLCKit/patches/0013-extras-deploy-arch-option-for-iOS.patch

@@ -1,14 +1,14 @@
-From 4b1752e265ac88a458fe029d27885ee65e6d2e1e Mon Sep 17 00:00:00 2001
+From 6a2aade44a61699d9eccc84a21e299d803c11f86 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:28:26 +0200
-Subject: [PATCH 13/17] extras: deploy arch option for iOS
+Subject: [PATCH 13/21] extras: deploy arch option for iOS
 
 ---
  extras/package/ios/build.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index e9a818a..19e87e7 100755
+index da0f3bd..26d1957 100755
 --- a/extras/package/ios/build.sh
 +++ b/extras/package/ios/build.sh
 @@ -181,7 +181,7 @@ else

MobileVLCKit/patches/0014-contrib-png-fix-compilation-for-arm64-which-is-unkno.patch

@@ -1,7 +1,7 @@
-From f83557034fccbdbb72ba409edf63a1e73ca8e109 Mon Sep 17 00:00:00 2001
+From 63f4f78d9880b9b5e88e11ce46356af8be997340 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:38:25 +0200
-Subject: [PATCH 14/17] contrib/png: fix compilation for arm64 which is unknown
+Subject: [PATCH 14/21] contrib/png: fix compilation for arm64 which is unknown
  to the libpng developers
 
 ---

MobileVLCKit/patches/0015-contrib-speex-fix-compilation-for-arm64.patch

@@ -1,7 +1,7 @@
-From ad9db4f1f818e4ff8118ce7876a1e05f016a75bb Mon Sep 17 00:00:00 2001
+From 4c9f0cd545cb9924adde27f15a45836a5a5aba15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 19:30:01 +0200
-Subject: [PATCH 15/17] contrib/speex: fix compilation for arm64
+Subject: [PATCH 15/21] contrib/speex: fix compilation for arm64
 
 ---
  contrib/src/speex/rules.mak | 5 +++++

MobileVLCKit/patches/0016-contrib-flac-fix-compilation-with-clang-5.0.patch

@@ -1,7 +1,7 @@
-From 6202916c0a6ea21a67e4a1fa4355925f9fadd2c0 Mon Sep 17 00:00:00 2001
+From 2336e7415e3309bcafefabf45ae6ebdf07e2bd8f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 7 Oct 2013 17:05:21 +0200
-Subject: [PATCH 16/17] contrib/flac: fix compilation with clang 5.0
+Subject: [PATCH 16/21] contrib/flac: fix compilation with clang 5.0
 
 ---
  contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++

MobileVLCKit/patches/0017-contrib-gcrypt-use-git-version-on-iOS.patch

@@ -1,7 +1,7 @@
-From fc9147da0c71749fc3f366c0070422275e3308fa Mon Sep 17 00:00:00 2001
+From 06386c3c1fe9cd4d2683cda1404f35125ceb587f 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 17/17] contrib/gcrypt: use git version on iOS
+Subject: [PATCH 17/21] contrib/gcrypt: use git version on iOS
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++

MobileVLCKit/patches/0018-gnutls-HACK-to-enable-https-playback-on-iOS.patch

@@ -1,7 +1,7 @@
-From 668b5f3120de700e443d91855cde9dbbf8e02188 Mon Sep 17 00:00:00 2001
+From b6af33445628d16241d6925da46ce59539a35824 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 19 Nov 2013 00:09:34 +0100
-Subject: [PATCH 18/18] gnutls: HACK to enable https playback on iOS
+Subject: [PATCH 18/21] gnutls: HACK to enable https playback on iOS
 
 Note that certificates presented by a server won't verified at all so we cannot trust the stream
 ---

MobileVLCKit/patches/0019-contrib-gnutls-don-t-reconf-on-iOS-so-we-don-t-have-.patch

@@ -1,7 +1,7 @@
-From db1877bdb5fb0999916a678da12fec618caebea5 Mon Sep 17 00:00:00 2001
+From dd45893ffd2b3561aeefece1b1dcbd42f88d1f98 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 19 Nov 2013 16:56:24 +0100
-Subject: [PATCH 2/3] contrib/gnutls: don't reconf on iOS so we don't have to
+Subject: [PATCH 19/21] contrib/gnutls: don't reconf on iOS so we don't have to
  compile gettext
 
 ---

MobileVLCKit/patches/0020-contrib-gmp-compile-without-pic-on-iOS.patch

@@ -1,7 +1,7 @@
-From cb2dcd865ebe6a7106ae6651e077151565961581 Mon Sep 17 00:00:00 2001
+From c93b4e0c1b96888c27089c9daae6f78622fdab67 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 19 Nov 2013 17:16:28 +0100
-Subject: [PATCH 3/3] contrib/gmp: compile without pic on iOS
+Subject: [PATCH 20/21] contrib/gmp: compile without pic on iOS
 
 ---
  contrib/src/gmp/rules.mak | 7 ++++++-

MobileVLCKit/patches/0021-contrib-gmp-disable-ARM-assembly-for-iOS.patch

@@ -1,7 +1,7 @@
-From e6c05836a97b244f7fd19da40927030c4b941d3d Mon Sep 17 00:00:00 2001
+From d1c2c9addcc8eea36f53797a1e0f91f555860571 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 19 Nov 2013 22:02:38 +0100
-Subject: [PATCH] contrib/gmp: disable ARM assembly for iOS
+Subject: [PATCH 21/21] contrib/gmp: disable ARM assembly for iOS
 
 ---
  contrib/src/gmp/disable-arm-assembly-on-ios.patch | 14 ++++++++++++++
@@ -30,7 +30,7 @@ index 0000000..d47ce96
 +   arm*-*-*)
 +     path="arm"
 diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
-index 5f60fb0..9c7a1b6 100644
+index 818d541..f51bf31 100644
 --- a/contrib/src/gmp/rules.mak
 +++ b/contrib/src/gmp/rules.mak
 @@ -16,6 +16,9 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
@@ -42,7 +42,7 @@ index 5f60fb0..9c7a1b6 100644
 +endif
  	$(MOVE)
  
- .gmp: gmp
+ GMP_CONF := $(HOSTCONF)
 -- 
 1.8.3.4 (Apple Git-47)