소스 검색

MVK: fix compilation for armv7

Felix Paul Kühne 10 년 전
부모
커밋
754265a32d

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

@@ -1,7 +1,7 @@
-From 68f56be85e97978a87b3f908c5832aa2b7c64f20 Mon Sep 17 00:00:00 2001
+From 2d0c70a824694b540326d9d655db2d37d7a4dc40 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 1/8] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 1/9] 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 4177ee03f9ec6a4cf43cf3c76c6117c900568028 Mon Sep 17 00:00:00 2001
+From da41f6ce2a498eb04031fb5ee6dd80ac3fbe7f96 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 2/8] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 2/9] 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 59e63eb017856cb8cd098b4ba234a67c2ea71d73 Mon Sep 17 00:00:00 2001
+From 16937da7fcf6605daf03ebbd1fc71a90bd3d7d77 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 3/8] deinterlace/merge: use a macro to fix compilation for iOS
+Subject: [PATCH 3/9] deinterlace/merge: use a macro to fix compilation for iOS
 
 ---
  modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++----------------

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

@@ -1,7 +1,7 @@
-From 8b2317ff84a4de42682b03c1c1b10876ab51ca6f Mon Sep 17 00:00:00 2001
+From 14dbd85fdd383aa6dd091841ee67b15de33053e9 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 4/8] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 4/9] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

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

@@ -1,7 +1,7 @@
-From dab5e4ac0ac51b3bdab517146dfa1f246f9242a1 Mon Sep 17 00:00:00 2001
+From 1218bcd1112e9297e0c31821b0ffe7768f2ca1d8 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 5/8] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 5/9] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---

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

@@ -1,7 +1,7 @@
-From 65a335725ebe4fbff6e2ae8b53f9f9aadccf3768 Mon Sep 17 00:00:00 2001
+From f3353bd062f3505c2dd529f53df3b9af291fd397 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 6/8] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 6/9] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---

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

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

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

@@ -1,7 +1,7 @@
-From 53afc60a3e1c4c9a52eb38c3fce2f8b4be4d334a Mon Sep 17 00:00:00 2001
+From 01b7d5e08e14839d435a1c048ab8b81873be62ab 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 8/8] lib/media player: inherit deinterlace variable to achieve
+Subject: [PATCH 8/9] lib/media player: inherit deinterlace variable to achieve
  correct value on first use
 
 ---

+ 22 - 0
MobileVLCKit/patches/0009-arm_neon-work-around-libtool-issue.patch

@@ -0,0 +1,22 @@
+From 33f30abf1aa78660b02526e012b849cb91f7f9b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Wed, 18 Feb 2015 21:35:16 +0100
+Subject: [PATCH 9/9] arm_neon: work-around libtool issue
+
+---
+ modules/arm_neon/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
+index 4e73a4f..43ef527 100644
+--- a/modules/arm_neon/Makefile.am
++++ b/modules/arm_neon/Makefile.am
+@@ -1,3 +1,5 @@
++LIBTOOL=@LIBTOOL@ --tag=CC
++
+ neondir = $(pluginsdir)/arm_neon
+ 
+ libsimple_channel_mixer_neon_plugin_la_SOURCES = \
+-- 
+2.3.0
+

+ 1 - 1
buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=987df6dc0d3
+TESTEDHASH=bf991772dac
 
 usage()
 {