multimedia/mlt: update to 6.22.0

- gtk2 module was deprecated and replaced by gdk

7 files changed, 23 insertions, 59 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index c2994b1c22bb..c89bd6ad4298 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mlt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.20.0
+DISTVERSION=	6.22.0
 CATEGORIES?=	multimedia
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,7 +29,9 @@ CONFIGURE_ARGS+=--enable-debug
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
 
-LIB_DEPENDS=	libfftw3.so:math/fftw3
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 BROKEN_sparc64=		does not compile on sparc64 (invokes i386 asm)
 
@@ -44,15 +46,15 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README docs
+PORTDOCS=	AUTHORS NEWS README docs
 PORTEXAMPLES=	demo
 
-OPTIONS_DEFINE=	DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK OPENGL \
+OPTIONS_DEFINE=	DOCS EXAMPLES FFMPEG FREI0R GDK JACK OPENGL \
 		SAMPLERATE SOX SWFDEC VIDSTAB # OPENCV VDPAU
-OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 OPENGL SAMPLERATE SOX VIDSTAB
+OPTIONS_DEFAULT=FFMPEG FREI0R GDK OPENGL SAMPLERATE SOX VIDSTAB
 OPTIONS_SUB=	yes
 
-GTK2_DESC=	Images and text rendering via GTK+ 2
+GDK_DESC=	Images and text rendering via GDK
 SOX_DESC=	SoX audio effects support
 VIDSTAB_DESC=	Video stabilization support via Vid.Stab
 
@@ -64,10 +66,10 @@ FFMPEG_CONFIGURE_ON=	--avformat-suffix="${FFMPEG_SUFX}"
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=frei0r
 
-GTK2_LIB_DEPENDS=	libexif.so:graphics/libexif \
+GDK_LIB_DEPENDS=	libexif.so:graphics/libexif \
 			libfontconfig.so:x11-fonts/fontconfig
-GTK2_USE=		GNOME=gdkpixbuf2,gtk20,pango
-GTK2_CONFIGURE_ENABLE=	gtk2
+GDK_USE=		GNOME=gdkpixbuf2,gtk20,pango
+GDK_CONFIGURE_ENABLE=	gdk
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 195be765acf1..5d7b4c09daf0 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582344931
-SHA256 (mltframework-mlt-v6.20.0_GH0.tar.gz) = ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd
-SIZE (mltframework-mlt-v6.20.0_GH0.tar.gz) = 1446137
+TIMESTAMP = 1596282272
+SHA256 (mltframework-mlt-v6.22.0_GH0.tar.gz) = 3392d70c528d7f32e78329232b1b93a5a36b058215f664953090315132b797e5
+SIZE (mltframework-mlt-v6.22.0_GH0.tar.gz) = 1343694
diff --git a/multimedia/mlt/files/patch-src_modules_qt_filter__qtext.cpp b/multimedia/mlt/files/patch-src_modules_qt_filter__qtext.cpp
deleted file mode 100644
index 57686e8e5b86..000000000000
--- a/multimedia/mlt/files/patch-src_modules_qt_filter__qtext.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/qt/filter_qtext.cpp.orig	2020-03-22 06:37:39 UTC
-+++ 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/files/patch-src_modules_qt_graph.cpp b/multimedia/mlt/files/patch-src_modules_qt_graph.cpp
deleted file mode 100644
index 36929535068e..000000000000
--- a/multimedia/mlt/files/patch-src_modules_qt_graph.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/qt/graph.cpp.orig	2020-03-22 06:36:38 UTC
-+++ src/modules/qt/graph.cpp
-@@ -18,6 +18,7 @@
-  */
- 
- #include "graph.h"
-+#include <QPainterPath>
- #include <QVector>
- #include <math.h>
- 
diff --git a/multimedia/mlt/files/patch-src_modules_qt_kdenlivetitle__wrapper.cpp b/multimedia/mlt/files/patch-src_modules_qt_kdenlivetitle__wrapper.cpp
deleted file mode 100644
index fdab8ef22568..000000000000
--- a/multimedia/mlt/files/patch-src_modules_qt_kdenlivetitle__wrapper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/qt/kdenlivetitle_wrapper.cpp.orig	2020-03-22 06:37:07 UTC
-+++ src/modules/qt/kdenlivetitle_wrapper.cpp
-@@ -28,6 +28,7 @@
- #include <QGraphicsScene>
- #include <QGraphicsTextItem>
- #include <QGraphicsSvgItem>
-+#include <QPainterPath>
- #include <QSvgRenderer>
- #include <QTextCursor>
- #include <QTextDocument>
diff --git a/multimedia/mlt/files/patch-src_modules_qt_producer__qtext.cpp b/multimedia/mlt/files/patch-src_modules_qt_producer__qtext.cpp
deleted file mode 100644
index 603d304f6dc2..000000000000
--- a/multimedia/mlt/files/patch-src_modules_qt_producer__qtext.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/qt/producer_qtext.cpp.orig	2020-03-22 06:32:03 UTC
-+++ src/modules/qt/producer_qtext.cpp
-@@ -26,6 +26,7 @@
- #include <QImage>
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFont>
- #include <QString>
- #include <QTextCodec>
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 2d1a48c4a8a5..40f51453d5d5 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -1,6 +1,7 @@
 bin/melt
 include/mlt++/Mlt.h
 include/mlt++/MltAnimation.h
