diff --git a/0001-Fix-build-with-Qt-5.15.0.patch b/0001-Fix-build-with-Qt-5.15.0.patch new file mode 100644 index 0000000..cedd66d --- /dev/null +++ b/0001-Fix-build-with-Qt-5.15.0.patch @@ -0,0 +1,52 @@ +From 9f5e935fb2127320d4ebf03e174ad6dbc0581152 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +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 dd7d4ae..dffd430 100644 +--- a/src/modules/qt/filter_qtext.cpp ++++ b/src/modules/qt/filter_qtext.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + 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 6d4d669..7e91bb1 100644 +--- a/src/modules/qt/graph.cpp ++++ b/src/modules/qt/graph.cpp +@@ -18,6 +18,7 @@ + */ + + #include "graph.h" ++#include + #include + #include + +diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp +index 603c2b7..ff95a8e 100644 +--- a/src/modules/qt/producer_qtext.cpp ++++ b/src/modules/qt/producer_qtext.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.26.0 + diff --git a/libmlt.changes b/libmlt.changes index 7dd2b01..f6a3dcd 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 2 16:37:52 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.0.patch + ------------------------------------------------------------------- Mon Feb 17 11:48:34 UTC 2020 - Luigi Baldoni diff --git a/libmlt.spec b/libmlt.spec index 21b0c96..a1c6282 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -39,6 +39,8 @@ Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/ Patch1: libmlt-0.8.2-vdpau.patch # PATCH-FIX-UPSTREAM libmlt-fixluma.patch aloisio@gmx.com -- add LD_LIBRARY_PATH so that luma can run Patch2: libmlt-fixluma.patch +# PATCH-FIX-UPSTREAM 0001-Fix-build-with-Qt-5.15.0.patch +Patch3: 0001-Fix-build-with-Qt-5.15.0.patch BuildRequires: fdupes %if 0%{?suse_version} >= 1500 BuildRequires: gcc-c++ @@ -206,6 +208,7 @@ This package contains python bindings. %setup -q -n %{_name}-%{version} %patch1 %patch2 -p1 +%patch3 -p1 # To complement libmlt-0.8.0-vdpau.patch. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway.