diff options
Diffstat (limited to 'media-video/vlc/files')
-rw-r--r-- | media-video/vlc/files/vlc-3.0.3-fribidi-1.patch | 80 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch | 18 |
2 files changed, 89 insertions, 9 deletions
diff --git a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch new file mode 100644 index 000000000000..4431025a21e2 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch @@ -0,0 +1,80 @@ +From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001 +From: Shaleen Jain <shaleen@jain.sh> +Date: Sun, 25 Feb 2018 18:42:27 +0530 +Subject: [PATCH] fribidi: update for version 1.0 + +Update functions deprecated in version 1.0 when building with release 1.0 and +above. + +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c +index 13efd567b46..1a28786d097 100644 +--- a/modules/text_renderer/freetype/text_layout.c ++++ b/modules/text_renderer/freetype/text_layout.c +@@ -153,6 +153,9 @@ typedef struct paragraph_t + + #ifdef HAVE_FRIBIDI + FriBidiCharType *p_types; ++#if FRIBIDI_MAJOR_VERSION >= 1 ++ FriBidiBracketType *p_btypes; ++#endif + FriBidiLevel *p_levels; + FriBidiStrIndex *pi_reordered_indices; + FriBidiParType paragraph_type; +@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, + #ifdef HAVE_FRIBIDI + p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) ); + p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++ p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) ); ++#endif + p_paragraph->pi_reordered_indices = + vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) ); + +@@ -398,6 +404,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, + #ifdef HAVE_FRIBIDI + if( p_paragraph->p_levels ) free( p_paragraph->p_levels ); + if( p_paragraph->p_types ) free( p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++ if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes ); ++#endif + if( p_paragraph->pi_reordered_indices ) + free( p_paragraph->pi_reordered_indices ); + #endif +@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph ) + #ifdef HAVE_FRIBIDI + free( p_paragraph->pi_reordered_indices ); + free( p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++ free( p_paragraph->p_btypes ); ++#endif + free( p_paragraph->p_levels ); + #endif + +@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph ) + fribidi_get_bidi_types( p_paragraph->p_code_points, + p_paragraph->i_size, + p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++ fribidi_get_bracket_types( p_paragraph->p_code_points, ++ p_paragraph->i_size, ++ p_paragraph->p_types, ++ p_paragraph->p_btypes ); ++ fribidi_get_par_embedding_levels_ex( p_paragraph->p_types, ++ p_paragraph->p_btypes, ++ p_paragraph->i_size, ++ &p_paragraph->paragraph_type, ++ p_paragraph->p_levels ); ++#else + fribidi_get_par_embedding_levels( p_paragraph->p_types, + p_paragraph->i_size, + &p_paragraph->paragraph_type, + p_paragraph->p_levels ); ++#endif + + #ifdef HAVE_HARFBUZZ + hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default(); diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch index 893f936b729e..15ffc6af6fa4 100644 --- a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch +++ b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch @@ -1,16 +1,16 @@ ---- a/modules/services_discovery/upnp.hpp 2017-12-25 18:17:33.358015500 +0100 -+++ b/modules/services_discovery/upnp.hpp 2017-12-25 18:30:45.158167813 +0100 +--- a/modules/services_discovery/upnp-wrapper.hpp 2017-12-25 18:17:33.358015500 +0100 ++++ b/modules/services_discovery/upnp-wrapper.hpp 2017-12-25 18:30:45.158167813 +0100 @@ -35,8 +35,8 @@ - #include <windows.h> - #include <wincrypt.h> - #endif --#include <upnp/upnp.h> --#include <upnp/upnptools.h> + #include <algorithm> + #include <assert.h> + +-#include <upnp.h> +-#include <upnptools.h> +#include <upnp-1.8/upnp.h> +#include <upnp-1.8/upnptools.h> - #include <vlc_common.h> - #include <vlc_url.h> + #if UPNP_VERSION < 10800 + typedef void* UpnpEventPtr; --- a/configure.ac 2017-12-09 14:09:12.956370304 +0100 +++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100 |