From e6e674c94591f95a3de1646acf3197f826c084ed Mon Sep 17 00:00:00 2001
From: Ben Woods <woodsb02@FreeBSD.org>
Date: Wed, 8 Jun 2016 18:30:53 +0000
Subject: [PATCH] multimedia/mlt: Fixes post r416546 commit - USE_GNOME=cairo
 only applies when SWFDEC option is enabled - USE_XORG=x11 applies even with
 all options disabled (due to SDL) - USE_GNOME=glib20 is required when JACK or
 SWFDEC options are enabled - Fix pkg-plist: filter_audiospectrum.yml only
 installed if QT4 enabled

Reported by:	mat (mentor)
Reviewed by:	mat (mentor)
Approved by:	adamw (mentor), portmgr (blanket approval - build fixes)
Differential Revision:	https://reviews.freebsd.org/D6776
---
 multimedia/mlt/Makefile  | 11 +++++------
 multimedia/mlt/pkg-plist |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 94f29ae02c6d..91cf088e9b1b 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	6.2.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -19,8 +19,9 @@ SLAVE_PORT?=	no
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
 
-USE_GNOME=	cairo libxml2
+USE_GNOME=	libxml2
 USE_SDL=	image
+USE_XORG=	x11
 USES=		alias gmake iconv pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gpl --enable-gpl3 --target-os=FreeBSD
@@ -63,6 +64,7 @@ GTK2_CONFIGURE_ENABLE=	gtk2
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 JACK_CONFIGURE_ENABLE=	jackrack
+JACK_USE=		GNOME=glib20
 
 KDE4_CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH"
 KDE4_CONFIGURE_WITH=	kde
@@ -83,6 +85,7 @@ SOX_CONFIGURE_ENABLE=	sox
 
 SWFDEC_LIB_DEPENDS=	libswfdec-0.8.so:graphics/swfdec
 SWFDEC_CONFIGURE_ENABLE=swfdec
+SWFDEC_USE=		GNOME=glib20,cairo
 
 VDPAU_CONFIGURE_ON=	--avformat-vdpau
 VDPAU_CONFIGURE_OFF=	--avformat-no-vdpau
@@ -96,10 +99,6 @@ VIDSTAB_CONFIGURE_ENABLE=vid.stab
 BROKEN=		does not compile on sparc64 (invokes i386 asm)
 .endif
 
-.if ${PORT_OPTIONS:MVDPAU} && ${PORT_OPTIONS:MFFMPEG}
-USE_XORG+=	x11
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/avformat/vdpau.c \
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 90e7a86b38d3..e9897f26ec10 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -397,7 +397,7 @@ man/man1/melt.1.gz
 %%DATADIR%%/profiles/uhd_2160p_60
 %%DATADIR%%/profiles/vcd_ntsc
 %%DATADIR%%/profiles/vcd_pal
-%%DATADIR%%/qt/filter_audiospectrum.yml
+%%QT4%%%%DATADIR%%/qt/filter_audiospectrum.yml
 %%QT4%%%%DATADIR%%/qt/filter_audiowaveform.yml
 %%QT4%%%%DATADIR%%/qt/filter_lightshow.yml
 %%QT4%%%%DATADIR%%/qt/producer_kdenlivetitle.yml