浏览代码

MVK: update libvlc, drop no longer needed zvbi patch, add patch to always force FPU availibility

Felix Paul Kühne 10 年之前
父节点
当前提交
4f1bc07786

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

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

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

@@ -1,7 +1,7 @@
-From ca224622f26ead374fb15df1615fca06db372b0c Mon Sep 17 00:00:00 2001
+From 2e7e6e9b618e6cd0cd4af2e47af1e034791bd331 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/10] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/11] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---

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

@@ -1,7 +1,7 @@
-From f2b5693e4cdbf1b7d6f46161afe96c039c40eae5 Mon Sep 17 00:00:00 2001
+From eab9b2d6625d0d23b68c1621524bc239cdbaa758 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/10] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/11] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

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

@@ -1,7 +1,7 @@
-From 68f14e3bf5b84a8ae0874d342adec880ca445d08 Mon Sep 17 00:00:00 2001
+From 52a7aa474a6bc71676415f58f244449b503dcafd 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/10] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/11] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--

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

@@ -1,7 +1,7 @@
-From 3be05046556b52c512bdccb2cb793a4b43c420fc Mon Sep 17 00:00:00 2001
+From a92dba6c863f900e315e8d9f24db5ea105c70fbd 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/10] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/11] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

+ 2 - 2
MobileVLCKit/patches/0006-fix-libtool.patch

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

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

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

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

@@ -1,7 +1,7 @@
-From 0ea620851c2083adec695c301824496115e93b3c Mon Sep 17 00:00:00 2001
+From 8b316a7a00877cec90f6fa4b392919acac3b6b03 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/10] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 08/11] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---

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

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

+ 2 - 2
MobileVLCKit/patches/0010-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From cc9df1a7de9af997e18294ab05c2c0baab007f96 Mon Sep 17 00:00:00 2001
+From 26b1df1443c3d9e4482f3b97a21ee0b81fa06257 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 10/10] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 10/11] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---

+ 25 - 0
MobileVLCKit/patches/0011-contrib-we-always-have-an-FPU-on-iOS.patch

@@ -0,0 +1,25 @@
+From 27317e095618f166c8fd376bdcdab05ee3368d22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Sat, 20 Dec 2014 14:59:47 +0100
+Subject: [PATCH 11/11] contrib: we always have an FPU on iOS
+
+---
+ contrib/bootstrap | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/bootstrap b/contrib/bootstrap
+index c15d84f..d803717 100755
+--- a/contrib/bootstrap
++++ b/contrib/bootstrap
+@@ -239,7 +239,7 @@ 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"
++			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+ 
+ 			case "${HOST}" in
+ 				*arm*)
+-- 
+1.9.3 (Apple Git-50)
+

+ 0 - 25
MobileVLCKit/patches/0011-contrib-zvbi-reconf-on-windows-only.patch

@@ -1,26 +0,0 @@
-From a083b2548c57bf85c51acef43a8945f106e19338 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sun, 14 Dec 2014 15:50:45 +0100
-Subject: [PATCH 11/11] contrib/zvbi: reconf on windows only
-
----
- contrib/src/zvbi/rules.mak | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
-index aac57f4..0c9b357 100644
---- a/contrib/src/zvbi/rules.mak
-+++ b/contrib/src/zvbi/rules.mak
-@@ -46,7 +46,9 @@ endif
- 
- .zvbi: zvbi
- 	$(UPDATE_AUTOCONFIG)
-+ifdef HAVE_WIN32
- 	$(RECONF)
-+endif
- 	cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)" ./configure $(ZVBICONF)
- 	cd $</src && $(MAKE) install
- 	cd $< && $(MAKE) SUBDIRS=. install
-1.9.3 (Apple Git-50)
-

+ 1 - 1
buildMobileVLCKit.sh

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