mlt: upgrade 6.20.0 -> 6.22.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-10-16 19:52:34 +02:00
parent 18eedaa7c1
commit f89912f305
2 changed files with 3 additions and 60 deletions

View File

@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = " \
file://GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
"
SRC_URI = " \
git://github.com/mltframework/mlt.git \
file://0001-Fix-build-with-Qt-5.15.0.patch \
"
SRCREV = "af9b08853e4ce88733ec7e358ba6ae7af5c26fad"
PV = "6.20.0"
SRC_URI = "git://github.com/mltframework/mlt.git;branch=v6.22"
SRCREV = "f6e57f2659b1a5a136fa1c9df1b3359bd0b91647"
PV = "6.22.1"
S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig

View File

@@ -1,54 +0,0 @@
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).
Upstream-Status: Applied
---
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 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>
--
2.26.2