Commit 62b447a8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc

parent 522fc85c
From be403949f36756d7a51f53804bdc810a682a0e88 Mon Sep 17 00:00:00 2001
From 4fed5cc0be0c14da4fb4603879f1d82c0d7dbd0d 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/15] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/16] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.3.5
2.4.0
From fe90dd7d7041c1e98bc8511fe78568489ad78ab2 Mon Sep 17 00:00:00 2001
From 236cf2a64fd03187cc7141aad4fe89594d3bdcba 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/15] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 02/16] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc}
+endfunc
--
2.3.5
2.4.0
From 1ecc1a29daf99269088b6c1c28eeb31323e9fb53 Mon Sep 17 00:00:00 2001
From e1fcb0bfc6dcd89517d5bae00f4169c88689e8d2 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/15] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/16] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.3.5
2.4.0
From 03ae6e210646a953a01a0ec4dc7213d860998ef4 Mon Sep 17 00:00:00 2001
From 06f0dec1764d7390d8783180766375dd174f1ce3 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 04/15] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 04/16] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......@@ -62,5 +62,5 @@ index 8e32d64..21cdadc 100644
const char *psz_font = NULL; /* We don't ship a default font with VLC */
const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
--
2.3.5
2.4.0
From df60e4c82f285bb4ab50eb7964fcb73ecd33adee Mon Sep 17 00:00:00 2001
From bda43da18eb2a023273403639a1ad2b1d376b777 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 05/15] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 05/16] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......@@ -119,5 +119,5 @@ index c5a3fba..7649c4b 100644
cd $< && $(MAKE) install
touch $@
--
2.3.5
2.4.0
From 49cfba8915c88655f0609bc823f4a9c7a33d3c5a Mon Sep 17 00:00:00 2001
From 4744b0e06ef415794f8c3970cb2b3dda9cba1b71 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 06/15] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 06/16] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......@@ -27,5 +27,5 @@ index b4a5f10..5691345 100644
var_Create (mp, "marq-marquee", VLC_VAR_STRING);
var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
--
2.3.5
2.4.0
From c84f1f4ddca32f65aadf61be165e465a76c856a4 Mon Sep 17 00:00:00 2001
From ab4cf2daeec653d631a24e9a913423131db004ce 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 07/15] contrib/opus disable asm on arm
Subject: [PATCH 07/16] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......@@ -22,5 +22,5 @@ index 56f0933..273521f 100644
.opus: opus
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
--
2.3.5
2.4.0
From 4ce34eaaf60136bdf7f60e825ee5acbfb7e802a2 Mon Sep 17 00:00:00 2001
From f330b7551f8b2158a510dfeb02cfde1d55bc4d4f 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 08/15] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 08/16] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......@@ -22,5 +22,5 @@ index 0cc1222..7e67319 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
2.3.5
2.4.0
From 32e44974f807b14c42f1526636cebd3f7a538979 Mon Sep 17 00:00:00 2001
From bbeafa5b9343542e5b04dae87be78bf2069fff67 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 09/15] fix libtool
Subject: [PATCH 09/16] fix libtool
---
modules/arm_neon/Makefile.am | 4 ++++
......@@ -33,5 +33,5 @@ index 3bb8cdb..542abaa 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
2.3.5
2.4.0
From 02d1d8f750cd43e829ca7615d8637565bb1df6b3 Mon Sep 17 00:00:00 2001
From 01c310184d5e65089f0039b962b30af98f165b90 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 10/15] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 10/16] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
2.3.5
2.4.0
From a436c24a8fcc8d7c276c3e576c95cd5173979eba Mon Sep 17 00:00:00 2001
From 5f0a6b228bc77f64ce3fbdcf0b9e7f8c77454869 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 11/15] contrib/speexdsp: disable neon for AArch64
Subject: [PATCH 11/16] contrib/speexdsp: disable neon for AArch64
---
contrib/src/speexdsp/rules.mak | 5 +++++
......@@ -24,5 +24,5 @@ index e82c6ba..658a72e 100644
.speexdsp: speexdsp
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
--
2.3.5
2.4.0
From 50cf82c08ce9bcd06c14945f5ddd5d5dd98f2608 Mon Sep 17 00:00:00 2001
From eb6464835c38ed6f712e69ea5e15779a93a08031 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/15] contrib: add arch option for platforms where the arch
Subject: [PATCH 12/16] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......@@ -79,5 +79,5 @@ index c9f409a..1ae11e9 100644
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
2.3.5
2.4.0
From af0505dca143d71c26f47d3be10e6b4f3ed519b7 Mon Sep 17 00:00:00 2001
From 509e21254e7f00e95b0fb59f6e410e492393d175 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 13/15] contrib/gcrypt: use git version on iOS
Subject: [PATCH 13/16] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......@@ -135,5 +135,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.3.5
2.4.0
From 27c29b9a9ea44d61d9d23a63936aa623bef63c48 Mon Sep 17 00:00:00 2001
From 37f4952b3e94ad3917a6a7370a2428db1cb7aeee 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 14/15] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 14/16] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -275,5 +275,5 @@ index 8de1081..112e952 100644
+ return VLC_SUCCESS;
+}
--
2.3.5
2.4.0
From 0108c5707f02eb2babe98bbe88fa21508ad391a7 Mon Sep 17 00:00:00 2001
From 78870f08f7b51031338825989e704416aaa5cb23 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 15/15] contrib/speex: fix compilation for non-ARMv7 iOS
Subject: [PATCH 15/16] contrib/speex: fix compilation for non-ARMv7 iOS
targets
---
......@@ -25,5 +25,5 @@ index a5f003c..916b0ea 100644
.speex: speex
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
--
2.3.5
2.4.0
From 4393ef7d6a4af80c4d0cd92e784b293171196cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 May 2015 22:00:33 +0200
Subject: [PATCH 16/16] contrib/vpx: fix iOS 32bit Intel simulator compilation
---
contrib/src/vpx/libvpx-ios.patch | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 504860c..abc46d2 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,5 +1,6 @@
---- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:10:54.667129298 +0200
-+++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:13:53.650560142 +0200
+diff -ru libvpx-b/build/make/configure.sh libvpx/build/make/configure.sh
+--- libvpx-b/build/make/configure.sh 2015-05-12 21:59:04.000000000 +0200
++++ libvpx/build/make/configure.sh 2015-05-12 21:59:53.000000000 +0200
@@ -745,58 +745,6 @@
# Minimum iOS version for all target platforms (darwin and iphonesimulator).
IOS_VERSION_MIN="6.0"
@@ -59,7 +60,16 @@
# Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in
sparc-solaris-*)
-@@ -1149,6 +1097,13 @@
+@@ -1141,14 +1089,17 @@
+
+ bits=32
+ enabled x86_64 && bits=64
+- check_cpp <<EOF && bits=x32
+-#if !defined(__ILP32__) || !defined(__x86_64__)
+-#error "not x32"
+-#endif
+-EOF
++
case ${tgt_cc} in
gcc*)
add_cflags -m${bits}
--
2.4.0
From cd465718524c4dd72569e1c9c2f0f238519d763b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 2 May 2015 13:34:05 +0200
Subject: [PATCH 16/16] contrib/vpx: fix x86 iOS simulator compilation
---
contrib/src/vpx/libvpx-ios.patch | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 852792d..ca3d721 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,6 +1,6 @@
-diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh
---- libvpx/build/make/configure.sh 2014-11-04 21:34:04.000000000 +0100
-+++ libvpx/build/make/configure.sh 2014-11-04 21:36:12.000000000 +0100
+diff -ru libvpx/build/make/configure.sh libvpx-fi/build/make/configure.sh
+--- libvpx/build/make/configure.sh 2015-05-02 13:31:42.000000000 +0200
++++ libvpx-fi/build/make/configure.sh 2015-05-02 13:31:26.000000000 +0200
@@ -714,59 +714,6 @@
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
@@ -61,7 +61,19 @@ diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh
# Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in
sparc-solaris-*)
-@@ -1070,7 +1017,13 @@
+@@ -1025,11 +972,6 @@
+ x86*)
+ bits=32
+ enabled x86_64 && bits=64
+- check_cpp <<EOF && bits=x32
+-#ifndef __ILP32__
+-#error "not x32"
+-#endif
+-EOF
+
+ case ${tgt_os} in
+ win*)
+@@ -1070,7 +1012,13 @@
;;
gcc*)
add_cflags -m${bits}
--
2.4.0
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=739c7a82eb7d21
TESTEDHASH=5b8b9780773ef0c
usage()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment