Commit dcd42c6f authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc

parent e39453a6
From ed34140a4f724e1b29defbfbeb19d271a8827fb3 Mon Sep 17 00:00:00 2001 From f46e3693a5412b729564a6c3818b0c8b208a12a6 Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr> From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200 Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 1/9] arm_neon: added function macro to handle the underscore Subject: [PATCH 01/10] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI prefix for the iOS ARM ABI
--- ---
...@@ -65,5 +65,5 @@ index 0000000..d853255 ...@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm +.endm
+ +
-- --
2.4.1 2.4.4
From a9394e72516672b7bfcf7f9dcc19af1cfbb52e91 Mon Sep 17 00:00:00 2001 From 0fedb73731e5415b4e7a9d1acde619babc3ef54d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:01:49 +0200 Date: Fri, 10 Aug 2012 16:01:49 +0200
Subject: [PATCH 2/9] arm_neon: use a macro to fix compilation for iOS Subject: [PATCH 02/10] arm_neon: use a macro to fix compilation for iOS
--- ---
modules/arm_neon/amplify.S | 9 +++--- modules/arm_neon/amplify.S | 9 +++---
...@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644 ...@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc} pop {r4,pc}
+endfunc +endfunc
-- --
2.4.1 2.4.4
From 0666a80310b0a240d93b5d4af768d3389cd09988 Mon Sep 17 00:00:00 2001 From c477ea16265a3bd28f8280eea80a92b65ed12d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200 Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 3/9] deinterlace/merge: use a macro to fix compilation for iOS Subject: [PATCH 03/10] deinterlace/merge: use a macro to fix compilation for
iOS
--- ---
modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++---------------- modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++----------------
...@@ -81,5 +82,5 @@ index dd77902..03e5042 100644 ...@@ -81,5 +82,5 @@ index dd77902..03e5042 100644
b 1b b 1b
+endfunc +endfunc
-- --
2.4.1 2.4.4
From 5c8095dc08a329c95f0c3f157f80b71668b9bffd Mon Sep 17 00:00:00 2001 From 15ef7ebbc9dd138380ed3c8429783a85e7519586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 29 May 2013 13:25:54 +0200 Date: Wed, 29 May 2013 13:25:54 +0200
Subject: [PATCH 4/9] libass: fix text rendering on iOS by providing a font Subject: [PATCH 04/10] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen lookup mechanism for the font shipped with Aspen
--- ---
...@@ -65,5 +65,5 @@ index 067ef6b..8460dad 100644 ...@@ -65,5 +65,5 @@ index 067ef6b..8460dad 100644
const char *psz_font = NULL; /* We don't ship a default font with VLC */ 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 */ const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
-- --
2.4.1 2.4.4
From b89233daef3b4f35c79d145fb031b2f1aa3f6de8 Mon Sep 17 00:00:00 2001 From 16d400237fcab9d20bfb1c6fc723d591102ded76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100 Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 5/9] freetype: added a fake font lookup mechanism for iOS to Subject: [PATCH 05/10] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts use the packaged demo fonts
--- ---
...@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644 ...@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif #endif
-- --
2.4.1 2.4.4
From 15e072de534aa926b75a2b0dd4df60a09e2ba616 Mon Sep 17 00:00:00 2001 From 26a19e04ca03f0d22ac05028c95473751e3ffe1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200 Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 6/9] libvlc: add preliminary code path to modify quartztext Subject: [PATCH 06/10] libvlc: add preliminary code path to modify quartztext
variables on-the-fly variables on-the-fly
--- ---
...@@ -13,10 +13,10 @@ Subject: [PATCH 6/9] libvlc: add preliminary code path to modify quartztext ...@@ -13,10 +13,10 @@ Subject: [PATCH 6/9] libvlc: add preliminary code path to modify quartztext
5 files changed, 130 insertions(+), 8 deletions(-) 5 files changed, 130 insertions(+), 8 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 9939cfe..fac613a 100644 index 3bccb5b..7053b39 100644
--- a/include/vlc/libvlc_media_player.h --- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h
@@ -1387,6 +1387,27 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi, @@ -1472,6 +1472,27 @@ 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, LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
unsigned option, float value ); unsigned option, float value );
...@@ -45,10 +45,10 @@ index 9939cfe..fac613a 100644 ...@@ -45,10 +45,10 @@ index 9939cfe..fac613a 100644
/** \defgroup libvlc_audio LibVLC audio controls /** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index c0c206f..76473f9 100644 index 03577c7..d084c44 100644
--- a/lib/libvlc.sym --- a/lib/libvlc.sym
+++ b/lib/libvlc.sym +++ b/lib/libvlc.sym
@@ -225,6 +225,8 @@ libvlc_video_get_spu_count @@ -229,6 +229,8 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay libvlc_video_get_spu_delay
libvlc_video_get_spu_description libvlc_video_get_spu_description
libvlc_video_get_teletext libvlc_video_get_teletext
...@@ -57,7 +57,7 @@ index c0c206f..76473f9 100644 ...@@ -57,7 +57,7 @@ index c0c206f..76473f9 100644
libvlc_video_get_title_description libvlc_video_get_title_description
libvlc_video_get_track libvlc_video_get_track
libvlc_video_get_track_count libvlc_video_get_track_count
@@ -249,6 +251,8 @@ libvlc_video_set_spu @@ -253,6 +255,8 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file libvlc_video_set_subtitle_file
libvlc_video_set_teletext libvlc_video_set_teletext
...@@ -67,10 +67,10 @@ index c0c206f..76473f9 100644 ...@@ -67,10 +67,10 @@ index c0c206f..76473f9 100644
libvlc_video_take_snapshot libvlc_video_take_snapshot
libvlc_vlm_add_broadcast libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c diff --git a/lib/media_player.c b/lib/media_player.c
index 2b340d4..99b8f98 100644 index 83af6cd..f701a49 100644
--- a/lib/media_player.c --- a/lib/media_player.c
+++ b/lib/media_player.c +++ b/lib/media_player.c
@@ -556,6 +556,12 @@ libvlc_media_player_new( libvlc_instance_t *instance ) @@ -560,6 +560,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
...@@ -277,5 +277,5 @@ index 3b8e6ca..d81b531 100644 ...@@ -277,5 +277,5 @@ index 3b8e6ca..d81b531 100644
+ return VLC_SUCCESS; + return VLC_SUCCESS;
+} +}
-- --
2.4.1 2.4.4
From 29e68bc2fc0137343c9aa38f32e9646ef40af9fb Mon Sep 17 00:00:00 2001 From b3373efef08c287679a8ca0e56b998b5606c62a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100 Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 7/9] contrib/gcrypt: simplify compilation by disabling /doc Subject: [PATCH 07/10] contrib/gcrypt: simplify compilation by disabling /doc
and work-around a libtool limitation and work-around a libtool limitation
--- ---
...@@ -106,5 +106,5 @@ index 0000000..df97ffb ...@@ -106,5 +106,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS) + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+ +
-- --
2.4.1 2.4.4
From 12c8b711f38360152ece560cc5a2352d6a820bda Mon Sep 17 00:00:00 2001 From 5175b5b287061ce06139418bfc99cf5b64440ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 9 Dec 2014 22:14:55 +0100 Date: Tue, 9 Dec 2014 22:14:55 +0100
Subject: [PATCH 8/9] lib/media player: inherit deinterlace variable to achieve Subject: [PATCH 08/10] lib/media player: inherit deinterlace variable to
correct value on first use achieve correct value on first use
--- ---
lib/media_player.c | 2 +- lib/media_player.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_player.c b/lib/media_player.c diff --git a/lib/media_player.c b/lib/media_player.c
index 99b8f98..45c74ea 100644 index f701a49..d9dde1a 100644
--- a/lib/media_player.c --- a/lib/media_player.c
+++ b/lib/media_player.c +++ b/lib/media_player.c
@@ -526,7 +526,7 @@ libvlc_media_player_new( libvlc_instance_t *instance ) @@ -530,7 +530,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING); var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING); var_Create (mp, "crop", VLC_VAR_STRING);
...@@ -22,5 +22,5 @@ index 99b8f98..45c74ea 100644 ...@@ -22,5 +22,5 @@ index 99b8f98..45c74ea 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER); var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
-- --
2.4.1 2.4.4
From 17db4568d2eee67c59c1fbed39bda55a09d97d0e Mon Sep 17 00:00:00 2001 From f2b955348c86405fddc697acec7bc531fcb92b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 18 Feb 2015 21:35:16 +0100 Date: Wed, 18 Feb 2015 21:35:16 +0100
Subject: [PATCH 9/9] arm_neon: work-around libtool issue Subject: [PATCH 09/10] arm_neon: work-around libtool issue
--- ---
modules/arm_neon/Makefile.am | 2 ++ modules/arm_neon/Makefile.am | 2 ++
...@@ -18,5 +18,5 @@ index 4e73a4f..43ef527 100644 ...@@ -18,5 +18,5 @@ index 4e73a4f..43ef527 100644
libsimple_channel_mixer_neon_plugin_la_SOURCES = \ libsimple_channel_mixer_neon_plugin_la_SOURCES = \
-- --
2.4.1 2.4.4
From 83ab5bb6966e1484b2b3e80cf8708388b4b5929e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 12 Jun 2015 14:09:05 +0200
Subject: [PATCH] Sparkle: fix iOS compilation
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0d1437b..49f4793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3811,7 +3811,7 @@ dnl MacOS X sparkle update support
dnl
AC_ARG_ENABLE(sparkle,
[ --enable-sparkle Sparkle update support for OS X (default enabled on Mac OS X)])
-if test "x${enable_sparkle}" != "xno" -a "${SYS}" = "darwin"
+if test "x${enable_sparkle}" != "xno" -a "${HAVE_OSX}" = "1"
then
if test ! -d ${CONTRIB_DIR}/Sparkle.framework
then
--
2.4.3
From 50a5d0ad39c707e2b4fcb5319fd85f30b37e9223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jun 2015 15:26:06 +0200
Subject: [PATCH 10/10] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
lib/media_internal.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/lib/media.c b/lib/media.c
index f5886ad..87a02d8 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -724,6 +724,12 @@ static int media_parse(libvlc_media_t *media, bool b_async,
vlc_mutex_lock(&media->parsed_lock);
needed = !media->has_asked_preparse;
media->has_asked_preparse = true;
+ if (!needed)
+ {
+ if (media->parse_flag != parse_flag)
+ needed = true;
+ }
+ media->parse_flag = parse_flag;
vlc_mutex_unlock(&media->parsed_lock);
if (needed)
diff --git a/lib/media_internal.h b/lib/media_internal.h
index 35f06a4..d28297e 100644
--- a/lib/media_internal.h
+++ b/lib/media_internal.h
@@ -47,6 +47,7 @@ struct libvlc_media_t
bool is_parsed;
bool has_asked_preparse;
+ libvlc_media_parse_flag_t parse_flag;
};
/* Media Descriptor */
--
2.4.4
...@@ -15,7 +15,7 @@ NONETWORK=no ...@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no SKIPLIBVLCCOMPILATION=no
SCARY=yes SCARY=yes
TESTEDHASH=e2067626 TESTEDHASH=bfd01076
usage() 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