Update x264 to 0.119.2113

11 files changed, 21 insertions, 18 deletions

diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 72408ec596b0..a368adb5d80d 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -2,7 +2,7 @@
 #
 
 AVIDEMUX2_VERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 MASTER_SITES=	BERLIOS \
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
@@ -169,7 +169,7 @@ PLIST_SUB+=	FAAD=""
 CMAKE_ARGS+=	-DX264:BOOL=OFF
 PLIST_SUB+=	X264="@comment "
 .else
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 .endif
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 868c50caf9f9..5d881c06493c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -364,7 +365,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 
 # x264
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index cd005323e2fc..09b709ad7afd 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index f68f739949e2..f83d3ca6feb0 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -580,7 +580,7 @@ gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
 gst_vp8_DIST=		bad
 
 # x264
-gst_x264_LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+gst_x264_LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 gst_x264_PLIST_FILES=	${GST_LIB_DIR}/libgstx264.la \
 		${GST_LIB_DIR}/libgstx264.so \
 		share/gstreamer-${VERSION}/presets/GstX264Enc.prs
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 295e6798d63a..8b9dafd188c0 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.3
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
 .else
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index c4af108ce083..d8eb7a29dc3c 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+=	--disable-faac
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 6539c63341f4..fa415e9818b2 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -27,7 +27,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		x264.116:${PORTSDIR}/multimedia/x264
+		x264.119:${PORTSDIR}/multimedia/x264
 RUN_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
 
 USE_GNOME=	gtk20
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 296b2a637f31..010f8444f402 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
 
@@ -110,7 +111,7 @@ CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 3fdc87413dcb..7e3dcf346def 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.12
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -686,7 +687,7 @@ CONFIGURE_ARGS+=--with-x
 
 .if defined(WITH_X264)
 CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.119:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 028cd1535f47..b4ed6aad9570 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -22,9 +22,9 @@ BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-X264_BUILD=	116
-X264_REV=	2076
-X264_SNAP=	20111009
+X264_BUILD=	119
+X264_REV=	2113
+X264_SNAP=	20111220
 
 USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index f71c577c864d..560078c63f12 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,4 @@
-SHA256 (x264/x264-snapshot-20111009-2245-stable.tar.bz2) = 5ea136f2e642909e51795352b83b5387a102ac3d42d1cd4659d2e951cc33cf00
-SIZE (x264/x264-snapshot-20111009-2245-stable.tar.bz2) = 512313
+SHA256 (x264/x264-snapshot-20111220-2245-stable.tar.bz2) = 7c739508f8f534a6ff819c553984904f8c9a86c29620228d8cd39b20caf67758
+SIZE (x264/x264-snapshot-20111220-2245-stable.tar.bz2) = 530509
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029