diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /media-video/vlc/files | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'media-video/vlc/files')
-rw-r--r-- | media-video/vlc/files/vlc-3.0.1-qt-5.11.patch | 10 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch | 42 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-3.0.3-fribidi-1.patch | 80 |
3 files changed, 0 insertions, 132 deletions
diff --git a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch deleted file mode 100644 index c99d89882478..000000000000 --- a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 17:57:40.000000000 +0100 -+++ b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 21:08:51.212556781 +0100 -@@ -33,6 +33,7 @@ - #include <vlc_config_cat.h> - #include <vlc_configuration.h> - -+#include <QButtonGroup> - #include <QString> - #include <QFont> - #include <QToolButton> diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch deleted file mode 100644 index fe4eecb8e767..000000000000 --- a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> -Date: Mon, 28 May 2018 18:25:15 +0200 -Subject: [PATCH] qt: Fix build with --disable-vlm -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fix #20495 - -(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/gui/qt/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am -index cb77b14d96..c67f4afc13 100644 ---- a/modules/gui/qt/Makefile.am -+++ b/modules/gui/qt/Makefile.am -@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \ - gui/qt/dialogs/open.moc.cpp \ - gui/qt/dialogs/openurl.moc.cpp \ - gui/qt/dialogs/podcast_configuration.moc.cpp \ -- gui/qt/dialogs/vlm.moc.cpp \ - gui/qt/dialogs/firstrun.moc.cpp \ - gui/qt/dialogs/extensions.moc.cpp \ - gui/qt/dialogs/fingerprintdialog.moc.cpp \ -@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES) - - nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp - -+if ENABLE_VLM -+nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp -+endif -+ - gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES) - $(AM_V_GEN)$(RCC) -name vlc -o $@ $< - --- -2.11.0 - 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 deleted file mode 100644 index 4431025a21e2..000000000000 --- a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch +++ /dev/null @@ -1,80 +0,0 @@ -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(); |