MVK: update libvlc, drop opus patch, drop harfbuzz patch merged upstream and fix linking

MobileVLCKit/MobileVLCKit.xcconfig

@@ -10,13 +10,7 @@
 VLC_SRC_DIR=$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc
 VLC_PLATFORM[sdk=iphonesimulator*]=Simulator
 VLC_PLATFORM[sdk=iphoneos*]=OS
-
-if test $(CURRENT_ARCH) = "arm64"
-then
-VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)/aarch64
-else
 VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)/$(CURRENT_ARCH)
-fi
 
 //OTHER_CFLAGS= -ObjC -all_load
 #include "vlc-plugins.xcconfig"

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

@@ -1,7 +1,7 @@
-From 3cc6c146204593aa0c8126b8826d963616da5fa0 Mon Sep 17 00:00:00 2001
+From d5622ad07c1db48d1b2a16d6e33e9775389a132c 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/12] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/10] 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 2f66b44786ed087515c333b645e0b7d078ff0f47 Mon Sep 17 00:00:00 2001
+From ca224622f26ead374fb15df1615fca06db372b0c 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/12] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/10] 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 1642887d9553740055cec6fa0efcd2546f5019d5 Mon Sep 17 00:00:00 2001
+From f2b5693e4cdbf1b7d6f46161afe96c039c40eae5 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/12] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/10] 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 8caab9d555e771fe6111e086d94b62df4c57c524 Mon Sep 17 00:00:00 2001
+From 68f14e3bf5b84a8ae0874d342adec880ca445d08 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/12] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/10] 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 5b98e66f8fd0d477408ad6a15dd714dd3f2d0a2b Mon Sep 17 00:00:00 2001
+From 3be05046556b52c512bdccb2cb793a4b43c420fc 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/12] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/10] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

MobileVLCKit/patches/0006-fix-libtool.patch

@@ -1,7 +1,7 @@
-From 2305d7d2b7d5b30b9678fee25689020c59575b6f Mon Sep 17 00:00:00 2001
+From ebe69711778cc40b43d0b50cc4f3a32a8620f14c 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 06/12] fix libtool
+Subject: [PATCH 06/10] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++

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

@@ -1,7 +1,7 @@
-From 9bde8f6104e9052c43f8fd44b0269f6f4477ef9d Mon Sep 17 00:00:00 2001
+From 46e8bdc28b1ca32ca4620e64a4159f64cfb0f301 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 07/12] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 07/10] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---

MobileVLCKit/patches/0008-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,7 +1,7 @@
-From 5fa1c83ca5425085af10645600ca332a3013eb08 Mon Sep 17 00:00:00 2001
+From 0ea620851c2083adec695c301824496115e93b3c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 31 Mar 2014 17:54:01 +0200
-Subject: [PATCH 08/12] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 08/10] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---

MobileVLCKit/patches/0009-contrib-gcrypt-simplify-compilation-by-disabling-doc.patch

@@ -1,7 +1,7 @@
-From 2e46f094ef87fe0c40b0add12d5a3dd3aea113e4 Mon Sep 17 00:00:00 2001
+From bf7060f6af8eb5940c3af3c31b92a81e4f230055 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 09/12] contrib/gcrypt: simplify compilation by disabling /doc
+Subject: [PATCH 09/10] contrib/gcrypt: simplify compilation by disabling /doc
  and work-around a libtool limitation
 
 ---

MobileVLCKit/patches/0010-contrib-opus-disable-asm-for-arm64.patch

@@ -1,28 +0,0 @@
-From 69e310b8146952263d6f29e4d3bb91fa74ba2036 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 10/12] contrib/opus: disable asm for arm64
-
----
- contrib/src/opus/rules.mak | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/contrib/src/opus/rules.mak b/contrib/src/opus/rules.mak
-index 56f0933..36b5c49 100644
---- a/contrib/src/opus/rules.mak
-+++ b/contrib/src/opus/rules.mak
-@@ -23,6 +23,11 @@ OPUS_CONF= --disable-extra-programs --disable-doc
- ifndef HAVE_FPU
- OPUS_CONF += --enable-fixed-point
- endif
-+ifdef HAVE_IOS
-+ifndef HAVE_ARMV7A
-+OPUS_CONF += --disable-asm
-+endif
-+endif
- 
- .opus: opus
- 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
-1.9.3 (Apple Git-50)
-

MobileVLCKit/patches/0012-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From 8b3871a0886cdb5f54e9c0e9a730f5b9868bfd44 Mon Sep 17 00:00:00 2001
+From cc9df1a7de9af997e18294ab05c2c0baab007f96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 9 Dec 2014 22:14:55 +0100
-Subject: [PATCH 12/12] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 10/10] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---

MobileVLCKit/patches/0011-contrib-harfbuzz-work-around-build-system-stupidity-.patch

@@ -1,49 +0,0 @@
-From c6804351fe40b6998cadcf690b09659e0c52a468 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Wed, 12 Mar 2014 14:48:12 +0100
-Subject: [PATCH 11/12] contrib/harfbuzz: work-around build system stupidity
- breaking clang compilation
-
----
- contrib/src/harfbuzz/harfbuzz-clang.patch | 16 ++++++++++++++++
- contrib/src/harfbuzz/rules.mak            |  1 +
- 2 files changed, 17 insertions(+)
- create mode 100644 contrib/src/harfbuzz/harfbuzz-clang.patch
-
-diff --git a/contrib/src/harfbuzz/harfbuzz-clang.patch b/contrib/src/harfbuzz/harfbuzz-clang.patch
-new file mode 100644
-index 0000000..59d1e06
---- /dev/null
-+++ b/contrib/src/harfbuzz/harfbuzz-clang.patch
-@@ -0,0 +1,16 @@
-+--- harfbuzz/configure.ac	2013-07-16 22:04:08.000000000 +0200
-++++ harfbuzz/configure.ac	2014-03-12 14:46:36.000000000 +0100
-+@@ -80,13 +80,6 @@
-+ 			CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ 		;;
-+ 	esac
-+-
-+-	case "$host" in
-+-		arm-*-*)
-+-			# Request byte alignment on arm
-+-			CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
-+-		;;
-+-	esac
-+ fi
-+ 
-+ AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
-diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
-index c6a84a6..e9ea233 100644
---- a/contrib/src/harfbuzz/rules.mak
-+++ b/contrib/src/harfbuzz/rules.mak
-@@ -16,6 +16,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
- 	$(UNPACK)
- 	$(UPDATE_AUTOCONFIG)
- 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
-+	$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
- 	$(MOVE)
- 
- DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
-1.9.3 (Apple Git-50)
-

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=8d48e95e9
+TESTEDHASH=4588b01c0
 
 usage()
 {