mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,56 @@
|
|||||||
|
From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
Date: Mon, 8 Jun 2020 00:50:08 +0200
|
||||||
|
Subject: [PATCH] Fix build with Qt >= 5.15
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
modules/gui/qt/components/playlist/views.cpp | 1 +
|
||||||
|
modules/gui/qt/dialogs/plugins.cpp | 1 +
|
||||||
|
modules/gui/qt/util/timetooltip.hpp | 1 +
|
||||||
|
3 files changed, 3 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
|
||||||
|
index 24db9d9..71d8514 100644
|
||||||
|
--- a/modules/gui/qt/components/playlist/views.cpp
|
||||||
|
+++ b/modules/gui/qt/components/playlist/views.cpp
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include <QMetaType>
|
||||||
|
#include <QHeaderView>
|
||||||
|
#include <QSvgRenderer>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
|
||||||
|
index d233382..9ae9a63 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
|
||||||
|
diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
|
||||||
|
index 6a1329e..9f50b18 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.26.2
|
||||||
|
|
||||||
@@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic"
|
|||||||
LICENSE_FLAGS = "commercial"
|
LICENSE_FLAGS = "commercial"
|
||||||
|
|
||||||
SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
|
SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
|
||||||
file://0006-make-opencv-configurable.patch \
|
file://0001-make-opencv-configurable.patch \
|
||||||
file://0007-use-vorbisidec.patch \
|
file://0002-use-vorbisidec.patch \
|
||||||
file://0008-fix-luaL-checkint.patch \
|
file://0003-fix-luaL-checkint.patch \
|
||||||
file://0001-Use-packageconfig-to-detect-mmal-support.patch \
|
file://0004-Use-packageconfig-to-detect-mmal-support.patch \
|
||||||
|
file://0005-Fix-build-with-Qt-5.15.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
|
SRC_URI[sha256sum] = "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user