mlt: update to 6.20.0

This version adds support for low resolution Preview Scaling and adds a
module based on the Rubber Band Library for audio pitch-shifting.

patches to build with qt5.15

6 files changed, 60 insertions, 9 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index a22c28bed3f..7281507794d 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2020/06/02 08:24:27 adam Exp $
+# $NetBSD: Makefile,v 1.107 2020/06/07 04:35:25 markd Exp $
 
-DISTNAME=	mlt-6.18.0
-PKGREVISION=	5
+DISTNAME=	mlt-6.20.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mltframework/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/multimedia/mlt/PLIST b/multimedia/mlt/PLIST
index aa50be6119c..211430817e5 100644
--- a/multimedia/mlt/PLIST
+++ b/multimedia/mlt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/11/27 21:32:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/06/07 04:35:25 markd Exp $
 bin/melt
 include/mlt++/Mlt.h
 include/mlt++/MltAnimation.h
@@ -79,6 +79,7 @@ lib/mlt/libmltsdl2.so
 lib/mlt/libmltsox.so
 lib/mlt/libmltvideostab.so
 lib/mlt/libmltvmfx.so
+lib/mlt/libmltvorbis.so
 lib/mlt/libmltxine.so
 lib/mlt/libmltxml.so
 lib/pkgconfig/mlt++.pc
@@ -139,6 +140,7 @@ share/mlt/frei0r/blacklist.txt
 share/mlt/frei0r/filter_cairoblend_mode.yml
 share/mlt/frei0r/not_thread_safe.txt
 share/mlt/frei0r/param_name_map.yaml
+share/mlt/frei0r/resolution_scale.yml
 share/mlt/gtk2/consumer_gtk2_preview.yml
 share/mlt/gtk2/filter_rescale.yml
 share/mlt/gtk2/producer_pango.yml
@@ -212,6 +214,8 @@ share/mlt/plusgpl/filter_burningtv.yml
 share/mlt/plusgpl/filter_lumaliftgaingamma.yml
 share/mlt/plusgpl/filter_rotoscoping.yml
 share/mlt/presets/consumer/avformat/AAC
+share/mlt/presets/consumer/avformat/ALAC
+share/mlt/presets/consumer/avformat/FLAC
 share/mlt/presets/consumer/avformat/Flash
 share/mlt/presets/consumer/avformat/GIF
 share/mlt/presets/consumer/avformat/MJPEG
@@ -268,10 +272,12 @@ share/mlt/presets/consumer/avformat/hdv_720_25p/HDV
 share/mlt/presets/consumer/avformat/hdv_720_30p/HDV
 share/mlt/presets/consumer/avformat/hdv_720_50p/HDV
 share/mlt/presets/consumer/avformat/hdv_720_60p/HDV
+share/mlt/presets/consumer/avformat/intermediate/DNxHR-HQ
 share/mlt/presets/consumer/avformat/intermediate/MJPEG
 share/mlt/presets/consumer/avformat/intermediate/MPEG-2
 share/mlt/presets/consumer/avformat/intermediate/MPEG-4
 share/mlt/presets/consumer/avformat/intermediate/ProRes
+share/mlt/presets/consumer/avformat/intermediate/ProRes HQ
 share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya
 share/mlt/presets/consumer/avformat/lossless/FFV1
 share/mlt/presets/consumer/avformat/lossless/H.264
@@ -401,6 +407,7 @@ share/mlt/vmfx/filter_chroma_hold.yml
 share/mlt/vmfx/filter_mono.yml
 share/mlt/vmfx/filter_shape.yml
 share/mlt/vmfx/producer_pgm.yml
+share/mlt/vorbis/producer_vorbis.yml
 share/mlt/xml/consumer_xml.yml
 share/mlt/xml/mlt-xml.dtd
 share/mlt/xml/producer_xml-nogl.yml
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 634de5ae3a0..07613ba61cd 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.10 2019/11/27 21:32:09 markd Exp $
+$NetBSD: distinfo,v 1.11 2020/06/07 04:35:25 markd Exp $
 
