Hello community, here is the log from the commit of package libmlt for openSUSE:Leap:15.2 checked in at 2020-04-14 14:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libmlt (Old) and /work/SRC/openSUSE:Leap:15.2/.libmlt.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmlt" Tue Apr 14 14:21:26 2020 rev:33 rq:793546 version:6.20.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libmlt/libmlt.changes 2020-02-19 18:43:24.746438442 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libmlt.new.3248/libmlt.changes 2020-04-14 14:21:38.693304214 +0200 @@ -1,0 +2,6 @@ +Thu Apr 2 16:37:52 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.0.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.luv8NZ/_old 2020-04-14 14:21:39.257304635 +0200 +++ /var/tmp/diff_new_pack.luv8NZ/_new 2020-04-14 14:21:39.261304638 +0200 @@ -39,6 +39,8 @@ Patch1: libmlt-0.8.2-vdpau.patch # PATCH-FIX-UPSTREAM libmlt-fixluma.patch [email protected] -- 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 @@ %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. ++++++ 0001-Fix-build-with-Qt-5.15.0.patch ++++++ >From 9f5e935fb2127320d4ebf03e174ad6dbc0581152 Mon Sep 17 00:00:00 2001 From: Heiko Becker <[email protected]> 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 <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 6d4d669..7e91bb1 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 603c2b7..ff95a8e 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.0
