Update x264 to 0.116.2076

9 files changed, 17 insertions, 19 deletions

diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 09217837291a..2c51fab1b4cf 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -2,7 +2,7 @@
 #
 
 AVIDEMUX2_VERSION=	2.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 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.115:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 .endif
 
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index 9ff5576ca6e0..cd005323e2fc 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=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 569f5c4bffe0..f68f739949e2 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.115:${PORTSDIR}/multimedia/x264
+gst_x264_LIB_DEPENDS+=	x264.116:${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 0ff585c9129c..295e6798d63a 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.115:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
 .else
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index dbecf4fae38c..c4af108ce083 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 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.115:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 98cc3eea68e6..b66eacbc710b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.5
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://fromani.exit1.org/
@@ -116,7 +116,7 @@ CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.115:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--with-x264-prefix=${LOCALBASE} --enable-x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f423d45b6371..fbf6b5b640dc 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.11
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -681,7 +681,7 @@ CONFIGURE_ARGS+=--with-x
 
 .if defined(WITH_X264)
 CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.115:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.116:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 38d8340060de..028cd1535f47 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=	115
-X264_REV=	2000
-X264_SNAP=	20110622
+X264_BUILD=	116
+X264_REV=	2076
+X264_SNAP=	20111009
 
 USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 08863bc0f58a..46efb3befa16 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,2 @@
-SHA256 (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = e46e63e53dbad17eafae6b3ee22c0037790e574478188828db2eaafddb5c7361
-SIZE (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = 504067
-SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
-SIZE (x264/example.y4m.bz2) = 4910029
+SHA256 (x264/x264-snapshot-20111009-2245-stable.tar.bz2) = 5ea136f2e642909e51795352b83b5387a102ac3d42d1cd4659d2e951cc33cf00
+SIZE (x264/x264-snapshot-20111009-2245-stable.tar.bz2) = 512313