Commit a701dba0 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

MVK: update libvlc

parent 17cea340
From b115047f43924953508e6b8ccc75018cf35f59d1 Mon Sep 17 00:00:00 2001
From db2a46c562d31156c289ea8b5bbb58158dccd75d 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/17] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/15] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 9205e3696a148f2efc973fbbdf3a93fe8d98c100 Mon Sep 17 00:00:00 2001
From e97fe6b2ce384203fe1249b6eaafb18651a53fb4 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/17] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 8d7762b175e6b8fba5fdfa2cbaea9b4e25d57f33 Mon Sep 17 00:00:00 2001
From 0ffba5efff4fef769b7485f398fefd9a15e07686 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/17] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/15] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......
From 9c2fed58f7b66616ebe1cfd3ccea4763c88f6a40 Mon Sep 17 00:00:00 2001
From a6734ef0c86841f477e383f7ca488e48966390af 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/17] arm_neon: work-around libtool issue
Subject: [PATCH 04/15] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From e43228090efbf90f9ac10839fbabeb5bc4d39a62 Mon Sep 17 00:00:00 2001
From 734e0b98e72750625515a8eeddf16104f37c76cd 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/17] arm_neon: fix iOS linking
Subject: [PATCH 05/15] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 704989dd38efbcf4938e8fd1fcc29785f874b1e2 Mon Sep 17 00:00:00 2001
From f8839ba46636c0be50730e17d6ae7cf2379fcfa7 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/17] disable neon volume plugin
Subject: [PATCH 06/15] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 6a20f23f2780d5c04edbba7fa388abdb8805c095 Mon Sep 17 00:00:00 2001
From 70c94b4a91320134115736fd06c0bd52e250eac3 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 07/17] 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 +-
......
From e89650262ad199701c9b71ff7b3f2d5490e21377 Mon Sep 17 00:00:00 2001
From 48880393d3d1a306fa4eb71b45dd4753231e52f6 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 08/17] libvlc: hack to disable daemon mode
Subject: [PATCH 08/15] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......
From 4cfa54bc26797762c7a02ea5e7aba4c9a7a5283a Mon Sep 17 00:00:00 2001
From afb0a5378ab0097b54062789f63771a283bf0c82 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 09/17] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 09/15] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......
From 93d87326edb419cdc342632ed139adcc960259f7 Mon Sep 17 00:00:00 2001
From 1074cace5e1951650e2f61b0753c9fdcbaeac34a 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 10/17] 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
---
......@@ -189,7 +189,7 @@ index b2c9b34..6af4e1c 100644
+ return get_string( p_mi, "freetype", textrenderer_option_bynumber(option) );
+}
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 135b411..24b51d5 100644
index c75770a..66a4b62 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -77,6 +77,9 @@
......@@ -202,7 +202,7 @@ index 135b411..24b51d5 100644
#define FONT_TEXT N_("Font")
#define MONOSPACE_FONT_TEXT N_("Monospace Font")
@@ -929,12 +932,14 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -929,7 +932,7 @@ static void FillDefaultStyles( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
......@@ -211,14 +211,16 @@ index 135b411..24b51d5 100644
p_sys->p_default_style->psz_monofontname = var_InheritString( p_filter, "freetype-monofont" );
p_sys->p_default_style->i_font_alpha = var_InheritInteger( p_filter,"freetype-opacity" );
p_sys->p_default_style->i_font_alpha = VLC_CLIP( p_sys->p_default_style->i_font_alpha, 0, 255 );
@@ -937,6 +940,8 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_font_color = var_InheritInteger( p_filter,"freetype-color" );
p_sys->p_default_style->i_font_color = VLC_CLIP( p_sys->p_default_style->i_font_color, 0, 0xFFFFFF );
+ p_sys->p_default_style->i_font_color = VLC_CLIP(var_CreateGetIntegerCommand( p_filter, "freetype-color") , 0, 0xFFFFFF);
+
p_sys->p_default_style->i_outline_alpha = var_InheritInteger( p_filter, "freetype-outline-opacity" );
p_sys->p_default_style->i_outline_alpha = VLC_CLIP( p_sys->p_default_style->i_outline_alpha, 0, 255 );
p_sys->p_default_style->i_outline_color = var_InheritInteger( p_filter, "freetype-outline-color" );
@@ -950,11 +955,11 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -952,11 +957,11 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_features |= STYLE_HAS_FLAGS;
p_sys->p_forced_style->i_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
......@@ -232,7 +234,7 @@ index 135b411..24b51d5 100644
{
p_sys->p_forced_style->i_style_flags |= STYLE_BOLD;
p_sys->p_forced_style->i_features |= STYLE_HAS_FLAGS;
@@ -962,6 +967,12 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -964,6 +969,12 @@ static void FillDefaultStyles( filter_t *p_filter )
/* Apply forced styles to defaults, if any */
text_style_Merge( p_sys->p_default_style, p_sys->p_forced_style, true );
......@@ -245,7 +247,7 @@ index 135b411..24b51d5 100644
}
static void FreeStylesArray( text_style_t **pp_styles, size_t i_styles )
@@ -1324,6 +1335,17 @@ static void Destroy( vlc_object_t *p_this )
@@ -1326,6 +1337,17 @@ static void Destroy( vlc_object_t *p_this )
DumpDictionary( p_filter, &p_sys->fallback_map, true, -1 );
#endif
......@@ -263,7 +265,7 @@ index 135b411..24b51d5 100644
/* Attachments */
if( p_sys->pp_font_attachments )
{
@@ -1353,3 +1375,34 @@ static void Destroy( vlc_object_t *p_this )
@@ -1355,3 +1377,34 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys );
}
......
From bdfe645381ce49e16113d32023ab0890e7e16c0c Mon Sep 17 00:00:00 2001
From da6125df0221b4c5b6fe69ddbc7ebdc04372b8be Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 11/17] 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
......
From 434c42cdcb0c57f11ffccec87b971f3f158f1e6d Mon Sep 17 00:00:00 2001
From 24627e3110d29253f7fcacb6520091014218e65a 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 12/17] libvlc: create VT-zero-copy variable
Subject: [PATCH 12/15] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......
From c3ac6d30b294f3bd67b63316d80892d142cd52f0 Mon Sep 17 00:00:00 2001
From ad632dc2465db62daffdfcd10471703842e0ad46 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 14/17] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 13/15] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......
From c7099637b60430a0c1b8db08ae453b3914924862 Mon Sep 17 00:00:00 2001
From e575f15e911c3c4d8a266b34610b9e9baa73ae55 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 15/17] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 14/15] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......
From 9ac2f48185532fa38d941479814735600334ff1a Mon Sep 17 00:00:00 2001
From a6631bce58a861446355b9e411845d072ea0e5ef 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 13/17] contrib/avcodec: enforce use of FFmpeg
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 15/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 a266389..b103de7 100644
index 6604a76..607b781 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -19,9 +19,9 @@ index a266389..b103de7 100644
+USE_FFMPEG ?= 1
ifdef USE_FFMPEG
-HASH=HEAD
+HASH=68b8505d
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
-FFMPEG_HASH=HEAD
+FFMPEG_HASH=9157ac2f
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else
--
......
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=62dfbc38
TESTEDHASH=75bde798
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