MVK: add 2 patches until we bump libvlc for the next time, condense 3 others

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

@@ -1,7 +1,7 @@
-From 3940a0ae20685f2829b723890919955317e11488 Mon Sep 17 00:00:00 2001
+From 423b2743f8ab16b65f216bb48dfaa3c7038938c3 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/19] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/20] 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 6e95e2059783696054e5ed3e5f40d7efbe5ed830 Mon Sep 17 00:00:00 2001
+From c49ca9b6041784f36d18216aea76e2e5deb6dc9c 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/19] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/20] 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 40f9ef282230840f0f6e4e72c0e9789231492b59 Mon Sep 17 00:00:00 2001
+From 001dfeae87c9c6bd6db401a789419a3b8abd8ff0 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/19] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/20] 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 2f644931060a57cefd26b044ef675f7893bce503 Mon Sep 17 00:00:00 2001
+From cbce9125fe4292936c9b896c869532039357362d 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/19] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/20] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--

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

@@ -1,7 +1,7 @@
-From 09dbeac2f3f3b3d1d664146cd86e10a53c65a652 Mon Sep 17 00:00:00 2001
+From 83d8085c9e0974dc5804504c4e88a173859fdc68 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 05/19] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/20] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

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

@@ -1,7 +1,7 @@
-From b96d48651b73f6d89529b9d3b519775919f3d114 Mon Sep 17 00:00:00 2001
+From 50d4c647b218bf7c4ce8cf790b4f578b936f405c 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 06/19] contrib/png: fix ARM assembly for iOS
+Subject: [PATCH 06/20] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++

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

@@ -1,63 +0,0 @@
-From 1760110420b7fdc31c08e60a44b9dee6071fd0ee 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 07/19] contrib: add arch option for platforms where the arch
- triplet would be ambigous
-
----
- contrib/bootstrap | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/bootstrap b/contrib/bootstrap
-index 246e3d6..df7ab6e 100755
---- a/contrib/bootstrap
-+++ b/contrib/bootstrap
-@@ -31,6 +31,7 @@ usage()
- 	echo "  --disable-sout   configure to not build stream output packages"
- 	echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
- 	echo "  --disable-gpl    configure to not build viral GPL code"
-+	echo "  --arch=ARCH      configure to set the target architecture if host triple is ambigous"
- }
- 
- BUILD=
-@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
- BUILD_NETWORK="1"
- BUILD_DISCS="1"
- GPL="1"
-+ARCH=
- 
- if test ! -f "../../contrib/src/main.mak"
- then
-@@ -86,6 +88,9 @@ do
- 		--enable-*)
- 			PKGS_ENABLE="${PKGS_ENABLE} ${1#--enable-}"
- 			;;
-+		--arch=*)
-+			ARCH="${1#--arch=}"
-+			;;
- 		*)
- 			echo "Unrecognized options $1"
- 			usage
-@@ -212,6 +217,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
- test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
- test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
- test -z "$GPL" || add_make_enabled "GPL"
-+test -z "$ARCH" || add_make "ARCH := $ARCH"
- 
- #
- # Checks
-@@ -225,7 +231,10 @@ case "${OS}" in
- 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
- 		else
- 			check_ios_sdk
--			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
-+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
-+ 			if [ "$ARCH" != "arm64" ]; then
-+ 				add_make_enabled "HAVE_ARMV7A"
-+ 			fi
- 		fi
- 		;;
- 	*bsd*)
-1.8.3.4 (Apple Git-47)
-

MobileVLCKit/patches/0008-contrib-speex-fix-compilation-for-non-ARMv7-iOS-targ.patch

@@ -1,7 +1,7 @@
-From 20598ba2924f5ee5c5edf838d14b88d2b9c511d8 Mon Sep 17 00:00:00 2001
+From d1c71ffe72f27b0ea1855aa020bc8d804361e7b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:37:59 +0100
-Subject: [PATCH 08/19] contrib/speex: fix compilation for non-ARMv7 iOS
+Subject: [PATCH 07/20] contrib/speex: fix compilation for non-ARMv7 iOS
  targets
 
 the neon code included in speex doesn't do ARMv8 yet

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

