diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-21 10:31:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-21 11:22:15 +0200 |
| commit | d82d4fd33555c69783dee4a83cfc4df184e97782 (patch) | |
| tree | e9d837b4ed8e8022fb104f086b7d1ae940401e65 /media-libs | |
| parent | app-editors/focuswriter: add version 1.7.5 (diff) | |
| download | gentoo-d82d4fd33555c69783dee4a83cfc4df184e97782.tar.gz gentoo-d82d4fd33555c69783dee4a83cfc4df184e97782.tar.bz2 gentoo-d82d4fd33555c69783dee4a83cfc4df184e97782.zip | |
media-libs/mlt: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch | 49 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-6.20.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-6.20.0.ebuild | 5 |
3 files changed, 57 insertions, 2 deletions
diff --git a/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch b/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch new file mode 100644 index 000000000000..edc183725d61 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch @@ -0,0 +1,49 @@ +From f58b44d73442986eeffec7431e59b7d19d214c1b Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Tue, 24 Mar 2020 21:17:05 +0100 +Subject: [PATCH] Fix build with Qt 5.15.0 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). +--- + src/modules/qt/filter_qtext.cpp | 1 + + src/modules/qt/graph.cpp | 1 + + src/modules/qt/producer_qtext.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp +index c3de1fadc..c3e10f1a3 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 6d4d669ca..7e91bb12f 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 603c2b780..ff95a8e26 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> diff --git a/media-libs/mlt/mlt-6.20.0-r1.ebuild b/media-libs/mlt/mlt-6.20.0-r1.ebuild index faf5025e814d..8e0a0a9de4d4 100644 --- a/media-libs/mlt/mlt-6.20.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.20.0-r1.ebuild @@ -89,7 +89,10 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) -PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch + "${FILESDIR}"/${P}-qt-5.15.patch +) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/media-libs/mlt/mlt-6.20.0.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild index bb5c456337a5..98a221ed040f 100644 --- a/media-libs/mlt/mlt-6.20.0.ebuild +++ b/media-libs/mlt/mlt-6.20.0.ebuild @@ -89,7 +89,10 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) -PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch + "${FILESDIR}"/${P}-qt-5.15.patch +) pkg_setup() { use python && python-single-r1_pkg_setup |