Accepting request 790970 from home:cgiboudeaux:branches:KDE:Qt:5.15
- Add upstream patch to fix build with Qt 5.15: * 0001-Fix-build-with-Qt-5.15.0.patch OBS-URL: https://build.opensuse.org/request/show/790970 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=111
This commit is contained in:
parent
8f20cab074
commit
4b65495057
52
0001-Fix-build-with-Qt-5.15.0.patch
Normal file
52
0001-Fix-build-with-Qt-5.15.0.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 9f5e935fb2127320d4ebf03e174ad6dbc0581152 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 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
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 2 16:37:52 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- 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 <aloisio@gmx.com>
|
Mon Feb 17 11:48:34 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
|
||||||
|
|
||||||
|
@ -39,6 +39,8 @@ Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/
|
|||||||
Patch1: libmlt-0.8.2-vdpau.patch
|
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
|
# PATCH-FIX-UPSTREAM libmlt-fixluma.patch aloisio@gmx.com -- add LD_LIBRARY_PATH so that luma can run
|
||||||
Patch2: libmlt-fixluma.patch
|
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
|
BuildRequires: fdupes
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -206,6 +208,7 @@ This package contains python bindings.
|
|||||||
%setup -q -n %{_name}-%{version}
|
%setup -q -n %{_name}-%{version}
|
||||||
%patch1
|
%patch1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
# To complement libmlt-0.8.0-vdpau.patch.
|
# 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.
|
# When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user