@@ -1,7 +1,7 @@
-From 7e42829911acaa005eb669bcc2ae71a3f6ec4a6d Mon Sep 17 00:00:00 2001
+From b2d71dfee53ef2529ed8dfa836cd796ff1b666c8 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 09/19] contrib/flac: fix compilation with clang 5.0
+Subject: [PATCH 08/20] contrib/flac: fix compilation with clang 5.0
 
 ---
  contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From ea400c3c0369a0b93e655043f362eb2c4dcb6326 Mon Sep 17 00:00:00 2001
+From 345f0afcde20e811b9afc29218c0da7f9bb1b8b2 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 10/19] contrib/gcrypt: use git version on iOS
+Subject: [PATCH 09/20] contrib/gcrypt: use git version on iOS
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++

MobileVLCKit/patches/0011-lib-media_player-inherit-deinterlace-and-vbi-variabl.patch

@@ -1,7 +1,7 @@
-From 9143f2dcf846a9f74ed6de3dad29062d21e9c68a Mon Sep 17 00:00:00 2001
+From ed73d937f8d7cabeb58805a74419fa1763bd6099 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 21 Nov 2013 16:26:40 +0100
-Subject: [PATCH 11/19] lib/media_player: inherit deinterlace and vbi variables
+Subject: [PATCH 10/20] lib/media_player: inherit deinterlace and vbi variables
  to fix correct variables values on first use
 
 ---

MobileVLCKit/patches/0012-contrib-avcodec-deploy-libav.patch

@@ -1,7 +1,7 @@
-From ccac438450daf117a151e44cd5d06b9f93e8a37a Mon Sep 17 00:00:00 2001
+From 399426ce576cb1d73fa88d4b7d941e9e2b361c7b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:43:11 +0100
-Subject: [PATCH 12/19] contrib/avcodec: deploy libav
+Subject: [PATCH 11/20] contrib/avcodec: deploy libav
 
 ---
  contrib/src/ffmpeg/rules.mak | 2 +-

MobileVLCKit/patches/0014-contrib-opus-disable-asm-on-arm.patch

@@ -1,7 +1,7 @@
-From 6ee16d8399352d5ba4dfa1f4d69f91b9ac109c98 Mon Sep 17 00:00:00 2001
+From 7de3a3a848ec17d7b00afb5a20264e1a94fbdf24 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 15 Jan 2014 15:26:46 +0100
-Subject: [PATCH 14/19] contrib/opus disable asm on arm
+Subject: [PATCH 12/20] contrib/opus disable asm on arm
 
 ---
  contrib/src/opus/rules.mak | 3 +++

MobileVLCKit/patches/0013-contrib-don-t-try-to-guess-ARCH-if-it-was-given-as-a.patch

@@ -1,27 +0,0 @@
-From 9b2170627a87edee98f307f1ba44866e78b05098 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Wed, 15 Jan 2014 15:15:12 +0100
-Subject: [PATCH 13/19] contrib: don't try to guess ARCH if it was given as an
- argument
-
----
- contrib/src/main.mak | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index a22b717..149baa0 100644
---- a/contrib/src/main.mak
-+++ b/contrib/src/main.mak
-@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
- ifneq ($(HOST),$(BUILD))
- HAVE_CROSS_COMPILE = 1
- endif
-+ifndef ARCH
- ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
-+endif
- 
- ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
- HAVE_WIN64 := 1
-1.8.3.4 (Apple Git-47)
-

MobileVLCKit/patches/0016-contrib-gcrypt-disable-asm-on-iOS.patch

@@ -1,7 +1,7 @@
-From 46b185b724a8661260ca1cea1ea435ada7ea0aa6 Mon Sep 17 00:00:00 2001
+From b44de08d69a3a172968a1ec80d2cb31c371c92ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 09:56:23 +0100
-Subject: [PATCH 16/19] contrib/gcrypt: disable asm on iOS
+Subject: [PATCH 13/20] contrib/gcrypt: disable asm on iOS
 
 ---
  contrib/src/gcrypt/rules.mak | 3 +++

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

