gentoo resync : 25.04.2020

4 files changed, 60 insertions, 4 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index eb05b4ab5290..35ace84e228a 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,5 +1,6 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
+AUX mlt-6.20.0-qt-5.15.patch 1571 BLAKE2B a4d5c1a009399ac0ee4d85fdc8f9f603e69ded9d77320083511a46e1c1a2c7adfa1940a97ecfb6d2ad70dfa624b844260cb0f0249fca861ab25aed8b265e9333 SHA512 2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295
 DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
-EBUILD mlt-6.20.0-r1.ebuild 5376 BLAKE2B 47553f7c3a4dfed6be9498c0170193c0e1562cc817f7bbf80f0ce47b60c00a6441f28b083850e2e14b38e71550bd82c6cd908ab4439e249e1ae5c30e5670b43e SHA512 5bea27b4d4bedd5b41ab0548befbd6104e9da2257a0bed78e4b40000cf7676c960019719d9d1971298422b6b5bd302bae26fd8f16cb300ad76b75b8b86a4d790
-EBUILD mlt-6.20.0.ebuild 5373 BLAKE2B 963f71f2da2faecb5ab98777bcecd980512260c5400bb7f90b988c2ad7a5386ccf0f8f625b51ac76a8b552bcc937fb3efc2f5e26565f1377899342acace32078 SHA512 9458e019f94d9ed985a3a250df6546a5fb4493ea4f53070a0c9bc3f7c25c98ae2434df12d844e3e62c5041dfd3002edae8b1cf3a98309a62b4e6b374bbe5ba76
+EBUILD mlt-6.20.0-r1.ebuild 5411 BLAKE2B f59bed59bca6e2333544ab0eabab824ccc85a1b595761fcb819763c47c99c85e9ea804f2feb96d62eaa99cbb2f320fa877625acc0d33f15c4030772a19925049 SHA512 580c59d798663a35f38f1d50b4f4c924e460935de7d236a454c63d74cf8a65a8eee58bf9a9bb05aef0a3a3ca04d360cfce3d1ba4cbced24ebf4ccd30824b0d81
+EBUILD mlt-6.20.0.ebuild 5408 BLAKE2B 8a6f5d49dd70c22c80f66e810451e61da28722cad19da6780a86924ec2c7fe524a79aa89c27e6c83404413d8c58ac792ecc4cd11981ca2cffba87f5c58ccdfa1 SHA512 89ef395743c22051a3a23f50b539adc2605d2b7b49ed99a4f2ee235bacb202caeeab7deb8e737074cc1031fc9ec2b3052dfef3ace13f7260d780dad16f928171
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
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