diff options
| author | Treeve Jelbert | 2020-06-18 10:35:49 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2020-06-18 10:35:49 +0200 |
| commit | 89a8569f659cf1f4bb2dcacafd0c868bac854d1d (patch) | |
| tree | 675e9d19c9db36ec277208b7f90c145bd2ca2131 /video | |
| parent | 33fa085921a872e1d7d69bc7f78d77f07fe14f63 (diff) | |
mlt - fix build with qt-5.15
Diffstat (limited to 'video')
| -rw-r--r-- | video/mlt/HISTORY | 3 | ||||
| -rwxr-xr-x | video/mlt/PRE_BUILD | 3 | ||||
| -rw-r--r-- | video/mlt/patches/qt-5.15.patch | 45 |
3 files changed, 51 insertions, 0 deletions
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY index 748bb37c2f..80b37b55c9 100644 --- a/video/mlt/HISTORY +++ b/video/mlt/HISTORY @@ -1,3 +1,6 @@ +2020-06-18 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD qt-5.15.patch: added + 2020-03-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 6.20.0 * BUILD: remove obsolete logic diff --git a/video/mlt/PRE_BUILD b/video/mlt/PRE_BUILD new file mode 100755 index 0000000000..922c0ab256 --- /dev/null +++ b/video/mlt/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +apply_patch_dir patches diff --git a/video/mlt/patches/qt-5.15.patch b/video/mlt/patches/qt-5.15.patch new file mode 100644 index 0000000000..e4e226a3e0 --- /dev/null +++ b/video/mlt/patches/qt-5.15.patch @@ -0,0 +1,45 @@ +commit f58b44d73442986eeffec7431e59b7d19d214c1b +Author: Heiko Becker <heirecka@exherbo.org> +Date: Tue Mar 24 21:17:05 2020 +0100 + + Fix build with Qt 5.15.0 + + QPainterPath is no longer included via qtransform.h (since + 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). + +diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp +index c3de1fad..c3e10f1a 100644 +--- a/src/modules/qt/filter_qtext.cpp ++++ b/src/modules/qt/filter_qtext.cpp +@@ -21,6 +21,7 @@ + #include <framework/mlt.h> + #include <framework/mlt_log.h> + #include <QPainter> ++#include <QPainterPath> + #include <QString> + + static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale ) +diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp +index 6d4d669c..7e91bb12 100644 +--- a/src/modules/qt/graph.cpp ++++ b/src/modules/qt/graph.cpp +@@ -18,6 +18,7 @@ + */ + + #include "graph.h" ++#include <QPainterPath> + #include <QVector> + #include <math.h> + +diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp +index 603c2b78..ff95a8e2 100644 +--- a/src/modules/qt/producer_qtext.cpp ++++ b/src/modules/qt/producer_qtext.cpp +@@ -26,6 +26,7 @@ + #include <QImage> + #include <QColor> + #include <QPainter> ++#include <QPainterPath> + #include <QFont> + #include <QString> + #include <QTextCodec> |