11 files changed, 45 insertions, 44 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ca3a3a9fbec0..67145cc31fd8 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.13
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -366,7 +366,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 
 # x264
 .if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.125:${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 9c355de0326d..9ff5576ca6e0 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=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 8c1cbcc0a5fb..08f65ed46fc3 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -578,7 +578,7 @@ gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
 gst_vp8_DIST=		bad
 
 # x264
-gst_x264_LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+gst_x264_LIB_DEPENDS+=	x264.125:${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 0503833d474e..d01363175556 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
 .else
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index e2f6521d8e41..9bb884fa379e 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
@@ -113,7 +113,7 @@ CONFIGURE_ARGS+=	--disable-faac
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 51d9c52f12cc..ad5e9b75061a 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	25
+PORTREVISION=	26
 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.123:${PORTSDIR}/multimedia/x264
+		x264.125:${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 f8099542d2ba..ca9a402c4631 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
 
@@ -111,7 +111,7 @@ CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index de3f305cc4ca..b64cf6dca366 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.13
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index c31639ae72e0..2646ecf40a72 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,15 +6,14 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
 MASTER_SITE_SUBDIR=	mm/x264
-DISTFILES=	${DISTNAME}.tar.xz
-DISTNAME=	${PORTNAME}-${X264_GITVER}
+DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	x264
-EXTRACT_ONLY=	${DISTFILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	Library and tool for encoding H.264/AVC video streams
@@ -25,26 +24,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-X264_BUILD=	123
-X264_REV=	2189
-X264_COMMIT=	35cf912671fddcb3e701bf667a75f77dd8b28264
+X264_BUILD=	125
+X264_REV=	2201
+X264_COMMIT=	37be55213a39db40cf159ada319bd482a1b00680
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
+X264_SNAPSHOT=	20120721
 
-X264_GITVER=	35cf912
-
-USE_XZ=		yes
+USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	ASM "Assembly optimizations (devel/binutils)" On \
-		DEBUG "Enable Debugging" Off \
-		PGO "Enable Profile-Guided Optimization" On \
-		GCC44 "Use gcc 4.4+ (implies WITH_ASM)" Off \
-		GPAC "Enable MPEG-4 Output" On \
-		X11_OUTPUT "Enable X11 Output" Off
+OPTIONS_DEFINE=	ASM DEBUG PGO GCC44 GPAC X11_OUTPUT
+OPTIONS_DEFAULT=	ASM PGO GPAC
+ASM_DESC=		Assembly optimizations (devel/binutils)
+PGO_DESC=		Enable Profile-Guided Optimization
+GCC44_DESC=		Use gcc 4.4+ (implies WITH_ASM)
+GPAC_DESC=		Enable MPEG-4 Output
+X11_OUTPUT_DESC=	Enable X11 Output
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \
@@ -52,13 +51,15 @@ CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
 
 PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GCC44)
+.if ${PORT_OPTIONS:MGCC44}
 USE_GCC?=	4.4+
 .endif
 
-.if !defined(WITHOUT_ASM) || defined(WITH_GCC44)
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MASM} || ${PORT_OPTIONS:MGCC44}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
@@ -78,16 +79,16 @@ CONFIGURE_ENV+=	ARCH= \
 MAKE_ENV+=	ARCH= \
 		TARGET_ARCH=
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
 # y4m sample video
 Y4M_VIDEO=example.y4m
 Y4M_VIDEO_DISTFILE=example.y4m.bz2
 
-DISTFILES+=	${Y4M_VIDEO_DISTFILE}:pgo
+DISTFILES+=	${Y4M_VIDEO_DISTFILE}
 ALL_TARGET=	fprofiled
 MAKE_ENV+=	VIDS="${WRKDIR}/${Y4M_VIDEO}"
 
@@ -95,20 +96,20 @@ RESTRICTED=	${Y4M_VIDEO_DISTFILE} file may not be mirrored
 RESTRICTED_FILES=	${Y4M_VIDEO_DISTFILE}
 .endif
 
-.if !defined(WITHOUT_GPAC)
+.if ${PORT_OPTIONS:MGPAC}
 BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
 LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
 .else
 CONFIGURE_ARGS+=	--disable-gpac
 .endif
 
-.if defined(WITH_X11_OUTPUT)
+.if ${PORT_OPTIONS:MX11_OUTPUT}
 CONFIGURE_ARGS+=	--enable-visualize
 USE_XORG=	x11
 .endif
 
 post-extract:
-.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
 	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
 .endif
 
@@ -122,7 +123,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
-.if !defined(WITH_GCC44)
+.if ${PORT_OPTIONS:MGCC44}
 	@${REINPLACE_CMD} -e 's|$$(CC) -shared -o|COMPILER_PATH= $$(CC) -shared -o|g' \
 		-e 's|$$(CC) -o|COMPILER_PATH= $$(CC) -o|g' \
 		${WRKSRC}/Makefile
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 0182f8366ad2..b1c8ead328dd 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,4 @@
-SHA256 (x264/x264-35cf912.tar.xz) = e7d73a20014dd20ef0ff5ca39d74c89cc2609fd0cafc9de1f59175b3e8bfe809
-SIZE (x264/x264-35cf912.tar.xz) = 495604
+SHA256 (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 9e8f87d08ee51b4e4b66a3720796c6cf50fc4668946c2d958fcfce236ac73cff
+SIZE (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 554280
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index f8165bd2ce66..083abef11c2b 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opal3
 PORTVERSION=	3.6.6
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S|3||g}/${PORTVERSION:R}
@@ -126,7 +126,7 @@ PLIST_SUB+=	THEORA="@comment "
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-h264
 PLIST_SUB+=	X264=""
 WITH_VIDEO=	yes