multimedia/mlt7*: Update to 7.16.0

- Flavorize multimedia/mlt7-glaxnimate for Qt5 and Qt6

https://github.com/mltframework/mlt/releases/tag/v7.16.0

8 files changed, 56 insertions, 28 deletions

diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
index 364092b1ed5a..c34782c37c9e 100644
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -39,7 +39,7 @@ _MLT_NODEPEND=	yes
 
 # Library dependencies
 _MLT6_VERSION=	6.26.1
-_MLT7_VERSION=	7.14.0
+_MLT7_VERSION=	7.16.0
 _MLT6_PORTNAME=	mlt6
 _MLT7_PORTNAME=	mlt7
 _MLT6_LIB=	libmlt.so
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 1f025a9d696f..ffb4934dddc0 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kdenlive
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate
 RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \
 		${LOCALBASE}/lib/mlt-7/libmltqt.so:multimedia/mlt7-qt@qt5 \
-		${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate
+		${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate@qt5
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext-tools \
 		gl mlt:7 pkgconfig qt:5 shared-mime-info kde:5 tar:xz xorg
diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile
index 4ef4d3cb3ad3..a09ddbca6ab5 100644
--- a/multimedia/mlt7-glaxnimate/Makefile
+++ b/multimedia/mlt7-glaxnimate/Makefile
@@ -1,8 +1,8 @@
 MASTERDIR=	${.CURDIR:H}/mlt7
 SLAVEPORT=	glaxnimate
 
-PORTREVISION=	2
-PKGNAMESUFFIX=	-glaxnimate
+PORTREVISION=	0
+PKGNAMESUFFIX=	-glaxnimate-${FLAVOR}
 
 COMMENT=	2D animations plugin for the MLT multimedia framework
 CATEGORIES=	multimedia kde
@@ -13,21 +13,36 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libfftw3.so:math/fftw3
 
-USES=		qt:5 xorg
-USE_CXXSTD=	c++11
-USE_QT=		core gui svg widgets xml \
-		buildtools:build qmake:build
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		qt:${FLAVOR:S/qt//} libarchive xorg
+USE_QT=		${_USE_QT_${FLAVOR}}
 USE_XORG=	x11
 
+# Flavor handling
+_USE_QT_qt5=	core gui svg widgets xml \
+		buildtools:build qmake:build
+_USE_QT_qt6=	base svg
+_CMAKE_ON_qt5=	MOD_GLAXNIMATE
+_CMAKE_ON_qt6=	MOD_GLAXNIMATE_QT6
+_CMAKE_OFF_qt5=	MOD_GLAXNIMATE_QT6
+_CMAKE_OFF_qt6=	MOD_GLAXNIMATE
+_PLIST_SUB_qt5=	QT_VERSION_SUFFIX=
+_PLIST_SUB_qt6=	QT_VERSION_SUFFIX="-qt6"
+
 # Only enable Qt binding, and disable everything else
-CMAKE_ON=	MOD_GLAXNIMATE
+CMAKE_ON=	${_CMAKE_ON_${FLAVOR}}
 CMAKE_OFF=	MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \
 		MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \
 		MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_QT MOD_RESAMPLE \
 		MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \
 		MOD_VORBIS MOD_XINE MOD_XML \
 		SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
-		SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
+		SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \
+		${_CMAKE_OFF_${FLAVOR}}
+
+PLIST_SUB+=	${_PLIST_SUB_${FLAVOR}}
 
 BUILD_WRKSRC=	${WRKDIR}/.build/src/modules/glaxnimate
 
diff --git a/multimedia/mlt7-glaxnimate/pkg-plist b/multimedia/mlt7-glaxnimate/pkg-plist
index e890019dc99d..d6b0940e7281 100644
--- a/multimedia/mlt7-glaxnimate/pkg-plist
+++ b/multimedia/mlt7-glaxnimate/pkg-plist
@@ -1,2 +1,2 @@
-lib/mlt-7/libmltglaxnimate.so
-%%DATADIR%%/glaxnimate/producer_glaxnimate.yml
+lib/mlt-7/libmltglaxnimate%%QT_VERSION_SUFFIX%%.so
+%%DATADIR%%/glaxnimate%%QT_VERSION_SUFFIX%%/producer_glaxnimate.yml
diff --git a/multimedia/mlt7-qt/Makefile b/multimedia/mlt7-qt/Makefile
index 8a536da81105..292cfb7f26a0 100644
--- a/multimedia/mlt7-qt/Makefile
+++ b/multimedia/mlt7-qt/Makefile
@@ -1,7 +1,7 @@
 MASTERDIR=	${.CURDIR:H}/mlt7
 SLAVEPORT=	qt
 
-PORTREVISION=	4
+PORTREVISION=	0
 PKGNAMESUFFIX=	-${FLAVOR}
 
 COMMENT=	Qt plugin for the MLT multimedia framework
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index 7dc8e56c2f46..e1d1b6cf1567 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION=	3
+PORTREVISION?=		0
 CATEGORIES?=		multimedia
 # Don't use GitHub "fake" downloads that are auto-generated from a
 # tag; the project uploads tarballs for each release.
@@ -9,10 +9,6 @@ MASTER_SITES=		https://github.com/mltframework/mlt/releases/download/v${DISTVERS
 DISTFILES=		mlt-${DISTVERSION}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/mlt-${DISTVERSION}
 
-PATCH_SITES=		https://github.com/mltframework/mlt/commit/
-PATCHFILES=		a3d49ccb92e2544bcc1957ce046bf63f71b468a6.patch:-p1 \
-			1eee2187410ae16f520409dcdcf6de789d8bafd9.patch:-p1
-
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
 WWW=		https://www.mltframework.org/
@@ -35,8 +31,8 @@ CMAKE_ON=		MOD_XML
 
 # Explicitly disabled modules that are ouddated, unnecessary, or have
 # their own port.
-CMAKE_OFF=		MOD_GLAXNIMATE MOD_SDL1 MOD_QT \
-			MOD_NDI \
+CMAKE_OFF=		MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \
+			MOD_QT6 MOD_NDI \
 			SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \
 			SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL
 
diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo
index 941346db14f7..12d8d380eaaf 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1682924020
-SHA256 (mlt-7.14.0.tar.gz) = 3a7e83ed5e30f3f2d073d172c9d886310d8a73dbd2ee850ad44e3c43a9ab6394
-SIZE (mlt-7.14.0.tar.gz) = 1509786
-SHA256 (a3d49ccb92e2544bcc1957ce046bf63f71b468a6.patch) = 7dfc07c1420d64ca7a974b47bd63c6e1c797ffa85327b625df7887ed87a4f5a6
-SIZE (a3d49ccb92e2544bcc1957ce046bf63f71b468a6.patch) = 2418
-SHA256 (1eee2187410ae16f520409dcdcf6de789d8bafd9.patch) = dacaafee580a9c7324157d65c0f7a0ab4cdeae5490570e3a94fee05cb2dd99ef
-SIZE (1eee2187410ae16f520409dcdcf6de789d8bafd9.patch) = 952
+TIMESTAMP = 1685589000
+SHA256 (mlt-7.16.0.tar.gz) = c0975e06403d3df22be7d4b5d96d0608e0d16470299360d0a0ee5f41ba2b7a96
+SIZE (mlt-7.16.0.tar.gz) = 1577046
diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist
index 28f8efa3ed8a..12c4646348bf 100644
--- a/multimedia/mlt7/pkg-plist
+++ b/multimedia/mlt7/pkg-plist
@@ -96,6 +96,12 @@ libdata/pkgconfig/mlt-framework-7.pc
 share/man/man1/melt-7.1.gz
 %%AVFORMAT%%%%DATADIR%%/avformat/blacklist.txt
 %%AVFORMAT%%%%DATADIR%%/avformat/consumer_avformat.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/filter_avcolour_space.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/filter_avdeinterlace.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/filter_swresample.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/filter_swscale.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/link_avdeinterlace.yml
+%%AVFORMAT%%%%DATADIR%%/avformat/link_swresample.yml
 %%AVFORMAT%%%%DATADIR%%/avformat/producer_avformat.yml
 %%AVFORMAT%%%%DATADIR%%/avformat/resolution_scale.yml
 %%AVFORMAT%%%%DATADIR%%/avformat/yuv_only.txt
@@ -161,6 +167,8 @@ share/man/man1/melt-7.1.gz
 %%KDENLIVE%%%%DATADIR%%/kdenlive/producer_framebuffer.yml
 %%DATADIR%%/metaschema.yaml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_blur.yml
+%%MOVIT%%%%DATADIR%%/movit/filter_movit_convert.yml
+%%MOVIT%%%%DATADIR%%/movit/filter_movit_crop.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_deconvolution_sharpen.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_diffusion.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_flip.yml
@@ -169,6 +177,8 @@ share/man/man1/melt-7.1.gz
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_mirror.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_opacity.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_rect.yml
+%%MOVIT%%%%DATADIR%%/movit/filter_movit_resample.yml
+%%MOVIT%%%%DATADIR%%/movit/filter_movit_resize.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_saturation.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_vignette.yml
 %%MOVIT%%%%DATADIR%%/movit/filter_movit_white_balance.yml
@@ -306,6 +316,14 @@ share/man/man1/melt-7.1.gz
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/TGA
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/TIFF
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/webp
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/AV1
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/DNxHR-HQ
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/FFV1
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/ProRes 422
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/ProRes 444
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/ProRes HQ
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/x264-high10
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/ten_bit/x265-main10
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/vp9
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/webm
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/webm-pass1
@@ -403,6 +421,7 @@ share/man/man1/melt-7.1.gz
 %%DATADIR%%/profiles/vertical_hd_30
 %%DATADIR%%/profiles/vertical_hd_60
 %%RESAMPLE%%%%DATADIR%%/resample/filter_resample.yml
+%%RESAMPLE%%%%DATADIR%%/resample/link_resample.yml
 %%RTAUDIO%%%%DATADIR%%/rtaudio/consumer_rtaudio.yml
 %%RUBBERBAND%%%%DATADIR%%/rubberband/filter_rbpitch.yml
 %%SDL2%%%%DATADIR%%/sdl2/consumer_sdl2.yml
@@ -412,6 +431,8 @@ share/man/man1/melt-7.1.gz
 %%VIDSTAB%%%%DATADIR%%/vid.stab/filter_deshake.yml
 %%VIDSTAB%%%%DATADIR%%/vid.stab/filter_vidstab.yml
 %%VORBIS%%%%DATADIR%%/vorbis/producer_vorbis.yml
+%%XINE%%%%DATADIR%%/xine/filter_deinterlace.yml
+%%XINE%%%%DATADIR%%/xine/link_deinterlace.yml
 %%DATADIR%%/xml/consumer_xml.yml
 %%DATADIR%%/xml/mlt-xml.dtd
 %%DATADIR%%/xml/producer_xml-nogl.yml