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

mobile ports: update patches

parent 9a4724da
From 53365c2f3ac0941b9bf23a667b013f904f141a5d Mon Sep 17 00:00:00 2001
From ead43633414ea373aeb63f7f0c2c0c27c379f43d 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/20] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/18] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -11,7 +11,7 @@ Subject: [PATCH 01/20] arm_neon: added function macro to handle the underscore
diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
new file mode 100644
index 0000000..d853255
index 0000000000..d853255fec
--- /dev/null
+++ b/modules/arm_neon/asm.S
@@ -0,0 +1,49 @@
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.9.3
2.11.0
From 4cf215ca65d9167a32449a2fe35c98d5c87021bf Mon Sep 17 00:00:00 2001
From 5a8c0f0ec931c78e5794d681aed1dbefa87cbfbd 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/20] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/18] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 02/20] deinterlace/merge: use a macro to fix compilation for
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/modules/video_filter/deinterlace/merge_arm.S b/modules/video_filter/deinterlace/merge_arm.S
index dd77902..03e5042 100644
index dd779029ae..03e5042b28 100644
--- a/modules/video_filter/deinterlace/merge_arm.S
+++ b/modules/video_filter/deinterlace/merge_arm.S
@@ -18,6 +18,8 @@
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.9.3
2.11.0
From 360931e098edf051fdb714ae56381ca3662ea368 Mon Sep 17 00:00:00 2001
From c3da29d9eea7fb19d50a4d40f0a544681b874ab8 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/20] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/18] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 03/20] 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 ba7554c..74a4f85 100644
index ba7554c092..74a4f85931 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -644,7 +644,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -22,5 +22,5 @@ index ba7554c..74a4f85 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.9.3
2.11.0
From 8e9175d91ef79c36e7dfc4f4dfe87bb76feb70f6 Mon Sep 17 00:00:00 2001
From 5d5d9e312506476d339f6e4341487622c932ea53 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/20] arm_neon: work-around libtool issue
Subject: [PATCH 04/18] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index db81ec0..e67e07e 100644
index db81ec0b84..e67e07e61c 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,3 +1,5 @@
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.9.3
2.11.0
From 54e426acdccda0ac8b4286ff57c6ad9fa8985681 Mon Sep 17 00:00:00 2001
From 0b10852388890e9f7e2710d62ecee5e1f6dfb27c 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/20] arm_neon: fix iOS linking
Subject: [PATCH 05/18] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -9,7 +9,7 @@ Subject: [PATCH 05/20] arm_neon: fix iOS linking
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
index 5938118..42f0d00 100644
index 5938118378..42f0d004d8 100644
--- a/modules/arm_neon/amplify.S
+++ b/modules/arm_neon/amplify.S
@@ -18,6 +18,8 @@
......@@ -38,7 +38,7 @@ index 5938118..42f0d00 100644
bx lr
+endfunc
diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
index a94ae85..54b43a7 100644
index a94ae8539f..54b43a79e3 100644
--- a/modules/arm_neon/simple_channel_mixer.S
+++ b/modules/arm_neon/simple_channel_mixer.S
@@ -19,6 +19,8 @@
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.9.3
2.11.0
From 12e8f25559d0230035fe738a0d1e47d3714b344a Mon Sep 17 00:00:00 2001
From db520c218ae86a9e18e52530852ded1b3c17d458 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/20] disable neon volume plugin
Subject: [PATCH 06/18] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index e67e07e..6909752 100644
index e67e07e61c..690975235f 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -27,6 +27,5 @@ libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.9.3
2.11.0
From 84f01e73780cbd9ef42370c4b4ab089397e1a640 Mon Sep 17 00:00:00 2001
From cdc023edd53a04f5192682fa7763f8b7a8372b05 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 08/20] libvlc: create VT-zero-copy variable
Subject: [PATCH 07/18] 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 3f95c27..930190c 100644
index 74a4f85931..717a3c479a 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -626,6 +626,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -20,5 +20,5 @@ index 3f95c27..930190c 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.9.3
2.11.0
From 2cff9f0db83a1f0fbde9e4ac73cc05e5b700944b 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 07/20] libvlc: expose a base set of freetype options to
overwrite the default font
---
include/vlc/libvlc_media_player.h | 26 ++++++++++++
lib/libvlc.sym | 6 +++
lib/media_player.c | 6 +++
lib/video.c | 68 ++++++++++++++++++++++++++++++-
modules/text_renderer/freetype/freetype.c | 59 +++++++++++++++++++++++++--
modules/text_renderer/freetype/freetype.h | 2 +
6 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index b6e697e..8cfb8a2 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1569,6 +1569,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 );
+enum libvlc_video_textrenderer_option_t {
+ libvlc_textrender_font = 0,
+ libvlc_textrender_fontsize,
+ libvlc_textrender_fontcolor,
+ libvlc_textrender_fontforcebold,
+};
+
+LIBVLC_API bool libvlc_video_get_textrenderer_bool( libvlc_media_player_t *p_mi,
+ unsigned option );
+
+LIBVLC_API void libvlc_video_set_textrenderer_bool( libvlc_media_player_t *p_mi,
+ unsigned option, bool value );
+
+LIBVLC_API int libvlc_video_get_textrenderer_int( libvlc_media_player_t *p_mi,
+ unsigned option );
+
+LIBVLC_API void libvlc_video_set_textrenderer_int( libvlc_media_player_t *p_mi,
+ unsigned option, int value );
+
+LIBVLC_API char *libvlc_video_get_textrenderer_string( libvlc_media_player_t *p_mi,
+ unsigned option );
+
+LIBVLC_API void libvlc_video_set_textrenderer_string( libvlc_media_player_t *p_mi,
+ unsigned option,
+ const char *psz_text );
+
/** @} video */
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index caa5598..5262ebc 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -257,6 +257,9 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
+libvlc_video_get_textrenderer_bool
+libvlc_video_get_textrenderer_int
+libvlc_video_get_textrenderer_string
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -281,6 +284,9 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
+libvlc_video_set_textrenderer_bool
+libvlc_video_set_textrenderer_int
+libvlc_video_set_textrenderer_string
libvlc_video_set_track
libvlc_video_take_snapshot
libvlc_video_new_viewpoint
diff --git a/lib/media_player.c b/lib/media_player.c
index 74a4f85..3f95c27 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -674,6 +674,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);
+ /* SPU */
+ var_Create (mp, "freetype-font", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ var_Create (mp, "freetype-rel-fontsize", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "freetype-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "freetype-bold", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
+
/* Audio */
var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create (mp, "audio-device", VLC_VAR_STRING);
diff --git a/lib/video.c b/lib/video.c
index 46f9935..b7638b3 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -676,7 +676,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
}
typedef const struct {
- const char name[20];
+ const char name[25];
unsigned type;
} opt_t;
@@ -705,6 +705,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
case VLC_VAR_FLOAT:
var_SetFloat( p_mi, opt->name, value );
break;
+ case VLC_VAR_BOOL:
+ var_SetBool( p_mi, opt->name, value );
+ break;
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
return;
@@ -728,6 +731,8 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
return var_GetInteger(p_mi, opt->name);
case VLC_VAR_FLOAT:
return lroundf(var_GetFloat(p_mi, opt->name));
+ case VLC_VAR_BOOL:
+ return var_GetBool(p_mi, opt->name);
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
return 0;
@@ -951,3 +956,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
{
return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
}
+
+static const opt_t *
+textrenderer_option_bynumber( unsigned option )
+{
+ static const opt_t optlist[] =
+ {
+ { "freetype-font", VLC_VAR_STRING },
+ { "freetype-rel-fontsize", VLC_VAR_INTEGER },
+ { "freetype-color", VLC_VAR_INTEGER },
+ { "freetype-bold", VLC_VAR_BOOL },
+ };
+ enum { num_opts = sizeof(optlist) / sizeof(*optlist) };
+
+ const opt_t *r = option < num_opts ? optlist+option : NULL;
+ if( !r )
+ libvlc_printerr( "Unknown freetype option" );
+ return r;
+}
+
+/* basic text renderer support */
+
+void libvlc_video_set_textrenderer_bool( libvlc_media_player_t *p_mi,
+ unsigned option, bool value )
+{
+ set_int( p_mi, "freetype", textrenderer_option_bynumber(option), value );
+}
+
+
+bool libvlc_video_get_textrenderer_bool( libvlc_media_player_t *p_mi,
+ unsigned option )
+{
+ return get_int( p_mi, "freetype", textrenderer_option_bynumber(option) );
+}
+
+
+void libvlc_video_set_textrenderer_int( libvlc_media_player_t *p_mi,
+ unsigned option, int value )
+{
+ set_int( p_mi, "freetype", textrenderer_option_bynumber(option), value );
+}
+
+
+int libvlc_video_get_textrenderer_int( libvlc_media_player_t *p_mi,
+ unsigned option )
+{
+ return get_int( p_mi, "freetype", textrenderer_option_bynumber(option) );
+}
+
+
+void libvlc_video_set_textrenderer_string( libvlc_media_player_t *p_mi,
+ unsigned option, const char *psz_value )
+{
+ set_string( p_mi, "freetype", textrenderer_option_bynumber(option), psz_value );
+}
+
+
+char * libvlc_video_get_textrenderer_string( libvlc_media_player_t *p_mi,
+ unsigned option )
+{
+ 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 6baf45f..25c9650 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -78,6 +78,9 @@
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
+static int DefaultFontStyleCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data );
#define FONT_TEXT N_("Font")
#define MONOSPACE_FONT_TEXT N_("Monospace Font")
@@ -930,7 +933,7 @@ static void FillDefaultStyles( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
- p_sys->p_default_style->psz_fontname = var_InheritString( p_filter, "freetype-font" );
+ p_sys->p_default_style->psz_fontname = var_CreateGetString( p_filter, "freetype-font" );
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" );
@@ -938,6 +941,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" );
@@ -953,11 +958,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" );
- p_sys->p_forced_style->f_font_relsize = var_InheritInteger( p_filter, "freetype-rel-fontsize" );
+ p_sys->p_forced_style->f_font_relsize = var_CreateGetIntegerCommand( p_filter, "freetype-rel-fontsize" );
if( p_sys->p_forced_style->f_font_relsize )
p_sys->p_forced_style->f_font_relsize = 1.0 / p_sys->p_forced_style->f_font_relsize;
- if( var_InheritBool( p_filter, "freetype-bold" ) )
+ if( var_CreateGetBoolCommand( p_filter, "freetype-bold" ) )
{
p_sys->p_forced_style->i_style_flags |= STYLE_BOLD;
p_sys->p_forced_style->i_features |= STYLE_HAS_FLAGS;
@@ -965,6 +970,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 );
+
+ vlc_mutex_init( &p_sys->lock );
+ var_AddCallback( p_filter, "freetype-font", DefaultFontStyleCallback, p_sys );
+ var_AddCallback( p_filter, "freetype-rel-fontsize", DefaultFontStyleCallback, p_sys );
+ var_AddCallback( p_filter, "freetype-color", DefaultFontStyleCallback, p_sys );
+ var_AddCallback( p_filter, "freetype-bold", DefaultFontStyleCallback, p_sys );
}
static void FreeStylesArray( text_style_t **pp_styles, size_t i_styles )
@@ -1327,6 +1338,17 @@ static void Destroy( vlc_object_t *p_this )
DumpDictionary( p_filter, &p_sys->fallback_map, true, -1 );
#endif
+ var_DelCallback( p_filter, "freetype-font", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-rel-fontsize", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-color", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-bold", DefaultFontStyleCallback, p_sys );
+ vlc_mutex_destroy( &p_sys->lock );
+
+ var_Destroy( p_filter, "freetype-font" ) ;
+ var_Destroy( p_filter, "freetype-rel-fontsize" );
+ var_Destroy( p_filter, "freetype-color" );
+ var_Destroy( p_filter, "freetype-bold" );
+
/* Attachments */
if( p_sys->pp_font_attachments )
{
@@ -1356,3 +1378,34 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys );
}
+static int DefaultFontStyleCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ VLC_UNUSED(oldval);
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+
+ vlc_mutex_lock( &p_sys->lock );
+ if( !strcmp( psz_var, "freetype-font" ) ) {
+ FREENULL( p_sys->p_default_style->psz_fontname );
+ p_sys->p_default_style->psz_fontname = strdup( newval.psz_string );
+ } else if( !strcmp( psz_var, "freetype-rel-fontsize" ) ) {
+ p_sys->p_forced_style->f_font_relsize = 1.0 / newval.i_int;
+ } else if( !strcmp( psz_var, "freetype-color" ) )
+ p_sys->p_default_style->i_font_color = VLC_CLIP(newval.i_int, 0, 0xFFFFFF);
+ else if ( !strcmp( psz_var, "freetype-bold" ) )
+ {
+ if (newval.b_bool) {
+ p_sys->p_forced_style->i_style_flags |= STYLE_BOLD;
+ p_sys->p_forced_style->i_features |= STYLE_HAS_FLAGS;
+ } else {
+ p_sys->p_forced_style->i_style_flags &= ~STYLE_BOLD;
+ p_sys->p_forced_style->i_features &= ~STYLE_HAS_FLAGS;
+ }
+ }
+ text_style_Merge( p_sys->p_default_style, p_sys->p_forced_style, true );
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
+}
diff --git a/modules/text_renderer/freetype/freetype.h b/modules/text_renderer/freetype/freetype.h
index 44b2731..7f1abec 100644
--- a/modules/text_renderer/freetype/freetype.h
+++ b/modules/text_renderer/freetype/freetype.h
@@ -137,6 +137,8 @@ struct filter_sys_t
*/
vlc_family_t * (*pf_get_fallbacks) ( filter_t *p_filter, const char *psz_family,
uni_char_t codepoint );
+
+ vlc_mutex_t lock;
};
/**
--
2.9.3
From c0a6f13a5d0f8f789f0e422747f3132e669fb419 Mon Sep 17 00:00:00 2001
From 9d07fe39d10252146c5960310b9c37b405106fc6 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 09/20] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 08/18] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 09/20] 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 291f0fc..1484e7a 100644
index 291f0fc1b5..1484e7ab82 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
......@@ -23,7 +23,7 @@ index 291f0fc..1484e7a 100644
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
index 0000000000..df97ffb488
--- /dev/null
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -0,0 +1,25 @@
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.9.3
2.11.0
From d8657cec34dc2b98203c6336b435fa911af35821 Mon Sep 17 00:00:00 2001
From 41cf168528b175dd1d36d44d99e322438ee9d0af 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/20] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 09/18] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -11,7 +11,7 @@ Subject: [PATCH 10/20] contrib/gcrypt: fix tvOS compilation
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
new file mode 100644
index 0000000..f1d3ccc
index 0000000000..f1d3ccc71f
--- /dev/null
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -0,0 +1,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 1484e7a..200a98e 100644
index 1484e7ab82..200a98e828 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......@@ -56,5 +56,5 @@ index 1484e7a..200a98e 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.9.3
2.11.0
From 43ef715ca8baacd21e7ffdf94bd3b9835068d4f4 Mon Sep 17 00:00:00 2001
From 2bbe420d27d5821f3542c0a5a240d79b1a5a40fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 11/20] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 10/18] 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 367bc49..e23727e 100644
index 367bc49868..e23727e2c9 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -25,5 +25,5 @@ index 367bc49..e23727e 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
else
--
2.9.3
2.11.0