32 files changed, 47 insertions, 31 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index bb116e727a73..751c7c24884e 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	aegisub
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/releases/ \
 		http://ftp2.aegisub.org/pub/releases/ \
@@ -31,7 +31,7 @@ OPTIONS=	DEBUG 		"Enable debug" Off \
 		PORTAUDIO	"Enable PortAudio2 audio provider (only one)" Off \
 		PULSE		"Enable PulseAudio audio provider (only one)" On \
 		OSS		"Enable OSS audio player (require portaudio)" Off \
-		FFMPEG		"Enable FFMPEG video provider" On \
+		FFMPEG		"Enable FFMPEG video provider" Off \
 		HUNSPELL	"Hungarian Spell" On \
 		LUA		"LUA Scripting" On \
 		PERL		"Perl Scripting" On
@@ -92,7 +92,8 @@ CONFIGURE_ARGS+=	--with-player-audio=pulseaudio
 CONFIGURE_ARGS+=	--with-player-audio=portaudio
 .endif
 .endif
-.if defined(WITH_FFMPEG)
+.if !defined(WITHOUT_FFMPEG)
+BROKEN=	ffmpeg support is broken
 BUILD_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--with-provider-video=ffmpegsource --with-provider-audio=ffmpegsource
 .endif
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index ac720e8282e7..a1dd6296e633 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index 4973807ec169..1fcf89971b5f 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avbin
 PORTVERSION=	7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 94252323e3a5..325b7871501c 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bombono
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/bombono/bombono-dvd/1.0
 DISTNAME=	bombono-dvd-${PORTVERSION}
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 721c9a9bc326..d81a3ea86480 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvbcut
 PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mr511.de/dvbcut/
 
diff --git a/multimedia/etoile-mediakit/Makefile b/multimedia/etoile-mediakit/Makefile
index d6034fa40aa0..2234586a1871 100644
--- a/multimedia/etoile-mediakit/Makefile
+++ b/multimedia/etoile-mediakit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mediakit
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 9473c8c0a3f8..85f865cc96ba 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpeg2theora
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
 
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index fc708eea9948..af15c521919d 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpegthumbnailer
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 6fe83a657547..9c54daf184d3 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.0.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index d73b870c6241..9b2ec4900845 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	2.3.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 3c1631d26e37..e34cff7be004 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 47c7ab6a94a1..e94beae2b6f6 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.3.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index bb3c39033d1a..922c92acc426 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 30f9235ce462..c192ad194d50 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.19
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 1a1ac45568b6..aa488420685d 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	miro
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index a853c7afad97..1e5e6881a0e4 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
index 8d202182aed8..b542f2dd3a63 100644
--- a/multimedia/moonlight/Makefile
+++ b/multimedia/moonlight/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moonlight
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 286efb8d548e..fc3929ecfbe2 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	motion
 PORTVERSION=	3.2.11.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION}
 
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 8310b6d2764c..e5d4865bd490 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -144,7 +144,8 @@ PLIST_SUB+=	XVID="@comment "
 BROKEN=		Does not compile
 .endif
 
-post-patch:
+#post-patch:
+pre-configure:
 	@${TOUCH} -f ${WRKSRC}/bootstrapped
 # don't compile or use libmp4v2
 	@${REINPLACE_CMD} -e 's|mp4v2||' \
diff --git a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
index 2fd02ad2c05e..114e87f57d28 100644
--- a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
+++ b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
@@ -1,5 +1,5 @@
---- server/mp4live/video_ffmpeg.cpp.orig	2008-07-27 18:33:54.140404708 -0500
-+++ server/mp4live/video_ffmpeg.cpp	2008-07-27 18:34:54.699683611 -0500
+--- server/mp4live/video_ffmpeg.cpp.orig	2007-01-30 22:53:45.000000000 +0100
++++ server/mp4live/video_ffmpeg.cpp	2011-06-24 22:08:18.167374694 +0200
 @@ -121,9 +121,6 @@
    m_avctx->bit_rate = 
      Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000;
@@ -23,3 +23,12 @@
  #else
      AVRational asp = 
        {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
+@@ -225,7 +222,7 @@
+   }
+   if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
+   else //m_picture->key_frame = 0;
+-    m_picture->pict_type = 0;
++    m_picture->pict_type = FF_P_TYPE;
+ 
+   m_picture->data[0] = (uint8_t *)pY;
+   m_picture->data[1] = (uint8_t *)pU;
diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile
index 4e1b6032157a..c6045dcd39d6 100644
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmovieeditor
 PORTVERSION=	0.0.20090105
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 3f55ea9c0fda..e4aeb6baf0e7 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 1a6dfa32a56d..8713693fc03e 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sabbu
 PORTVERSION=	0.3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
 
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 5978a3787ebc..17b5a3ece2ba 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.5
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://fromani.exit1.org/
diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile
index 3d5386e1962e..633532911975 100644
--- a/multimedia/vdr-plugin-markad/Makefile
+++ b/multimedia/vdr-plugin-markad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-markad
 PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/578/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile
index 5fdb637620c5..e3818d153eff 100644
--- a/multimedia/vdr-plugin-osdpip/Makefile
+++ b/multimedia/vdr-plugin-osdpip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-osdpip
 PORTVERSION=	0.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/267/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile
index d3cb15dc4d51..1d523d5f8d47 100644
--- a/multimedia/vdr-plugin-softdevice/Makefile
+++ b/multimedia/vdr-plugin-softdevice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-softdevice
 PORTVERSION=	0.5.0p20100414
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	nox/
diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile
index 1352c1e839c4..04ac0ba1ee7e 100644
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-upnp
 PORTVERSION=	0.0.2a2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/177/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index 6bc7a5252872..9ba011a27856 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20110308.2305
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF:release \
 		LOCAL:snapshot
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a071b2ce4758..a488d4e6e751 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 84bee262a817..b1c7e581a31c 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index ac58b542486a..f4fab93053ae 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zoneminder
 PORTVERSION=	1.24.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www2.zoneminder.com/downloads/ \
 		http://www.zoneminder.com/downloads/