10 files changed, 85 insertions, 60 deletions

diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
index abac94eb9de2..3a0f2cfeb25d 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.4.0
+_MLT7_VERSION=	7.8.0
 _MLT6_PORTNAME=	mlt6
 _MLT7_PORTNAME=	mlt7
 _MLT6_LIB=	libmlt.so
diff --git a/multimedia/Makefile b/multimedia/Makefile
index ac189e8a7b8b..cce4e9a7105f 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -230,6 +230,7 @@
     SUBDIR += mlt6
     SUBDIR += mlt6-qt5
     SUBDIR += mlt7
+    SUBDIR += mlt7-glaxnimate
     SUBDIR += mlt7-qt5
     SUBDIR += motion
     SUBDIR += mp3cd
diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile
new file mode 100644
index 000000000000..8a16d93261e9
--- /dev/null
+++ b/multimedia/mlt7-glaxnimate/Makefile
@@ -0,0 +1,38 @@
+MASTERDIR=	${.CURDIR:H}/mlt7
+SLAVEPORT=	glaxnimate
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-glaxnimate
+
+COMMENT=	2D animations plugin for the MLT multimedia framework
+CATEGORIES=	multimedia kde
+
+LICENSE=	GPLv2 GPLv3
+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
+USE_XORG=	x11
+
+# Only enable Qt binding, and disable everything else
+CMAKE_ON=	MOD_GLAXNIMATE
+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
+
+BUILD_WRKSRC=	${WRKDIR}/.build/src/modules/glaxnimate
+
+# Dummy placeholder target.
+common-post-install:
+	@${TRUE}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/mlt7-glaxnimate/pkg-plist b/multimedia/mlt7-glaxnimate/pkg-plist
new file mode 100644
index 000000000000..e890019dc99d
--- /dev/null
+++ b/multimedia/mlt7-glaxnimate/pkg-plist
@@ -0,0 +1,2 @@
+lib/mlt-7/libmltglaxnimate.so
+%%DATADIR%%/glaxnimate/producer_glaxnimate.yml
diff --git a/multimedia/mlt7-qt5/pkg-plist b/multimedia/mlt7-qt5/pkg-plist
index 49c50a98d060..919a668b09ff 100644
--- a/multimedia/mlt7-qt5/pkg-plist
+++ b/multimedia/mlt7-qt5/pkg-plist
@@ -1,4 +1,5 @@
 lib/mlt-7/libmltqt.so
+%%DATADIR%%/qt/filter_audiolevelgraph.yml
 %%DATADIR%%/qt/filter_audiospectrum.yml
 %%DATADIR%%/qt/filter_audiowaveform.yml
 %%DATADIR%%/qt/filter_lightshow.yml
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index 25e58bfa209c..d70209425b9c 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION=	3
 CATEGORIES?=		multimedia
 # Don't use GitHub "fake" downloads that are auto-generated from a
 # tag; the project uploads tarballs for each release.
@@ -9,10 +8,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=		86b922b361c0dbc9a70999abaef7be065e91dd1f.patch:-p1 \
-			41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch:-p1
-
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
 
@@ -34,7 +29,7 @@ CMAKE_ON=		MOD_XML
 
 # Explicitly disabled modules that are ouddated, unnecessary, or have
 # their own port.
-CMAKE_OFF=		MOD_SDL1 MOD_QT \
+CMAKE_OFF=		MOD_GLAXNIMATE MOD_SDL1 MOD_QT \
 			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 68049b3f9136..707b07936073 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1643124903
-SHA256 (mlt-7.4.0.tar.gz) = 17c19843ffdbca66777aaadf39acb11829fd930eaded92f768cbcb8ae59a5f37
-SIZE (mlt-7.4.0.tar.gz) = 1206316
-SHA256 (86b922b361c0dbc9a70999abaef7be065e91dd1f.patch) = 1e02b9955d93fc91fea1801623d1aa1b669f3bef88f1d6d206e9454b78e9972f
-SIZE (86b922b361c0dbc9a70999abaef7be065e91dd1f.patch) = 1775
-SHA256 (41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch) = 8f76c5f1d292c6fa6135218a092858a10bf63a836cf91f191847fb04f8be98c8
-SIZE (41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch) = 981
+TIMESTAMP = 1657170466
+SHA256 (mlt-7.8.0.tar.gz) = 66606d79f91b400a4d9380a911a5d771a48bd6413447fa2f3713459eba70242d
+SIZE (mlt-7.8.0.tar.gz) = 1458730
diff --git a/multimedia/mlt7/files/patch-CMakeLists.txt b/multimedia/mlt7/files/patch-CMakeLists.txt
index 67c984260d0b..be0c7f0606c1 100644
--- a/multimedia/mlt7/files/patch-CMakeLists.txt
+++ b/multimedia/mlt7/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-07-30 17:03:01 UTC
+--- CMakeLists.txt.orig	2022-07-07 05:23:41 UTC
 +++ CMakeLists.txt
-@@ -435,9 +435,6 @@ install(DIRECTORY presets profiles DESTINATION ${MLT_I
+@@ -473,9 +473,6 @@ if(UNIX AND NOT APPLE)
  
  if(UNIX AND NOT APPLE)
    install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME melt-${MLT_VERSION_MAJOR}.1)
diff --git a/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt b/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
deleted file mode 100644
index 7ea7e357f21d..000000000000
--- a/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/melt/CMakeLists.txt.orig	2021-07-30 17:09:44 UTC
-+++ src/melt/CMakeLists.txt
-@@ -22,7 +22,4 @@ if(WIN32 OR APPLE)
-   install(TARGETS melt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- else()
-   install(PROGRAMS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/melt" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME melt-${MLT_VERSION_MAJOR})
--  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink melt-${MLT_VERSION_MAJOR} melt \
--                                WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR})"
--  )
- endif()
diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist
index 57f50499d615..651565b0ce44 100644
--- a/multimedia/mlt7/pkg-plist
+++ b/multimedia/mlt7/pkg-plist
@@ -1,3 +1,4 @@
+bin/melt
 bin/melt-7
 include/mlt-7/framework/mlt.h
 include/mlt-7/framework/mlt_animation.h
@@ -102,6 +103,7 @@ share/man/man1/melt-7.1.gz
 %%DATADIR%%/core/consumer_multi.yml
 %%DATADIR%%/core/filter_audiomap.yml
 %%DATADIR%%/core/filter_audiowave.yml
+%%DATADIR%%/core/filter_box_blur.yml
 %%DATADIR%%/core/filter_brightness.yml
 %%DATADIR%%/core/filter_channelcopy.yml
 %%DATADIR%%/core/filter_choppy.yml
@@ -116,6 +118,7 @@ share/man/man1/melt-7.1.gz
 %%DATADIR%%/core/filter_mono.yml
 %%DATADIR%%/core/filter_obscure.yml
 %%DATADIR%%/core/filter_panner.yml
+%%DATADIR%%/core/filter_pillar_echo.yml
 %%DATADIR%%/core/filter_rescale.yml
 %%DATADIR%%/core/filter_resize.yml
 %%DATADIR%%/core/filter_transition.yml
@@ -205,7 +208,6 @@ share/man/man1/melt-7.1.gz
 %%PLUS%%%%DATADIR%%/plus/filter_loudness.yml
 %%PLUS%%%%DATADIR%%/plus/filter_loudness_meter.yml
 %%PLUS%%%%DATADIR%%/plus/filter_lumakey.yml
-%%PLUS%%%%DATADIR%%/plus/filter_pillar_echo.yml
 %%PLUS%%%%DATADIR%%/plus/filter_rgblut.yml
 %%PLUS%%%%DATADIR%%/plus/filter_sepia.yml
 %%PLUS%%%%DATADIR%%/plus/filter_shape.yml
@@ -246,20 +248,20 @@ share/man/man1/melt-7.1.gz
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/Ut Video
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/vp8
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/vp9
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_50/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_60/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_2398/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_5994/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080i_50/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080i_5994/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2398/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_24/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_25/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2997/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_30/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_50/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_5994/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_60/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_2398/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_50/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_5994/DNxHD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_60/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2398/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2997/DNxHD
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_5994/DNxHD
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/D10
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/DV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/DVCPRO50
@@ -276,14 +278,14 @@ share/man/man1/melt-7.1.gz
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DVCPRO50
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DVD
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_25p/HDV
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_30p/HDV
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_50i/HDV
-%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_60i/HDV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_25p/HDV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_30p/HDV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_50p/HDV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_60p/HDV
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_25p/HDV
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_30p/HDV
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_50i/HDV
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_60i/HDV
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/DNxHR-HQ
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/MJPEG
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/MPEG-2
@@ -323,25 +325,25 @@ share/man/man1/melt-7.1.gz
 %%MOVIT%%%%DATADIR%%/presets/filter/movit.opacity/fade_out
 %%DATADIR%%/presets/filter/volume/fade_in
 %%DATADIR%%/presets/filter/volume/fade_out
+%%DATADIR%%/profiles/atsc_720p_24
+%%DATADIR%%/profiles/atsc_720p_25
+%%DATADIR%%/profiles/atsc_720p_30
+%%DATADIR%%/profiles/atsc_720p_50
+%%DATADIR%%/profiles/atsc_720p_60
+%%DATADIR%%/profiles/atsc_720p_2398
+%%DATADIR%%/profiles/atsc_720p_2997
+%%DATADIR%%/profiles/atsc_720p_5994
 %%DATADIR%%/profiles/atsc_1080i_50
-%%DATADIR%%/profiles/atsc_1080i_5994
 %%DATADIR%%/profiles/atsc_1080i_60
-%%DATADIR%%/profiles/atsc_1080p_2398
+%%DATADIR%%/profiles/atsc_1080i_5994
 %%DATADIR%%/profiles/atsc_1080p_24
 %%DATADIR%%/profiles/atsc_1080p_25
-%%DATADIR%%/profiles/atsc_1080p_2997
 %%DATADIR%%/profiles/atsc_1080p_30
 %%DATADIR%%/profiles/atsc_1080p_50
-%%DATADIR%%/profiles/atsc_1080p_5994
 %%DATADIR%%/profiles/atsc_1080p_60
-%%DATADIR%%/profiles/atsc_720p_2398
-%%DATADIR%%/profiles/atsc_720p_24
-%%DATADIR%%/profiles/atsc_720p_25
-%%DATADIR%%/profiles/atsc_720p_2997
-%%DATADIR%%/profiles/atsc_720p_30
-%%DATADIR%%/profiles/atsc_720p_50
-%%DATADIR%%/profiles/atsc_720p_5994
-%%DATADIR%%/profiles/atsc_720p_60
+%%DATADIR%%/profiles/atsc_1080p_2398
+%%DATADIR%%/profiles/atsc_1080p_2997
+%%DATADIR%%/profiles/atsc_1080p_5994
 %%DATADIR%%/profiles/cif_15
 %%DATADIR%%/profiles/cif_ntsc
 %%DATADIR%%/profiles/cif_pal
@@ -351,25 +353,25 @@ share/man/man1/melt-7.1.gz
 %%DATADIR%%/profiles/dv_ntsc_wide
 %%DATADIR%%/profiles/dv_pal
 %%DATADIR%%/profiles/dv_pal_wide
-%%DATADIR%%/profiles/hdv_1080_25p
-%%DATADIR%%/profiles/hdv_1080_30p
-%%DATADIR%%/profiles/hdv_1080_50i
-%%DATADIR%%/profiles/hdv_1080_60i
 %%DATADIR%%/profiles/hdv_720_25p
 %%DATADIR%%/profiles/hdv_720_30p
 %%DATADIR%%/profiles/hdv_720_50p
 %%DATADIR%%/profiles/hdv_720_60p
+%%DATADIR%%/profiles/hdv_1080_25p
+%%DATADIR%%/profiles/hdv_1080_30p
+%%DATADIR%%/profiles/hdv_1080_50i
+%%DATADIR%%/profiles/hdv_1080_60i
 %%DATADIR%%/profiles/qcif_15
 %%DATADIR%%/profiles/qcif_ntsc
 %%DATADIR%%/profiles/qcif_pal
-%%DATADIR%%/profiles/qhd_1440p_2398
 %%DATADIR%%/profiles/qhd_1440p_24
 %%DATADIR%%/profiles/qhd_1440p_25
-%%DATADIR%%/profiles/qhd_1440p_2997
 %%DATADIR%%/profiles/qhd_1440p_30
 %%DATADIR%%/profiles/qhd_1440p_50
-%%DATADIR%%/profiles/qhd_1440p_5994
 %%DATADIR%%/profiles/qhd_1440p_60
+%%DATADIR%%/profiles/qhd_1440p_2398
+%%DATADIR%%/profiles/qhd_1440p_2997
+%%DATADIR%%/profiles/qhd_1440p_5994
 %%DATADIR%%/profiles/quarter_15
 %%DATADIR%%/profiles/quarter_ntsc
 %%DATADIR%%/profiles/quarter_ntsc_wide
@@ -387,14 +389,14 @@ share/man/man1/melt-7.1.gz
 %%DATADIR%%/profiles/svcd_ntsc_wide
 %%DATADIR%%/profiles/svcd_pal
 %%DATADIR%%/profiles/svcd_pal_wide
-%%DATADIR%%/profiles/uhd_2160p_2398
 %%DATADIR%%/profiles/uhd_2160p_24
 %%DATADIR%%/profiles/uhd_2160p_25
-%%DATADIR%%/profiles/uhd_2160p_2997
 %%DATADIR%%/profiles/uhd_2160p_30
 %%DATADIR%%/profiles/uhd_2160p_50
-%%DATADIR%%/profiles/uhd_2160p_5994
 %%DATADIR%%/profiles/uhd_2160p_60
+%%DATADIR%%/profiles/uhd_2160p_2398
+%%DATADIR%%/profiles/uhd_2160p_2997
+%%DATADIR%%/profiles/uhd_2160p_5994
 %%DATADIR%%/profiles/vcd_ntsc
 %%DATADIR%%/profiles/vcd_pal
 %%DATADIR%%/profiles/vertical_hd_30