Commit 023873b4 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Felix Paul Kühne

MVK: rebase libvlc

parent e80773ea
From dd693696c6e9ace691ea2f3fe59c7f912eb1ee3f Mon Sep 17 00:00:00 2001
From a47e248a2cc1393d62ec2a2f75d0a489b460a19a 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/18] arm_neon: added function macro to handle the underscore
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.4.3
2.5.4 (Apple Git-61)
From 3ad6c2c1c07d9b39a73511c9481e1da4b2c019fe Mon Sep 17 00:00:00 2001
From f0b050c516049ac3cda9cad30b9d25778f5bc8df 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/18] arm_neon: use a macro to fix compilation for iOS
......@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc}
+endfunc
--
2.4.3
2.5.4 (Apple Git-61)
From 2306957fb3e88f56447cfa5b75cb4b016aad0224 Mon Sep 17 00:00:00 2001
From 185e234c2faa6c9982d7e7e4cb390b855945dd1f 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/18] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.4.3
2.5.4 (Apple Git-61)
From 84c6b30c061f21756ce1ba8ef1ff647a1d1abd4d Mon Sep 17 00:00:00 2001
From ec9ee76f64b15bc53b15750840e5284c8c852473 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/18] libass: fix text rendering on iOS by providing a font
......@@ -9,7 +9,7 @@ Subject: [PATCH 04/18] libass: fix text rendering on iOS by providing a font
1 file changed, 38 insertions(+)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 8e32d64..77418e7 100644
index a86f27a..d2f2d72 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -29,6 +29,13 @@
......@@ -65,5 +65,5 @@ index 8e32d64..77418e7 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.4.3
2.5.4 (Apple Git-61)
From 84fb4aac8388ca87ba2d67d560e39f7a4e0e9369 Mon Sep 17 00:00:00 2001
From 78ea7702174cd2b8083bb98c6abf9ea62afb62d0 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/18] contrib/png: fix ARM assembly for iOS
......@@ -82,7 +82,7 @@ index 0000000..f4b8bc1
+ ldr r12, [r0, #4] @ rowbytes
+ vmov.i8 d3, #0
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index c5a3fba..7649c4b 100644
index 61f835e..8e5f654 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
......@@ -119,5 +119,5 @@ index c5a3fba..7649c4b 100644
cd $< && $(MAKE) install
touch $@
--
2.4.3
2.5.4 (Apple Git-61)
From dfa384e697a1fe37449391e5740cb419479a61ce Mon Sep 17 00:00:00 2001
From ac01bda2879d1c00a251b04cf11480abc1a9b938 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/18] lib/media_player: inherit deinterlace and vbi variables
......@@ -9,10 +9,10 @@ Subject: [PATCH 06/18] lib/media_player: inherit deinterlace and vbi variables
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index b4a5f10..5691345 100644
index 8e2d161..9729eec 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -436,11 +436,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -499,11 +499,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_SetFloat (mp, "scale", 1.);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
......@@ -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.4.3
2.5.4 (Apple Git-61)
From 0a72aeb45c7b3aec98df1b2bde3fd08fd5634310 Mon Sep 17 00:00:00 2001
From a0f79773d80884517fb058d556dc78c3783d46b2 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/18] contrib/opus disable asm on arm
......@@ -8,7 +8,7 @@ Subject: [PATCH 07/18] contrib/opus disable asm on arm
1 file changed, 3 insertions(+)
diff --git a/contrib/src/opus/rules.mak b/contrib/src/opus/rules.mak
index 56f0933..273521f 100644
index 0c002d2..4a8aca7 100644
--- a/contrib/src/opus/rules.mak
+++ b/contrib/src/opus/rules.mak
@@ -23,6 +23,9 @@ OPUS_CONF= --disable-extra-programs --disable-doc
......@@ -22,5 +22,5 @@ index 56f0933..273521f 100644
.opus: opus
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
--
2.4.3
2.5.4 (Apple Git-61)
From 65024030e2bba46fa8cd34d446f07e293e4bf6fd Mon Sep 17 00:00:00 2001
From 5e35ee252ca2b1e91f2c0455456eebe762ad699e 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/18] contrib/gcrypt: disable asm on iOS
......@@ -8,7 +8,7 @@ Subject: [PATCH 08/18] contrib/gcrypt: disable asm on iOS
1 file changed, 3 insertions(+)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0cc1222..7e67319 100644
index f8dcfc1..6fa8b1e 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -31,6 +31,9 @@ GCRYPT_EXTRA_CFLAGS =
......@@ -22,5 +22,5 @@ index 0cc1222..7e67319 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
2.4.3
2.5.4 (Apple Git-61)
From ad54f99741c9c3af2d4fecdeb88af6310d5a6a29 Mon Sep 17 00:00:00 2001
From 93e79aa655b3ff8627b5928527654560158fbb2f 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/18] fix libtool
......@@ -33,5 +33,5 @@ index 3bb8cdb..542abaa 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
2.4.3
2.5.4 (Apple Git-61)
From 1cb693d1460768591fc079e00985cb2edb03b384 Mon Sep 17 00:00:00 2001
From 0f83d66d39fcb926fb48f0aee119c69acda1e7ea 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/18] freetype: added a fake font lookup mechanism for iOS to
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
2.4.3
2.5.4 (Apple Git-61)
From a65807ff6051740d706f7c3a42f2a93f9b38eb3a Mon Sep 17 00:00:00 2001
From 76aea2ea8858128d23e62a7471f9e4994a1af45d 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/18] contrib/speexdsp: disable neon for AArch64
......@@ -24,5 +24,5 @@ index e82c6ba..658a72e 100644
.speexdsp: speexdsp
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
--
2.4.3
2.5.4 (Apple Git-61)
From 699a565be4e40d2ac68a49c9337615de3d93cee7 Mon Sep 17 00:00:00 2001
From c7d40e281c8a398e71032e0f2672d9cd60613fc7 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/18] contrib: add arch option for platforms where the arch
......@@ -10,7 +10,7 @@ Subject: [PATCH 12/18] contrib: add arch option for platforms where the arch
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index b77a9d9..86d4b9e 100755
index 4fa2474..376e3ea 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
......@@ -65,7 +65,7 @@ index b77a9d9..86d4b9e 100755
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c9f409a..1ae11e9 100644
index d3be485..01eef93 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......@@ -79,5 +79,5 @@ index c9f409a..1ae11e9 100644
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
2.4.3
2.5.4 (Apple Git-61)
From d2e9638c2008cabbc7785660bb180c9a4db8152d Mon Sep 17 00:00:00 2001
From ebc498d0c3a43286815e0f8cd326daf8b4f4c39c 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/18] contrib/gcrypt: use git version on iOS
......@@ -61,12 +61,12 @@ index 0000000..e63224e
+1.8.3.4 (Apple Git-47)
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 7e67319..8773aa1 100644
index 6fa8b1e..ef297a1 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,6 +1,7 @@
# GCRYPT
GCRYPT_VERSION := 1.6.2
GCRYPT_VERSION := 1.6.4
GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
......@@ -135,5 +135,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.4.3
2.5.4 (Apple Git-61)
From 2ab08e418a4968e3abf4fee5aa3fd65d785c8d6f Mon Sep 17 00:00:00 2001
From fbf58a2cf78f6501b26215ddd3c6dcf58a393710 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/18] libvlc: add preliminary code path to modify quartztext
......@@ -67,10 +67,10 @@ index c0c66dd..7810ed7 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 5691345..3ca1e10 100644
index 9729eec..a8a9d18 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -465,6 +465,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -528,6 +528,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
......@@ -139,7 +139,7 @@ index 19065fb..8988069 100644
+ return get_string( p_mi, "quartztext", textrenderer_option_bynumber(option) );
+}
diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
index 8de1081..112e952 100644
index 69a31ed..2c3337f 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -65,6 +65,10 @@
......@@ -223,7 +223,7 @@ index 8de1081..112e952 100644
+
#ifndef TARGET_OS_IPHONE
if (p_sys->p_fonts) {
for (int k = 0; k < p_sys->i_fonts; k++) {
for (int k = 0; k < p_sys->i_fonts; k++)
@@ -236,8 +259,8 @@ static void Destroy(vlc_object_t *p_this)
free(p_sys->p_fonts);
......@@ -234,7 +234,7 @@ index 8de1081..112e952 100644
free(p_sys);
}
@@ -949,12 +972,12 @@ static int GetFontSize(filter_t *p_filter)
@@ -953,12 +976,12 @@ static int GetFontSize(filter_t *p_filter)
{
int i_size = 0;
......@@ -250,7 +250,7 @@ index 8de1081..112e952 100644
msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
}
@@ -1041,3 +1064,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
@@ -1045,3 +1068,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
return VLC_SUCCESS;
}
......@@ -275,5 +275,5 @@ index 8de1081..112e952 100644
+ return VLC_SUCCESS;
+}
--
2.4.3
2.5.4 (Apple Git-61)
From f087abc2ac103eabccc324b4dea519bf8a51f5eb Mon Sep 17 00:00:00 2001
From 90f1155d92ac24ea570f05fb39521abef2255eda 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/18] contrib/speex: fix compilation for non-ARMv7 iOS
......@@ -25,5 +25,5 @@ index a5f003c..916b0ea 100644
.speex: speex
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
--
2.4.3
2.5.4 (Apple Git-61)
From 3fae29ea48c88524f483ee047f11ac103202fbb4 Mon Sep 17 00:00:00 2001
From d4a920aac8eb21305800c90b083fe802a180a5c1 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/18] contrib/vpx: fix iOS 32bit Intel simulator compilation
......@@ -39,5 +39,5 @@ index 504860c..abc46d2 100644
gcc*)
add_cflags -m${bits}
--
2.4.3
2.5.4 (Apple Git-61)
From a00328f1162666553595232cae4f45132c7747d5 Mon Sep 17 00:00:00 2001
From 17271ac3d7f551a6e29584a6be5973d3d4b44571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 13 May 2015 13:00:49 +0200
Subject: [PATCH 17/18] Revert "Contribs: update libvpx to 1.4.0"
......@@ -333,5 +333,5 @@ index ac3eace..b55199d 100644
$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
$(call download,$(VPX_URL))
--
2.4.3
2.5.4 (Apple Git-61)
From 51b0f30008ecb018540faa9591c639d3b04b0bc4 Mon Sep 17 00:00:00 2001
From f8b3bf066e3ff0ec66f0827eabf153929e67348a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 13 May 2015 13:06:05 +0200
Subject: [PATCH 18/18] ebml: disable exceptions
......@@ -8,7 +8,7 @@ Subject: [PATCH 18/18] ebml: disable exceptions
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 4a5ac16..c779726 100644
index 0859b55..4793316 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -14,7 +14,7 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
......@@ -21,5 +21,5 @@ index 4a5ac16..c779726 100644
.ebml: libebml
--
2.4.3
2.5.4 (Apple Git-61)
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=4aa44a18
TESTEDHASH=6259d80d
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