multimedia/mlt: update to 0.9.6

This is a bugfix and minor enhancement release:
http://mltframework.blogspot.it/2015/02/version-094-released.html

5 files changed, 30 insertions, 32 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 025a8aca7363..e74d468eaf94 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.9.2
-PORTREVISION?=	2
+PORTVERSION=	0.9.6
+PORTREVISION?=	0
 CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index edf42b535d31..9f00fbe5564f 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-0.9.2.tar.gz) = 60aebda834938c5963ec9032ae319badc4929becae0d7c99a9109a7de7b9ba7d
-SIZE (mlt-0.9.2.tar.gz) = 1226700
+SHA256 (mlt-0.9.6.tar.gz) = ab999992828a03dadbf62f6a131aada776cfd7afe63a94d994877fdba31a3000
+SIZE (mlt-0.9.6.tar.gz) = 1242448
diff --git a/multimedia/mlt/files/patch-git4035fc1 b/multimedia/mlt/files/patch-git4035fc1
deleted file mode 100644
index bd41e0cd3f72..000000000000
--- a/multimedia/mlt/files/patch-git4035fc1
+++ /dev/null
@@ -1,18 +0,0 @@
-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)
diff --git a/multimedia/mlt/files/patch-src__modules__qt__configure b/multimedia/mlt/files/patch-src__modules__qt__configure
index ccbf77b90f38..0d309e070df0 100644
--- a/multimedia/mlt/files/patch-src__modules__qt__configure
+++ b/multimedia/mlt/files/patch-src__modules__qt__configure
@@ -1,14 +1,6 @@
---- src/modules/qt/configure.orig	2014-06-29 20:23:17 UTC
+--- src/modules/qt/configure.orig	2015-03-02 07:08:46 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 @@
+@@ -181,7 +181,7 @@ else
  	if [ "$without_kde" = "" ]
  	then
  		kde4-config
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 84bac350e961..c563bc44447f 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -113,6 +113,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/core/producer_melt.yml
 %%DATADIR%%/core/producer_melt_file.yml
 %%DATADIR%%/core/producer_noise.yml
+%%DATADIR%%/core/producer_tone.yml
 %%DATADIR%%/core/transition_composite.yml
 %%DATADIR%%/core/transition_luma.yml
 %%DATADIR%%/core/transition_matte.yml
@@ -220,6 +221,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/plus/filter_invert.yml
 %%DATADIR%%/plus/filter_lift_gamma_gain.yml
 %%DATADIR%%/plus/filter_loudness.yml
+%%DATADIR%%/plus/filter_lumakey.yml
 %%DATADIR%%/plus/filter_rgblut.yml
 %%DATADIR%%/plus/filter_sepia.yml
 %%DATADIR%%/plus/producer_blipflash.yml
@@ -239,6 +241,8 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/consumer/avformat/Sony-PSP
 %%DATADIR%%/presets/consumer/avformat/Vorbis
 %%DATADIR%%/presets/consumer/avformat/WAV
+%%DATADIR%%/presets/consumer/avformat/WMA
+%%DATADIR%%/presets/consumer/avformat/WMV
 %%DATADIR%%/presets/consumer/avformat/XDCAM-HD422
 %%DATADIR%%/presets/consumer/avformat/atsc_1080i_50/DNxHD
 %%DATADIR%%/presets/consumer/avformat/atsc_1080i_5994/DNxHD
@@ -285,6 +289,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/consumer/avformat/lossless/MPEG-2
 %%DATADIR%%/presets/consumer/avformat/lossless/MPEG-4
 %%DATADIR%%/presets/consumer/avformat/lossless/ProRes
+%%DATADIR%%/presets/consumer/avformat/lossless/ProRes-Kostya
 %%DATADIR%%/presets/consumer/avformat/stills/BMP
 %%DATADIR%%/presets/consumer/avformat/stills/DPX
 %%DATADIR%%/presets/consumer/avformat/stills/JPEG
@@ -294,10 +299,13 @@ man/man1/melt.1.gz
 %%DATADIR%%/presets/consumer/avformat/stills/TIFF
 %%DATADIR%%/presets/consumer/avformat/vp9
 %%DATADIR%%/presets/consumer/avformat/webm
+%%DATADIR%%/presets/consumer/avformat/webm-pass1
 %%DATADIR%%/presets/consumer/avformat/x264-medium
 %%DATADIR%%/presets/consumer/avformat/x264-medium-baseline
 %%DATADIR%%/presets/consumer/avformat/x264-medium-main
 %%DATADIR%%/presets/consumer/avformat/x264-medium-pass1
+%%DATADIR%%/presets/consumer/avformat/x265-medium
+%%DATADIR%%/presets/consumer/avformat/x265-medium-pass1
 %%DATADIR%%/presets/filter/brightness/from_black
 %%DATADIR%%/presets/filter/brightness/to_black
 %%DATADIR%%/presets/filter/movit.blur/blur_in
@@ -347,6 +355,14 @@ man/man1/melt.1.gz
 %%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/quarter_15
 %%DATADIR%%/profiles/quarter_ntsc
 %%DATADIR%%/profiles/quarter_ntsc_wide
@@ -362,6 +378,14 @@ man/man1/melt.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/vcd_ntsc
 %%DATADIR%%/profiles/vcd_pal
 %%QT4%%%%DATADIR%%/qt/producer_kdenlivetitle.yml