diff options
| author | Treeve Jelbert | 2020-06-07 14:36:30 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2020-06-07 14:36:30 +0200 |
| commit | 50535f31fd0d2a6e3850328e394282b267813785 (patch) | |
| tree | 143b07a103ad38cfd2043924fc7db47265d055f3 /video | |
| parent | 58868ba14ce9f820b216ee187278a71287460778 (diff) | |
vlc - fix build with qt-5.15
Diffstat (limited to 'video')
| -rw-r--r-- | video/vlc/HISTORY | 3 | ||||
| -rwxr-xr-x | video/vlc/PRE_BUILD | 2 | ||||
| -rw-r--r-- | video/vlc/patches/0001-fix-QPainterPath-usage.patch | 50 |
3 files changed, 55 insertions, 0 deletions
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY index da6259fc00..1e49084095 100644 --- a/video/vlc/HISTORY +++ b/video/vlc/HISTORY @@ -1,3 +1,6 @@ +2020-06-07 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD patches: fix for qt-5.15 + 2020-05-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.0.9.2 diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD index ef92f0cb4f..2c3367aa22 100755 --- a/video/vlc/PRE_BUILD +++ b/video/vlc/PRE_BUILD @@ -1,5 +1,7 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +# fix for qt5-15 +apply_patch_dir patches && # remove refs to non-existent vpx formats, remove in vpc-1.8 sed -i \ -e '/VPX_IMG_FMT_RGB555/D;/VPX_IMG_FMT_RGB565/D' \ diff --git a/video/vlc/patches/0001-fix-QPainterPath-usage.patch b/video/vlc/patches/0001-fix-QPainterPath-usage.patch new file mode 100644 index 0000000000..b4eeba0946 --- /dev/null +++ b/video/vlc/patches/0001-fix-QPainterPath-usage.patch @@ -0,0 +1,50 @@ +From 9c3efc3026cf6f7998eda04e189bc105c3ee7f0c Mon Sep 17 00:00:00 2001 +From: Treeve Jelbert <treeve@sourcemage.org> +Date: Sun, 7 Jun 2020 13:59:08 +0200 +Subject: [PATCH] fix QPainterPath usage + +--- + 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 insertions(+) + +diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp +index 24db9d9..73c1779 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/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp +index d233382..69728eb 100644 +--- a/modules/gui/qt/dialogs/plugins.cpp ++++ b/modules/gui/qt/dialogs/plugins.cpp +@@ -53,6 +53,7 @@ + #include <QListView> + #include <QListWidget> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleOptionViewItem> + #include <QKeyEvent> + #include <QPushButton> +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 + |