multimedia/x264: Update to 20130827 snapshot

- Update to 20130827 snapshot
- Add CONFIGURE_ARGS to disable OpenCL, fixes configure failure
- Chase library version bump in dependent ports

PR:		ports/182484
Submitted by:	mm
Reviewed by:	kwm, bapt

14 files changed, 23 insertions, 20 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 31802d8bf41f..654378fe1cdb 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2012-10-13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://git.videolan.org/
 PKGNAMESUFFIX=	-devel
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 7d6aef110045..319b3d8dd3b2 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.15
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -355,7 +355,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 
 # x264
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index f440faaedada..3ffa0450e9a9 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	1
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index 00cc4971f562..b70b5d4918f6 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $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/gstreamer1-plugins-x264/Makefile b/multimedia/gstreamer1-plugins-x264/Makefile
index 5e0c571572f9..cb082771459a 100644
--- a/multimedia/gstreamer1-plugins-x264/Makefile
+++ b/multimedia/gstreamer1-plugins-x264/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 15cf7e793ff3..751b972335ef 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 1eecef8609c3..c38d5f01313f 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -130,7 +130,7 @@ CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
 .else
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index f238891f9cff..eb75775cad2a 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lives
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://salsaman.home.xs4all.nl/lives/current/
 DISTNAME=	LiVES-${PORTVERSION}
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 8a38cc9ba55c..546880957c17 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Convenient video file and movie encoder
 
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--disable-faac
 .endif
 
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=		x264.125:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=		x264:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 315e49625fc1..e95107649c8f 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 87c0656991b2..19b7f4eb9e28 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index eafe56430ccf..535ee945d256 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.0.8a
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 34ec842ae815..0c934dc3ed45 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -20,11 +19,11 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-X264_BUILD=	125
-X264_REV=	2201
-X264_COMMIT=	37be55213a39db40cf159ada319bd482a1b00680
+X264_BUILD=	136
+X264_REV=	2358
+X264_COMMIT=	3361d59a0a83dcb8b321cc0eb8e6ba68ca49c7d4
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20120721
+X264_SNAPSHOT=	20130827
 
 USES=		gmake
 USE_BZIP2=	yes
@@ -41,7 +40,8 @@ X11_OUTPUT_DESC=	Enable X11 Output
 
 CONFIGURE_ARGS+=	--extra-cflags="-I${LOCALBASE}/include" \
 			--extra-ldflags="-L${LOCALBASE}/lib" \
-			--enable-static --enable-shared
+			--enable-static --enable-shared \
+			--disable-opencl
 
 PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index b1c8ead328dd..1843312f62ed 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,4 @@
-SHA256 (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 9e8f87d08ee51b4e4b66a3720796c6cf50fc4668946c2d958fcfce236ac73cff
-SIZE (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 554280
+SHA256 (x264/x264-snapshot-20130827-2245-stable.tar.bz2) = 5e418d6bb0fa8aebd503f7c6298ef0ee007ae8f066811d5427c28edc4a0304ef
+SIZE (x264/x264-snapshot-20130827-2245-stable.tar.bz2) = 619606
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029