Commit 4700ce95 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: rebase libvlc

parent a0bf5544
From c48c732696d52302c184ee71a90e8f8af85687b1 Mon Sep 17 00:00:00 2001
From f81d7a58aa949843f84ccba2d4fa9c1861c7123b 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
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.7.4 (Apple Git-66)
2.8.3
From f3323e59bbe7a0ddb975b1ea8cec82226734e807 Mon Sep 17 00:00:00 2001
From 39f33235f4423663edd85caf15134caced8c0dc8 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 02/15] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.7.4 (Apple Git-66)
2.8.3
From dd92503c663b8e92714ebd20beeb4d787f21ae09 Mon Sep 17 00:00:00 2001
From 136970850e19ed8aba45d4ccde16f6047e03850b 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 03/15] lib/media player: inherit deinterlace variable to
......@@ -9,10 +9,10 @@ Subject: [PATCH 03/15] lib/media player: inherit deinterlace variable to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index 4761fee..24d0c71 100644
index a0860da..b2ac614 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -609,7 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -640,7 +640,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
......@@ -22,5 +22,5 @@ index 4761fee..24d0c71 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.7.4 (Apple Git-66)
2.8.3
From 385a3b53056adff87a836e3f70b79336ddbbfae0 Mon Sep 17 00:00:00 2001
From e2f202ffaf95bc119aafb369bd01c6f45a1c96df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/15] arm_neon: work-around libtool issue
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.7.4 (Apple Git-66)
2.8.3
From 7f7ada4925897e2dc9706493dfd5b7221df3ea11 Mon Sep 17 00:00:00 2001
From f0aa8d75d8cfd42e5ffb490b17ac22030c7d99b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/15] arm_neon: fix iOS linking
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.7.4 (Apple Git-66)
2.8.3
From 50402ecdb15c0e5480bf68ec45606b237d4a663c Mon Sep 17 00:00:00 2001
From d7d12cb6f0f0cb30768f39fd34338187b3921f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 06/15] disable neon volume plugin
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.7.4 (Apple Git-66)
2.8.3
From 95165618d2e4c0524d38b3aa00ba42b4233ce857 Mon Sep 17 00:00:00 2001
From ecae0a8e9bbe6a49afffe0da679d8f9b5b7570d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 08/15] src/misc: fix compilation for OS without fork()
Subject: [PATCH 07/15] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 4a5f2a0..79b28e4 100644
index 28f127a..bacf842 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -63,7 +63,7 @@ static uint32_t cpu_flags;
......@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
{
pid_t pid = fork();
--
2.7.4 (Apple Git-66)
2.8.3
From 6a8bd4b4021af5174a3fe1e9e1811e44e18e81e1 Mon Sep 17 00:00:00 2001
From 4b719169745ccf1036b02ac4745a879e0ac4f895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 18:34:26 +0200
Subject: [PATCH 09/15] libvlc: hack to disable daemon mode
Subject: [PATCH 08/15] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libvlc.c b/src/libvlc.c
index 3468e0e..2d870bd 100644
index 3ccdede..d5abe35 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -200,6 +200,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
......@@ -23,5 +23,5 @@ index 3468e0e..2d870bd 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.7.4 (Apple Git-66)
2.8.3
From 6e84efd68b6448f3fcd01de589eead1120d402db Mon Sep 17 00:00:00 2001
From a02467147d871b9c35cf02be22f215788d10cecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:46:27 +0100
Subject: [PATCH 11/15] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 09/15] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.7.4 (Apple Git-66)
2.8.3
From e47596b0028208645641d31abf6a5e3915094d8e Mon Sep 17 00:00:00 2001
From 893bbef82d4f3065d89ee79018a567f10c0e77e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:09:24 +0100
Subject: [PATCH 12/15] libvlc: expose a base set of freetype options to
Subject: [PATCH 10/15] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -14,10 +14,10 @@ Subject: [PATCH 12/15] libvlc: expose a base set of freetype options to
6 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 456e99e..3a9aa85 100644
index 2323b4d..5a54cb7 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1483,6 +1483,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1496,6 +1496,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
unsigned option, float value );
......@@ -51,10 +51,10 @@ index 456e99e..3a9aa85 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index c134fef..b74c313 100644
index 733a4dd..f297970 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -238,6 +238,9 @@ libvlc_video_get_spu_count
@@ -245,6 +245,9 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -64,7 +64,7 @@ index c134fef..b74c313 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -262,6 +265,9 @@ libvlc_video_set_spu
@@ -269,6 +272,9 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......@@ -75,10 +75,10 @@ index c134fef..b74c313 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 24d0c71..b10bee1 100644
index b2ac614..0c54b63 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -639,6 +639,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -670,6 +670,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);
......@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
/**
--
2.7.4 (Apple Git-66)
2.8.3
From 784074e19777905f42274ef9dee71006efc27365 Mon Sep 17 00:00:00 2001
From 2ca98a76d24d6d1d2798da77ddbaad60a7f329ea Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 13/15] Add AC-3 pass-through
Subject: [PATCH 11/15] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -29,10 +29,10 @@ index 6c264bc..b0901ae 100755
logger
visual
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 3a9aa85..bbc89e8 100644
index 5a54cb7..303e716 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1818,6 +1818,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
@@ -1831,6 +1831,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
/**
......@@ -77,10 +77,10 @@ index 7901c64..3877311 100644
*****************************************************************************/
int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi )
diff --git a/lib/media_player.c b/lib/media_player.c
index b10bee1..b4c23a4 100644
index 0c54b63..9e2f137 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -609,6 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -640,6 +640,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
......@@ -163,5 +163,5 @@ index 044905b..355f14f 100644
return OpenCommon( p_this, false );
}
--
2.7.4 (Apple Git-66)
2.8.3
From 9c6c331f40c9b5423fbf6b0d2b87e74cf7b80b96 Mon Sep 17 00:00:00 2001
From 4595a588bc8952edb96f7cd409869b84b6967d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 4 May 2016 16:00:40 +0200
Subject: [PATCH 14/15] libvlc: create VT-zero-copy variable
Subject: [PATCH 12/15] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/media_player.c b/lib/media_player.c
index b4c23a4..c3d9421 100644
index 9e2f137..a587d85 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -591,6 +591,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -622,6 +622,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
#endif
#ifdef __APPLE__
var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);
......@@ -20,5 +20,5 @@ index b4c23a4..c3d9421 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.7.4 (Apple Git-66)
2.8.3
From 4b066d277423e085c8ac230c578f4080e6f4599d Mon Sep 17 00:00:00 2001
From 5fea2bdd58e246d8f81e0f056be7c5d935b14fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 9 May 2016 11:49:20 +0200
Subject: [PATCH 15/15] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 13/15] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index aab4657..b2caa35 100644
index a266389..b103de7 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -25,5 +25,5 @@ index aab4657..b2caa35 100644
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else
--
2.8.1
2.8.3
From 062a583387a95e32797b9175e48ce9a339e4beb8 Mon Sep 17 00:00:00 2001
From e04f7c05fbe07fcbd255a5d4083415f0cb75d399 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 07/15] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 14/15] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 07/15] contrib/gcrypt: work-around a libtool limitation
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 2fed2cd..0471522 100644
index 3bb2c80..26725cc 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......@@ -18,9 +18,9 @@ index 2fed2cd..0471522 100644
$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
$(MOVE)
DEPS_gcrypt = gpg-error
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
endif
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
new file mode 100644
index 0000000..df97ffb
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.7.4 (Apple Git-66)
2.8.3
From f4f0c2d40e3208298c6055dc1c7032999ec45b76 Mon Sep 17 00:00:00 2001
From bc65c068477672ab0a0d18882ced89a8b3e7390f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 10/15] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 15/15] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,7 +32,7 @@ index 0000000..f1d3ccc
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0471522..ac20d02 100644
index 26725cc..ffb159e 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -16,6 +16,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......@@ -40,10 +40,10 @@ index 0471522..ac20d02 100644
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
+ $(APPLY) $(SRC)/gcrypt/fix-sha1-ssse3-for-clang.patch
$(MOVE)
DEPS_gcrypt = gpg-error
@@ -32,6 +33,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
endif
@@ -36,6 +37,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else
GCRYPT_EXTRA_CFLAGS =
endif
......@@ -56,5 +56,5 @@ index 0471522..ac20d02 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.7.4 (Apple Git-66)
2.8.3
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=e9878b8b
TESTEDHASH=09f8d87f
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