+include/mlt++/MltAudio.h
 include/mlt++/MltConfig.h
 include/mlt++/MltConsumer.h
 include/mlt++/MltDeque.h
@@ -26,6 +27,7 @@ include/mlt++/MltTractor.h
 include/mlt++/MltTransition.h
 include/mlt/framework/mlt.h
 include/mlt/framework/mlt_animation.h
+include/mlt/framework/mlt_audio.h
 include/mlt/framework/mlt_cache.h
 include/mlt/framework/mlt_consumer.h
 include/mlt/framework/mlt_deque.h
@@ -63,11 +65,10 @@ lib/libmlt.so.%%PORTVERSION%%
 lib/mlt/libmltcore.so
 lib/mlt/libmltdecklink.so
 %%FREI0R%%lib/mlt/libmltfrei0r.so
-%%GTK2%%lib/mlt/libmltgtk2.so
 %%JACK%%lib/mlt/libmltjackrack.so
 lib/mlt/libmltkdenlive.so
-lib/mlt/libmltlinsys.so
 lib/mlt/libmltmotion_est.so
+%%GDK%%lib/mlt/libmltgdk.so
 lib/mlt/libmltnormalize.so
 lib/mlt/libmltoldfilm.so
 %%OPENGL%%lib/mlt/libmltopengl.so
@@ -89,6 +90,7 @@ man/man1/melt.1.gz
 %%FFMPEG%%%%DATADIR%%/avformat/blacklist.txt
 %%FFMPEG%%%%DATADIR%%/avformat/consumer_avformat.yml
 %%FFMPEG%%%%DATADIR%%/avformat/producer_avformat.yml
+%%FFMPEG%%%%DATADIR%%/avformat/yuv_only.txt
 %%DATADIR%%/core/consumer_multi.yml
 %%DATADIR%%/core/data_fx.properties
 %%DATADIR%%/core/filter_audiomap.yml
@@ -142,10 +144,9 @@ man/man1/melt.1.gz
 %%FREI0R%%%%DATADIR%%/frei0r/filter_cairoblend_mode.yml
 %%FREI0R%%%%DATADIR%%/frei0r/not_thread_safe.txt
 %%FREI0R%%%%DATADIR%%/frei0r/param_name_map.yaml
-%%GTK2%%%%DATADIR%%/gtk2/consumer_gtk2_preview.yml
-%%GTK2%%%%DATADIR%%/gtk2/filter_rescale.yml
-%%GTK2%%%%DATADIR%%/gtk2/producer_pango.yml
-%%GTK2%%%%DATADIR%%/gtk2/producer_pixbuf.yml
+%%GDK%%%%DATADIR%%/gdk/filter_rescale.yml
+%%GDK%%%%DATADIR%%/gdk/producer_pango.yml
+%%GDK%%%%DATADIR%%/gdk/producer_pixbuf.yml
 %%JACK%%%%DATADIR%%/jackrack/blacklist.txt
 %%JACK%%%%DATADIR%%/jackrack/consumer_jack.yml
 %%JACK%%%%DATADIR%%/jackrack/filter_jack.yml
@@ -156,7 +157,6 @@ man/man1/melt.1.gz
 %%DATADIR%%/kdenlive/filter_freeze.yml
 %%DATADIR%%/kdenlive/filter_wave.yml
 %%DATADIR%%/kdenlive/producer_framebuffer.yml
-%%DATADIR%%/linsys/consumer_sdi.yml
 %%DATADIR%%/metaschema.yaml
 %%DATADIR%%/motion_est/filter_autotrack_rectangle.yml
 %%DATADIR%%/motion_est/filter_motion_est.yml
@@ -228,6 +228,8 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/consumer/avformat/MPEG-2
 %%DATADIR%%/presets/consumer/avformat/MPEG-4
 %%DATADIR%%/presets/consumer/avformat/MPEG-4-ASP
+%%DATADIR%%/presets/consumer/avformat/Slide-Deck-H264
+%%DATADIR%%/presets/consumer/avformat/Slide-Deck-HEVC
 %%DATADIR%%/presets/consumer/avformat/Sony-PSP
 %%DATADIR%%/presets/consumer/avformat/Vorbis
 %%DATADIR%%/presets/consumer/avformat/WAV