Rebuild for new protobuf

4f899efc13a3a8f5259ce260655dfdd6f4830299.patch

@@ -0,0 +1,55 @@
+From 4f899efc13a3a8f5259ce260655dfdd6f4830299 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni@videolabs.io>
+Date: Fri, 28 Aug 2020 10:08:37 +0200
+Subject: [PATCH 1/1] qt: add missing include for QPainterPath
+
+The include is not transitively included anymore with Qt 5.15.
+
+Original contribution of menaquinone from ticket #24882.
+
+Fix #24882, #25059
+---
+ modules/gui/qt/components/playlist/views.cpp | 1 +
+ modules/gui/qt/util/timetooltip.cpp          | 1 -
+ modules/gui/qt/util/timetooltip.hpp          | 1 +
+ 3 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
+index ecc6b9918d..70dd29df72 100644
+--- a/modules/gui/qt/components/playlist/views.cpp
++++ b/modules/gui/qt/components/playlist/views.cpp
+@@ -27,6 +27,7 @@
+ #include "input_manager.hpp"                      /* THEMIM */
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+ #include <QStyleOptionViewItem>
+ #include <QFontMetrics>
+diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp
+index 7a63a9d7d9..8cfdab3206 100644
+--- a/modules/gui/qt/util/timetooltip.cpp
++++ b/modules/gui/qt/util/timetooltip.cpp
+@@ -23,7 +23,6 @@
+ 
+ #include <QApplication>
+ #include <QPainter>
+-#include <QPainterPath>
+ #include <QBitmap>
+ #include <QFontMetrics>
+ #include <QDesktopWidget>
+diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
+index b6d7c646c9..f213eac459 100644
+--- a/modules/gui/qt/util/timetooltip.hpp
++++ b/modules/gui/qt/util/timetooltip.hpp
+@@ -25,6 +25,7 @@
+ #include "qt.hpp"
+ 
+ #include <QWidget>
++#include <QPainterPath>
+ 
+ class TimeTooltip : public QWidget
+ {
+-- 
+2.20.1
+

85aa32db726559743d08d2fcafbb90fc923c43ff.patch

@@ -0,0 +1,27 @@
+From 85aa32db726559743d08d2fcafbb90fc923c43ff Mon Sep 17 00:00:00 2001
+From: Pierre Lamot <pierre@videolabs.io>
+Date: Wed, 27 May 2020 11:05:53 +0200
+Subject: [PATCH 1/1] qt: fix missing header when compiling with Qt 5.15
+
+Cherry-picked from commit 0e88143ed2fe8eedfa4d3afdafcd0df901644c1d.
+
+Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
+---
+ modules/gui/qt/dialogs/plugins.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
+index 93c92b9fa6..e05ec0594a 100644
+--- a/modules/gui/qt/dialogs/plugins.cpp
++++ b/modules/gui/qt/dialogs/plugins.cpp
+@@ -66,6 +66,7 @@
+ #include <QSplitter>
+ #include <QToolButton>
+ #include <QStackedWidget>
++#include <QPainterPath>
+ 
+ //match the image source (width/height)
+ #define SCORE_ICON_WIDTH_SCALE 4
+-- 
+2.20.1
+

vlc.spec

@@ -67,6 +67,11 @@ Patch5:	Lower-libgcrypt-to-1.5.3.patch
 Patch6:	Restore-support-for-thread-callbacks-for-older-gcryp.patch
 # Patch based on  https://code.videolan.org/videolan/vlc/commit/0e0b070c26d197e848f1548fca455bf97db471a3
 Patch7: replace_deprecated_luaL_checkint.patch
+# Fix build with qt5-5.15
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=85aa32db726559743d08d2fcafbb90fc923c43ff
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=4f899efc13a3a8f5259ce260655dfdd6f4830299
+Patch8: 85aa32db726559743d08d2fcafbb90fc923c43ff.patch
+Patch9: 4f899efc13a3a8f5259ce260655dfdd6f4830299.patch
 BuildRequires:	desktop-file-utils
 BuildRequires:	libappstream-glib
 BuildRequires:	fontpackages-devel
@@ -596,8 +601,8 @@ fi || :
 
 
 %changelog
-* Mon Sep 28 16:16:44 BST 2020 Leigh Scott <leigh123linux@gmail.com> - 1:3.0.11.1-5
+* Mon Sep 28 2020 Leigh Scott <leigh123linux@gmail.com> - 1:3.0.11.1-5
-- rebuilt
+- Rebuild for new protobuf
 
 * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:3.0.11.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild