multimedia/mlt:

- Update to 0.9.2. - Add optional dependency on Vid.Stab. - Remove deprecated plugins. - Remove stale MAN* macro. - Use OPTIONS handlers. - Remove @dirrm*. - Strip binary and libraries. This is a bugfix and enhancement release: http://mltframework.blogspot.com/2014/06/version-092-released.html multimedia/py-mlt: - Force dependency on Python 2. - Take maintainership.
svn path=/head/; revision=369139
2025-07-18 17:59:20 -04:00 · 2014-09-24 01:01:34 +00:00 · 2014-09-24 01:01:34 +00:00 · 3f77b2e3ab · 2021-03-31 03:12:20 +00:00
commit 3f77b2e3ab
parent 7c01e7a60a
10 changed files with 144 additions and 284 deletions
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	mlt
-PORTVERSION=	0.9.0
-PORTREVISION?=	5
+PORTVERSION=	0.9.2
+PORTREVISION?=	0
 CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}

@ -32,22 +32,61 @@ CONFIGURE_ARGS+=--disable-debug
 CONFIGURE_ARGS+=--enable-debug
 .endif

-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"

 PORTDOCS=	AUTHORS ChangeLog NEWS README docs
 PORTEXAMPLES=	demo

-MAN1=		melt.1
-
-OPTIONS_DEFINE=	DOCS DV EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 QUICKTIME \
-		SAMPLERATE SOX SWFDEC VDPAU VORBIS
-OPTIONS_DEFAULT=DV FFMPEG FREI0R GTK2 QT4 \
-		SAMPLERATE SOX SWFDEC VORBIS
+OPTIONS_DEFINE=	DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 \
+		SAMPLERATE SOX SWFDEC VDPAU VIDSTAB
+OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VIDSTAB
+OPTIONS_SUB=	yes

 GTK2_DESC=	Images and text rendering via GTK+ 2
-KDE4_DESC=	QImage extra formats support
-QT4_DESC=	Kdenlive titles and images support via QImage
+KDE4_DESC=	Qt extra image formats support
+QT4_DESC=	Kdenlive titles and images support via Qt 4
 SOX_DESC=	SoX audio effects support
+VIDSTAB_DESC=	Video stabilization support via Vid.Stab
+
+FFMPEG_SUFX=		# Currently empty.
+FFMPEG_LIB_DEPENDS=	libavformat${FFMPEG_SUFX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
+FFMPEG_CONFIGURE_ENABLE=avformat
+FFMPEG_CONFIGURE_ON=	--avformat-suffix="${FFMPEG_SUFX}"
+
+FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_CONFIGURE_ENABLE=frei0r
+
+GTK2_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+GTK2_USE=		GNOME=gdkpixbuf2,gtk20,pango
+GTK2_CONFIGURE_ENABLE=	gtk2
+
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+JACK_CONFIGURE_ENABLE=	jackrack
+
+KDE4_CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH"
+KDE4_CONFIGURE_WITH=	kde
+
+QT4_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+QT4_USE=		QT4=corelib,gui,opengl,svg,xml
+QT4_CONFIGURE_ENABLE=	qt
+QT4_CONFIGURE_ON=	--qt-libdir="${QT_LIBDIR}" \
+			--qt-includedir="${QT_INCDIR}"
+
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_CONFIGURE_ENABLE=resample
+
+SOX_LIB_DEPENDS=	libsox.so:${PORTSDIR}/audio/sox
+SOX_CONFIGURE_ENABLE=	sox
+
+SWFDEC_LIB_DEPENDS=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
+SWFDEC_CONFIGURE_ENABLE=swfdec
+
+VDPAU_CONFIGURE_ON=	--avformat-vdpau
+VDPAU_CONFIGURE_OFF=	--avformat-no-vdpau
+
+VIDSTAB_LIB_DEPENDS=	libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_CONFIGURE_ENABLE=vid.stab

 .include <bsd.port.options.mk>

@ -55,132 +94,19 @@ SOX_DESC=	SoX audio effects support
 BROKEN=		does not compile on sparc64 (invokes i386 asm)
 .endif

-.if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+=--enable-dv
-PLIST_SUB+=	DV=""
-.else
-CONFIGURE_ARGS+=--disable-dv
-PLIST_SUB+=	DV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MVDPAU}
-FFMPEG_SUFX=
-LIB_DEPENDS+=	libavformat${FFMPEG_SUFX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
-CONFIGURE_ARGS+=--enable-avformat --avformat-swscale \
-		--avformat-suffix="${FFMPEG_SUFX}"
-PLIST_SUB+=	FFMPEG=""
-.else
-CONFIGURE_ARGS+=--disable-avformat
-PLIST_SUB+=	FFMPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFREI0R}
-BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-CONFIGURE_ARGS+=--enable-frei0r
-PLIST_SUB+=	FREI0R=""
-.else
-CONFIGURE_ARGS+=--disable-frei0r
-PLIST_SUB+=	FREI0R="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
-USE_GNOME+=	gdkpixbuf2 gtk20 pango
-CONFIGURE_ARGS+=--enable-gtk2
-PLIST_SUB+=	GTK2=""
-.else
-CONFIGURE_ARGS+=--disable-gtk2
-PLIST_SUB+=	GTK2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-CONFIGURE_ARGS+=--enable-jackrack
-PLIST_SUB+=	JACK=""
-.else
-CONFIGURE_ARGS+=--disable-jackrack
-PLIST_SUB+=	JACK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
-USE_QT4+=	corelib gui opengl svg xml
-CONFIGURE_ARGS+=--enable-qimage \
-		--qimage-includedir="${QT_INCDIR}" \
-		--qimage-libdir="${QT_LIBDIR}"
-PLIST_SUB+=	QT4=""
-. if ${PORT_OPTIONS:MKDE4}
+.if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MQT4}
 USE_KDE4+=	kdelibs
-CONFIGURE_ENV+=	PATH="${KDE4_PREFIX}/bin:$$PATH"
-. else
-CONFIGURE_ARGS+=--without-kde
-. endif
-.else
-CONFIGURE_ARGS+=--disable-qimage
-PLIST_SUB+=	QT4="@comment "
 .endif

-.if ${PORT_OPTIONS:MQUICKTIME}
-LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv \
-		quicktime:${PORTSDIR}/multimedia/libquicktime
-CONFIGURE_ARGS+=--enable-kino
-PLIST_SUB+=	QUICKTIME=""
-.else
-CONFIGURE_ARGS+=--disable-kino
-PLIST_SUB+=	QUICKTIME="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=--enable-resample
-PLIST_SUB+=	SAMPLERATE=""
-.else
-CONFIGURE_ARGS+=--disable-resample
-PLIST_SUB+=	SAMPLERATE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSOX}
-LIB_DEPENDS+=	libsox.so:${PORTSDIR}/audio/sox
-CONFIGURE_ARGS+=--enable-sox
-PLIST_SUB+=	SOX=""
-.else
-CONFIGURE_ARGS+=--disable-sox
-PLIST_SUB+=	SOX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSWFDEC}
-LIB_DEPENDS+=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
-CONFIGURE_ARGS+=--enable-swfdec
-PLIST_SUB+=	SWFDEC=""
-.else
-CONFIGURE_ARGS+=--disable-swfdec
-PLIST_SUB+=	SWFDEC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVDPAU}
+.if ${PORT_OPTIONS:MVDPAU} && ${PORT_OPTIONS:MFFMPEG}
 USE_XORG+=	x11
-CONFIGURE_ARGS+=--avformat-vdpau
-.else
-CONFIGURE_ARGS+=--avformat-no-vdpau
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-vorbis
-PLIST_SUB+=	VORBIS=""
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-PLIST_SUB+=	VORBIS="@comment "
 .endif

 pre-configure:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/avformat/vdpau.c \
 		${WRKSRC}/src/modules/frei0r/factory.c \
-		${WRKSRC}/src/modules/jackrack/plugin_mgr.c \
-		${WRKSRC}/src/modules/linsys/Makefile
+		${WRKSRC}/src/modules/jackrack/plugin_mgr.c
 	@${REINPLACE_CMD} -e 's,-lpthread,-pthread,' \
 			-e 's,-liconv,${ICONV_LIB},' \
 		${WRKSRC}/src/framework/Makefile \
@ -202,6 +128,10 @@ post-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 .endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/melt
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt.so.${PORTVERSION}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt++.so.${PORTVERSION}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mlt/*

 .endif # ${SLAVE_PORT} == "no"

--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@ -1,2 +1,2 @@
-SHA256 (mlt-0.9.0.tar.gz) = f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9
-SIZE (mlt-0.9.0.tar.gz) = 1167943
+SHA256 (mlt-0.9.2.tar.gz) = 60aebda834938c5963ec9032ae319badc4929becae0d7c99a9109a7de7b9ba7d
+SIZE (mlt-0.9.2.tar.gz) = 1226700
--- a/multimedia/mlt/files/patch-configure
+++ b/multimedia/mlt/files/patch-configure
@ -1,29 +0,0 @@
--- ./configure.orig	2013-06-03 05:34:35.000000000 +0200
-+++ ./configure	2013-06-06 18:15:11.804543548 +0200
-@@ -301,7 +301,7 @@
- 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
- 		;;
- 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false
-+		[ "$(make -V MACHINE_CPU:Mmmx -f /dev/null)" ] || mmx=false
- 		;;
- 		*)
- 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
-@@ -320,7 +320,7 @@
- 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
- 		;;
- 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Msse)" ] || sse=false
-+		[ "$(make -V MACHINE_CPU:Msse -f /dev/null)" ] || sse=false
- 		;;
- 		*)
- 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
-@@ -339,7 +339,7 @@
- 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
- 		;;
- 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Msse2)" ] || sse2=false
-+		[ "$(make -V MACHINE_CPU:Msse2 -f /dev/null)" ] || sse2=false
- 		;;
- 		*)
- 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
--- a/multimedia/mlt/files/patch-git4035fc1
+++ b/multimedia/mlt/files/patch-git4035fc1
@ -0,0 +1,18 @@
+commit 4035fc1177b355b0adc0f52616f5075feb88e2ba
+Author: Dan Dennedy <dan@dennedy.org>
+Date:   Sun Jul 13 11:26:49 2014 -0700
+
+    Add missing stdlib include for getenv().
+
+diff --git a/src/modules/qt/common.cpp b/src/modules/qt/common.cpp
+index 9cd4cac..8ae1708 100644
+--- src/modules/qt/common.cpp
+++ src/modules/qt/common.cpp
+@@ -22,6 +22,7 @@
+ 
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+ #include <X11/Xlib.h>
+#include <cstdlib>
+ #endif
+ 
+ bool createQApplicationIfNeeded(mlt_service service)
--- a/multimedia/mlt/files/patch-gite50606c
+++ b/multimedia/mlt/files/patch-gite50606c
@ -1,27 +0,0 @@
-commit e50606ca3f680029b7f16bbbf284adac34f30ded
-Author: Dan Dennedy <dan@dennedy.org>
-Date:   Mon Jun 2 19:18:50 2014 -0700
-
-    Fix compilation with clang.
-
-diff --git a/configure b/configure
-index eb20880..e540704 100755
--- configure
-+++ configure
-@@ -81,10 +81,12 @@ build_config()
- 		if [ "$optimisations" = "true" ]
- 		then
- 			echo "OPTIMISATIONS=-O2 -pipe"
-			# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
-			echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
-			# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
-			echo "OPTIMISATIONS+=-fno-tree-pre"
-+			if $("$CC" --version 2> /dev/null | grep gcc); then
-+				# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
-+				echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
-+				# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
-+				echo "OPTIMISATIONS+=-fno-tree-pre"
-+			fi
- 		fi
- 
- 		echo "CFLAGS+=-Wall -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
--- a/multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c
+++ b/multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c
@ -1,10 +1,10 @@
--- src/modules/gtk2/producer_pango.c.orig	2013-12-24 21:37:38.000000000 +0100
-+++ src/modules/gtk2/producer_pango.c	2013-12-24 21:37:11.000000000 +0100
+--- src/modules/gtk2/producer_pango.c.orig	2014-06-29 20:23:17 UTC
+++ src/modules/gtk2/producer_pango.c
@@ -25,7 +25,8 @@
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pangoft2.h>
-#include <freetype/freetype.h>
+-#include <freetype.h>
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
 #include <iconv.h>
--- a/multimedia/mlt/files/patch-srcmodulesqt__configure
+++ b/multimedia/mlt/files/patch-srcmodulesqt__configure
@ -0,0 +1,19 @@
+--- src/modules/qt/configure.orig	2014-06-29 20:23:17 UTC
+++ src/modules/qt/configure
+@@ -144,6 +144,7 @@
+ 			if [ $? -eq 0 ]
+ 			then
+ 				echo "- Qt version 5.x detected"
+				without_kde=true
+ 				echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5OpenGL Qt5Widgets) >> config.mak
+ 				echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5OpenGL Qt5Widgets) >> config.mak
+ 			else
+@@ -156,7 +157,7 @@
+ 	if [ "$without_kde" = "" ]
+ 	then
+ 		kde4-config
+-		if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
+		if [ $? -eq 0 ]
+ 		then
+ 			# test if we have KDE4, required on some systems to get Qt extra formats (xcf, ...)
+ 			if [ "$kde_includedir" = "" ]
--- a/multimedia/mlt/files/patch-srcmodulesvid.stab__Makefile
+++ b/multimedia/mlt/files/patch-srcmodulesvid.stab__Makefile
@ -0,0 +1,14 @@
+--- src/modules/vid.stab/Makefile.orig	2014-06-29 20:23:17 UTC
+++ src/modules/vid.stab/Makefile
+@@ -12,8 +12,9 @@
+ CPPOBJS = filter_deshake.o
+ CPPOBJS += filter_vidstab.o
+ 
+-CXXFLAGS += -Wno-deprecated $(CFLAGS)
+-CXXFLAGS += $(shell pkg-config --cflags vidstab)
+CFLAGS += -Wno-deprecated
+CFLAGS += $(shell pkg-config --cflags vidstab)
+CXXFLAGS = $(CFLAGS)
+ 
+ LDFLAGS += -L../../mlt++ -lmlt++
+ LDFLAGS += $(shell pkg-config --libs vidstab)
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@ -57,31 +57,26 @@ lib/libmlt.so
 lib/libmlt.so.%%PORTVERSION%%
 lib/libmlt.so.6
 %%FFMPEG%%lib/mlt/libmltavformat.so
-lib/mlt/libmltavsync.so
 lib/mlt/libmltcore.so
 lib/mlt/libmltdecklink.so
-lib/mlt/libmltdgraft.so
-%%DV%%lib/mlt/libmltdv.so
-lib/mlt/libmlteffectv.so
 %%FREI0R%%lib/mlt/libmltfrei0r.so
 %%GTK2%%lib/mlt/libmltgtk2.so
 %%JACK%%lib/mlt/libmltjackrack.so
 lib/mlt/libmltkdenlive.so
-%%QUICKTIME%%lib/mlt/libmltkino.so
 lib/mlt/libmltlinsys.so
 lib/mlt/libmltmotion_est.so
 lib/mlt/libmltnormalize.so
 lib/mlt/libmltoldfilm.so
 lib/mlt/libmltplus.so
-%%QT4%%lib/mlt/libmltqimage.so
+lib/mlt/libmltplusgpl.so
+%%QT4%%lib/mlt/libmltqt.so
 %%SAMPLERATE%%lib/mlt/libmltresample.so
-lib/mlt/libmltrotoscoping.so
 lib/mlt/libmltsdl.so
 %%SOX%%lib/mlt/libmltsox.so
 %%SWFDEC%%lib/mlt/libmltswfdec.so
+%%VIDSTAB%%lib/mlt/libmltvidstab.so
 lib/mlt/libmltvideostab.so
 lib/mlt/libmltvmfx.so
-%%VORBIS%%lib/mlt/libmltvorbis.so
 lib/mlt/libmltxine.so
 lib/mlt/libmltxml.so
 libdata/pkgconfig/mlt++.pc
@ -89,8 +84,6 @@ libdata/pkgconfig/mlt-framework.pc
 man/man1/melt.1.gz
 %%FFMPEG%%%%DATADIR%%/avformat/consumer_avformat.yml
 %%FFMPEG%%%%DATADIR%%/avformat/producer_avformat.yml
-%%DATADIR%%/avsync/consumer_blipflash.yml
-%%DATADIR%%/avsync/producer_blipflash.yml
 %%DATADIR%%/core/consumer_multi.yml
 %%DATADIR%%/core/data_fx.properties
 %%DATADIR%%/core/filter_audiowave.yml
@ -105,6 +98,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/core/filter_mirror.yml
 %%DATADIR%%/core/filter_mono.yml
 %%DATADIR%%/core/filter_obscure.yml
+%%DATADIR%%/core/filter_panner.yml
 %%DATADIR%%/core/filter_region.yml
 %%DATADIR%%/core/filter_rescale.yml
 %%DATADIR%%/core/filter_resize.yml
@ -121,13 +115,11 @@ man/man1/melt.1.gz
 %%DATADIR%%/core/producer_noise.yml
 %%DATADIR%%/core/transition_composite.yml
 %%DATADIR%%/core/transition_luma.yml
+%%DATADIR%%/core/transition_matte.yml
 %%DATADIR%%/core/transition_mix.yml
 %%DATADIR%%/core/transition_region.yml
 %%DATADIR%%/decklink/consumer_decklink.yml
 %%DATADIR%%/decklink/producer_decklink.yml
-%%DV%%%%DATADIR%%/dv/consumer_libdv.yml
-%%DV%%%%DATADIR%%/dv/producer_libdv.yml
-%%DATADIR%%/effectv/filter_burningtv.yml
 %%DATADIR%%/feeds/NTSC/data_fx.properties
 %%DATADIR%%/feeds/NTSC/etv.properties
 %%DATADIR%%/feeds/NTSC/obscure.properties
@ -140,9 +132,7 @@ man/man1/melt.1.gz
 %%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_dynamictext.yml
 %%GTK2%%%%DATADIR%%/gtk2/filter_rescale.yml
-%%GTK2%%%%DATADIR%%/gtk2/producer_count.yml
 %%GTK2%%%%DATADIR%%/gtk2/producer_pango.yml
 %%GTK2%%%%DATADIR%%/gtk2/producer_pixbuf.yml
 %%JACK%%%%DATADIR%%/jackrack/blacklist.txt
@ -223,11 +213,22 @@ man/man1/melt.1.gz
 %%DATADIR%%/oldfilm/oldfilm.svg
 %%DATADIR%%/oldfilm/tcolor.svg
 %%DATADIR%%/oldfilm/vignette.svg
+%%DATADIR%%/plus/consumer_blipflash.yml
 %%DATADIR%%/plus/filter_affine.yml
 %%DATADIR%%/plus/filter_charcoal.yml
+%%DATADIR%%/plus/filter_dynamictext.yml
 %%DATADIR%%/plus/filter_invert.yml
+%%DATADIR%%/plus/filter_lift_gamma_gain.yml
+%%DATADIR%%/plus/filter_loudness.yml
+%%DATADIR%%/plus/filter_rgblut.yml
 %%DATADIR%%/plus/filter_sepia.yml
+%%DATADIR%%/plus/producer_blipflash.yml
+%%DATADIR%%/plus/producer_count.yml
 %%DATADIR%%/plus/transition_affine.yml
+%%DATADIR%%/plusgpl/consumer_cbrts.yml
+%%DATADIR%%/plusgpl/filter_burningtv.yml
+%%DATADIR%%/plusgpl/filter_lumaliftgaingamma.yml
+%%DATADIR%%/plusgpl/filter_rotoscoping.yml
 %%DATADIR%%/presets/consumer/avformat/AAC
 %%DATADIR%%/presets/consumer/avformat/Flash
 %%DATADIR%%/presets/consumer/avformat/MJPEG
@ -291,6 +292,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/consumer/avformat/stills/PPM
 %%DATADIR%%/presets/consumer/avformat/stills/TGA
 %%DATADIR%%/presets/consumer/avformat/stills/TIFF
+%%DATADIR%%/presets/consumer/avformat/vp9
 %%DATADIR%%/presets/consumer/avformat/webm
 %%DATADIR%%/presets/consumer/avformat/x264-medium
 %%DATADIR%%/presets/consumer/avformat/x264-medium-baseline
@ -301,6 +303,9 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/filter/movit.blur/blur_in
 %%DATADIR%%/presets/filter/movit.blur/blur_in_out
 %%DATADIR%%/presets/filter/movit.blur/blur_out
+%%DATADIR%%/presets/filter/movit.opacity/fade_in
+%%DATADIR%%/presets/filter/movit.opacity/fade_in_out
+%%DATADIR%%/presets/filter/movit.opacity/fade_out
 %%DATADIR%%/presets/filter/volume/fade_in
 %%DATADIR%%/presets/filter/volume/fade_out
 %%DATADIR%%/profiles/atsc_1080i_50
@ -359,11 +364,11 @@ man/man1/melt.1.gz
 %%DATADIR%%/profiles/svcd_pal_wide
 %%DATADIR%%/profiles/vcd_ntsc
 %%DATADIR%%/profiles/vcd_pal
-%%QT4%%%%DATADIR%%/qimage/producer_kdenlivetitle.yml
-%%QT4%%%%DATADIR%%/qimage/producer_qimage.yml
-%%QT4%%%%DATADIR%%/qimage/transition_vqm.yml
+%%QT4%%%%DATADIR%%/qt/producer_kdenlivetitle.yml
+%%QT4%%%%DATADIR%%/qt/producer_qimage.yml
+%%QT4%%%%DATADIR%%/qt/producer_qtext.yml
+%%QT4%%%%DATADIR%%/qt/transition_vqm.yml
 %%SAMPLERATE%%%%DATADIR%%/resample/filter_resample.yml
-%%DATADIR%%/rotoscoping/filter_rotoscoping.yml
 %%DATADIR%%/sdl/consumer_sdl.yml
 %%DATADIR%%/sdl/consumer_sdl_audio.yml
 %%DATADIR%%/sdl/consumer_sdl_preview.yml
@ -372,6 +377,8 @@ man/man1/melt.1.gz
 %%SOX%%%%DATADIR%%/sox/filter_sox.yml
 %%SOX%%%%DATADIR%%/sox/filter_sox_effect.yml
 %%SWFDEC%%%%DATADIR%%/swfdec/producer_swfdec.yml
+%%VIDSTAB%%%%DATADIR%%/vid.stab/filter_deshake.yml
+%%VIDSTAB%%%%DATADIR%%/vid.stab/filter_vidstab.yml
 %%DATADIR%%/videostab/filter_videostab.yml
 %%DATADIR%%/videostab/filter_videostab2.yml
 %%DATADIR%%/vmfx/filter_chroma.yml
@ -379,80 +386,8 @@ man/man1/melt.1.gz
 %%DATADIR%%/vmfx/filter_mono.yml
 %%DATADIR%%/vmfx/filter_shape.yml
 %%DATADIR%%/vmfx/producer_pgm.yml
-%%VORBIS%%%%DATADIR%%/vorbis/producer_vorbis.yml
 %%DATADIR%%/xml/consumer_xml.yml
 %%DATADIR%%/xml/mlt-xml.dtd
+%%DATADIR%%/xml/producer_xml-nogl.yml
 %%DATADIR%%/xml/producer_xml-string.yml
 %%DATADIR%%/xml/producer_xml.yml
-@dirrm %%DATADIR%%/xml
-%%VORBIS%%@dirrm %%DATADIR%%/vorbis
-@dirrm %%DATADIR%%/vmfx
-@dirrm %%DATADIR%%/videostab
-%%SWFDEC%%@dirrm %%DATADIR%%/swfdec
-%%SOX%%@dirrm %%DATADIR%%/sox
-@dirrm %%DATADIR%%/sdl
-@dirrm %%DATADIR%%/rotoscoping
-%%SAMPLERATE%%@dirrm %%DATADIR%%/resample
-%%QT4%%@dirrm %%DATADIR%%/qimage
-@dirrm %%DATADIR%%/profiles
-@dirrm %%DATADIR%%/presets/filter/volume
-@dirrm %%DATADIR%%/presets/filter/movit.blur
-@dirrm %%DATADIR%%/presets/filter/brightness
-@dirrm %%DATADIR%%/presets/filter
-@dirrm %%DATADIR%%/presets/consumer/avformat/stills
-@dirrm %%DATADIR%%/presets/consumer/avformat/lossless
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_720_60p
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_720_50p
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_720_30p
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_720_25p
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_1080_60i
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_1080_50i
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_1080_30p
-@dirrm %%DATADIR%%/presets/consumer/avformat/hdv_1080_25p
-@dirrm %%DATADIR%%/presets/consumer/avformat/dv_pal_wide
-@dirrm %%DATADIR%%/presets/consumer/avformat/dv_pal
-@dirrm %%DATADIR%%/presets/consumer/avformat/dv_ntsc_wide
-@dirrm %%DATADIR%%/presets/consumer/avformat/dv_ntsc
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_720p_60
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_720p_5994
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_720p_50
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_720p_2398
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_60
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_5994
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_50
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_30
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_2997
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_25
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_24
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080p_2398
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080i_5994
-@dirrm %%DATADIR%%/presets/consumer/avformat/atsc_1080i_50
-@dirrm %%DATADIR%%/presets/consumer/avformat
-@dirrm %%DATADIR%%/presets/consumer
-@dirrm %%DATADIR%%/presets
-@dirrm %%DATADIR%%/plus
-@dirrm %%DATADIR%%/oldfilm
-@dirrm %%DATADIR%%/normalize
-@dirrm %%DATADIR%%/motion_est
-@dirrm %%DATADIR%%/lumas/PAL
-@dirrm %%DATADIR%%/lumas/NTSC
-@dirrm %%DATADIR%%/lumas
-@dirrm %%DATADIR%%/linsys
-@dirrm %%DATADIR%%/kdenlive
-%%JACK%%@dirrm %%DATADIR%%/jackrack
-%%GTK2%%@dirrm %%DATADIR%%/gtk2
-%%FREI0R%%@dirrm %%DATADIR%%/frei0r
-@dirrm %%DATADIR%%/feeds/PAL
-@dirrm %%DATADIR%%/feeds/NTSC
-@dirrm %%DATADIR%%/feeds
-@dirrm %%DATADIR%%/effectv
-%%DV%%@dirrm %%DATADIR%%/dv
-@dirrm %%DATADIR%%/decklink
-@dirrm %%DATADIR%%/core
-@dirrm %%DATADIR%%/avsync
-%%FFMPEG%%@dirrm %%DATADIR%%/avformat
-@dirrm %%DATADIR%%
-@dirrm lib/mlt
-@dirrm include/mlt/framework
-@dirrm include/mlt++
-@dirrm include/mlt
--- a/multimedia/py-mlt/Makefile
+++ b/multimedia/py-mlt/Makefile
@ -1,11 +1,11 @@
 # Created by: Charlie Kester <corky1951@comcast.net>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Python bindings for the MLT multimedia framework

 LICENSE=	GPLv2
@ -14,7 +14,7 @@ LICENSE_COMB=	single
 LIB_DEPENDS=	libmlt.so:${PORTSDIR}/${MASTER_PORT}
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13

-USE_PYTHON=	yes
+USES=		python:2
 MASTERDIR=	${.CURDIR:H:H}/multimedia/mlt

 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}/python
@ -44,7 +44,7 @@ do-install:
 	@cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c 'import mlt'
 	@cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -Oc 'import mlt'
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-. for f in codecs getimage play waveforms
+. for f in codecs getimage play switcher waveforms webvfx_generator
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${f}.py ${STAGEDIR}${EXAMPLESDIR}
 . endfor