diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2020-07-25 07:43:42 -0600 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2020-07-25 07:43:42 -0600 |
| commit | be10a68e5a4cff93397af70aa4137da302d83ed9 (patch) | |
| tree | 1a302ace40a93399a43e6a5103468f412b906339 | |
| parent | d7745a565f69ceeb94c836349e042554332b2218 (diff) | |
community/mlt: fix Qt 5.15 FTBFS
| -rw-r--r-- | community/mlt/APKBUILD | 4 | ||||
| -rw-r--r-- | community/mlt/qt-5.15-ftbfs.patch | 49 |
2 files changed, 52 insertions, 1 deletions
diff --git a/community/mlt/APKBUILD b/community/mlt/APKBUILD index aa607760616..ef4614849ae 100644 --- a/community/mlt/APKBUILD +++ b/community/mlt/APKBUILD @@ -13,6 +13,7 @@ makedepends="python3-dev ffmpeg-dev libsamplerate-dev sox-dev jack-dev subpackages="$pkgname-dev py3-$pkgname:py3" source="https://github.com/mltframework/mlt/archive/v$pkgver/mlt-v$pkgver.tar.gz musl-locale.patch + qt-5.15-ftbfs.patch " build() { @@ -50,4 +51,5 @@ py3() { } sha512sums="939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 mlt-v6.20.0.tar.gz -dfa4c192ce6121a3c86141c46a08eaf6cd6bd81c120786bdb1ef564bf7878dcb44031280b34609048409c3d09e8c0e1bd430dae1fe777ef030daf09b1dfd90a3 musl-locale.patch" +dfa4c192ce6121a3c86141c46a08eaf6cd6bd81c120786bdb1ef564bf7878dcb44031280b34609048409c3d09e8c0e1bd430dae1fe777ef030daf09b1dfd90a3 musl-locale.patch +2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295 qt-5.15-ftbfs.patch" diff --git a/community/mlt/qt-5.15-ftbfs.patch b/community/mlt/qt-5.15-ftbfs.patch new file mode 100644 index 00000000000..edc183725d6 --- /dev/null +++ b/community/mlt/qt-5.15-ftbfs.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> |