From 85c027c28dce8631cc8047b0cc3c6bf8653858c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 9 Jun 2020 16:33:44 +0200
Subject: [PATCH] mlt: Fix build with Qt >= 5.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ....h-Do-not-include-unneeded-xlocale.h.patch | 31 -----------
 recipes-support/mlt/mlt.bb                    |  5 +-
 .../mlt/0001-Fix-build-with-Qt-5.15.0.patch   | 54 +++++++++++++++++++
 3 files changed, 58 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch
 create mode 100644 recipes-support/mlt/mlt/0001-Fix-build-with-Qt-5.15.0.patch

diff --git a/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch b/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch
deleted file mode 100644
index b7e437b4..00000000
--- a/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6f8a87cdb95c611a7f0193aaa623c8e936ac0b6e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 7 Aug 2017 18:41:07 +0200
-Subject: [PATCH] mlt_property.h: Replace include xlocale.h by locale.h
-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@googlemail.com>
----
- src/framework/mlt_property.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 404d513..8e772f2 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -31,7 +31,7 @@
- #endif
- 
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--#include <xlocale.h>
-+#include <locale.h>
- #else
- typedef char* locale_t;
- #endif
--- 
-2.9.4
-
diff --git a/recipes-support/mlt/mlt.bb b/recipes-support/mlt/mlt.bb
index 533cbcdb..8855e45f 100644
--- a/recipes-support/mlt/mlt.bb
+++ b/recipes-support/mlt/mlt.bb
@@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = " \
     file://GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
-SRC_URI = "git://github.com/mltframework/mlt.git"
+SRC_URI = " \
+    git://github.com/mltframework/mlt.git \
+    file://0001-Fix-build-with-Qt-5.15.0.patch \
+"
 SRCREV = "af9b08853e4ce88733ec7e358ba6ae7af5c26fad"
 PV = "6.20.0"
 S = "${WORKDIR}/git"
diff --git a/recipes-support/mlt/mlt/0001-Fix-build-with-Qt-5.15.0.patch b/recipes-support/mlt/mlt/0001-Fix-build-with-Qt-5.15.0.patch
new file mode 100644
index 00000000..29c7b115
--- /dev/null
+++ b/recipes-support/mlt/mlt/0001-Fix-build-with-Qt-5.15.0.patch
@@ -0,0 +1,54 @@
+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
+