-SHA1 (mlt-6.18.0.tar.gz) = 6c6f2678ebe0bb4f2311eae6ab04c3b548257c89
-RMD160 (mlt-6.18.0.tar.gz) = 89cdbdea82e4d322ab1b429a2c576991e9a25756
-SHA512 (mlt-6.18.0.tar.gz) = cbd2dc15864d4e64aaead433c5873cbe4039c77416536809c7281f31b2468159e35e2cfe1aac3b87acb2ee728c1bacb9a0ba2650af1de343f7487ca93d9d36d2
-Size (mlt-6.18.0.tar.gz) = 1430398 bytes
+SHA1 (mlt-6.20.0.tar.gz) = af70e65d0ee36d096a5b4e1e8f2dc457a49cdab5
+RMD160 (mlt-6.20.0.tar.gz) = 65f2ab8b6890112b5f705f1ebec4bbcd29028931
+SHA512 (mlt-6.20.0.tar.gz) = 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
+Size (mlt-6.20.0.tar.gz) = 1446137 bytes
 SHA1 (patch-src_framework_mlt__properties.c) = 5e8b30cdabb90ed96a122a2654dc254f74a87374
 SHA1 (patch-src_framework_mlt__property.h) = d477cd70b6fecba00f26a5c8f155c9bab73aea03
+SHA1 (patch-src_modules_qt_filter__qtext.cpp) = f164e057bbd7aa320642eef1643d457d347b5f5e
+SHA1 (patch-src_modules_qt_graph.h) = db5b1e1b06c728d565fc4a8f090d30832166460e
+SHA1 (patch-src_modules_qt_producer__qtext.cpp) = ade0b8b1ab1ca6bc6c40d189ddfce18e5bf0f4c1
diff --git a/multimedia/mlt/patches/patch-src_modules_qt_filter__qtext.cpp b/multimedia/mlt/patches/patch-src_modules_qt_filter__qtext.cpp
new file mode 100644
index 00000000000..19e3265618c
--- /dev/null
+++ b/multimedia/mlt/patches/patch-src_modules_qt_filter__qtext.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_modules_qt_filter__qtext.cpp,v 1.1 2020/06/07 04:35:25 markd Exp $
+
+build with qt5.15
+
+--- src/modules/qt/filter_qtext.cpp.orig	2020-02-16 22:31:58.000000000 +0000
++++ 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/multimedia/mlt/patches/patch-src_modules_qt_graph.h b/multimedia/mlt/patches/patch-src_modules_qt_graph.h
new file mode 100644
index 00000000000..cc80e2cf98a
--- /dev/null
+++ b/multimedia/mlt/patches/patch-src_modules_qt_graph.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_modules_qt_graph.h,v 1.1 2020/06/07 04:35:25 markd Exp $
+
+build with qt5.15
+
+--- src/modules/qt/graph.h.orig	2020-02-16 22:31:58.000000000 +0000
++++ src/modules/qt/graph.h
+@@ -22,6 +22,7 @@
+ 
+ #include <framework/mlt.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRectF>
+ 
+ void setup_graph_painter( QPainter& p, QRectF& rect, mlt_properties filter_properties );
diff --git a/multimedia/mlt/patches/patch-src_modules_qt_producer__qtext.cpp b/multimedia/mlt/patches/patch-src_modules_qt_producer__qtext.cpp
new file mode 100644
index 00000000000..d6594ea8d3f
--- /dev/null
+++ b/multimedia/mlt/patches/patch-src_modules_qt_producer__qtext.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_modules_qt_producer__qtext.cpp,v 1.1 2020/06/07 04:35:25 markd Exp $
+
+build with qt5.15
+
+--- src/modules/qt/producer_qtext.cpp.orig	2020-02-16 22:31:58.000000000 +0000
++++ src/modules/qt/producer_qtext.cpp
+@@ -26,6 +26,7 @@
+ #include <QImage>
+ #include <QColor>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFont>
+ #include <QString>
+ #include <QTextCodec>