@@ -1,7 +1,7 @@
-From ba3082853ac79da95e9e5c167864cd282d66db57 Mon Sep 17 00:00:00 2001
+From 510752c462a13db7105af169cd792d92c3df43bc 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 17/19] extras: deploy arch option for iOS
+Subject: [PATCH 14/20] extras: deploy arch option for iOS
 
 ---
  extras/package/ios/build.sh | 2 +-

MobileVLCKit/patches/0015-contrib-fix-iOS-simulator-architecture-features.patch

@@ -1,34 +0,0 @@
-From 8b4c434d381c0eb18bb778610a345932732abb00 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Wed, 22 Jan 2014 12:21:12 +0100
-Subject: [PATCH 15/19] contrib: fix iOS simulator architecture features
-
----
- contrib/bootstrap | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/contrib/bootstrap b/contrib/bootstrap
-index df7ab6e..af90caf 100755
---- a/contrib/bootstrap
-+++ b/contrib/bootstrap
-@@ -231,10 +231,13 @@ case "${OS}" in
- 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
- 		else
- 			check_ios_sdk
--			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
-- 			if [ "$ARCH" != "arm64" ]; then
-- 				add_make_enabled "HAVE_ARMV7A"
-- 			fi
-+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
-+			if [ "$ARCH" != "x86_64" && "$ARCH" != "i386" ]; then
-+				add_make_enabled "HAVE_NEON"
-+				if [ "$ARCH" != "arm64" ]; then
-+				add_make_enabled "HAVE_ARMV7A"
-+				fi
-+			fi
- 		fi
- 		;;
- 	*bsd*)
-1.8.3.4 (Apple Git-47)
-

MobileVLCKit/patches/0018-fix-libtool.patch

@@ -1,7 +1,7 @@
-From 26b31f92a5f833e0dc95b578ca34961941187b00 Mon Sep 17 00:00:00 2001
+From 318f19aeed806e5a353671018b48dd212df2c0f2 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 18/19] fix libtool
+Subject: [PATCH 15/20] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++

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

@@ -1,7 +1,7 @@
-From cdc6a92e75d98f489b31b3ac6a9a75467d7642d5 Mon Sep 17 00:00:00 2001
+From 6046587ef9aa62deab17405ceb99213bc15dbb00 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:55:16 +0100
-Subject: [PATCH 19/19] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 16/20] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 19/19] freetype: added a fake font lookup mechanism for iOS to
  3 files changed, 45 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index 3401621..10d624b 100644
+index 573d49b..214cb76 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -1937,6 +1937,8 @@ static int Create( vlc_object_t *p_this )
+@@ -1948,6 +1948,8 @@ static int Create( vlc_object_t *p_this )
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
      p_sys->pf_select = MacLegacy_Select;

MobileVLCKit/patches/0021-contrib-speexdsp-disable-neon-for-AArch64.patch

@@ -1,17 +1,17 @@
-From 815ef9afaec7ad5e1dd22ca76bd862cead81f6b1 Mon Sep 17 00:00:00 2001
+From af117fb9e998d59bb9335416110412949deb5a1a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 15:19:43 +0100
-Subject: [PATCH 21/21] contrib/speexdsp: disable neon for AArch64
+Subject: [PATCH 17/20] contrib/speexdsp: disable neon for AArch64
 
 ---
  contrib/src/speexdsp/rules.mak | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
-index da46b9a..5f308da 100644
+index 2244813..84ce8a9 100644
 --- a/contrib/src/speexdsp/rules.mak
 +++ b/contrib/src/speexdsp/rules.mak
-@@ -32,6 +32,11 @@ ifeq ($(ARCH),arm)
+@@ -31,6 +31,11 @@ ifeq ($(ARCH),arm)
  SPEEXDSP_CONF += --enable-arm5e-asm
  endif
  endif