- Update x264 to 0.110.1804

12 files changed, 56 insertions, 69 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 75929e5857c7..7cd990f3aaf4 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.4.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		SF/avidemux/avidemux/${PORTVERSION}
@@ -155,7 +155,7 @@ LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
 .if defined(WITHOUT_X264)
 CMAKE_ARGS+=	-DNO_x264=1
 .else
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 .endif
 
 .if defined(WITHOUT_XVID)
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 00753a16628b..9815c27ebe90 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2010-07-25
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm
@@ -280,7 +280,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 
 # x264
 .ifdef(WITH_X264)
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 36634ee4721c..4f5f3558caa3 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -284,7 +285,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 
 # x264
 .ifndef(WITHOUT_X264)
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index b4bee2c76487..89707c93306f 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.1.5
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -134,7 +134,7 @@ CONFIGURE_ARGS+=	--without-faad2
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
 .else
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 65d53a5e1418..325a78584ab5 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	13
+PORTREVISION=	14
 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.98:${PORTSDIR}/multimedia/x264
+		x264.110:${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 3834dc4b9a80..a39633d6ba6e 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://fromani.exit1.org/
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${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 644d85ea5f62..465f7774e53a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.5
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -611,7 +612,7 @@ CONFIGURE_ARGS+=--with-x
 
 .if defined(WITH_X264)
 CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index ce7ba2e15dfc..7324ae019019 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -5,20 +5,24 @@
 # $FreeBSD$
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20100624
+PORTVERSION=	0.${X264_BUILD}.${X264_REV}
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
-DISTFILES=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245
+DISTFILES=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
 DIST_SUBDIR=	x264
-EXTRACT_ONLY=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	Library and tool for encoding H.264/AVC video streams
 
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
 
+X264_BUILD=	110
+X264_REV=	1804
+X264_SNAPSHOT=	20101128
+
 USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -38,6 +42,8 @@ CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \
 			--enable-shared
 
+PLIST_SUB+=	X264_BUILD=${X264_BUILD}
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GCC44)
@@ -84,7 +90,6 @@ RESTRICTED_FILES=	${Y4M_VIDEO_DISTFILE}
 .if !defined(WITHOUT_GPAC)
 BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
 LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
-CONFIGURE_ARGS+=	--enable-gpac
 .else
 CONFIGURE_ARGS+=	--disable-gpac
 .endif
@@ -101,8 +106,11 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
-		s|-lpthread |${PTHREAD_LIBS} |g;' \
+		s|-lpthread|${PTHREAD_LIBS}|g; \
+		s|bash|sh|; \
+		s|gpac_static|gpac|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 9fbec344dd50..33f85a392c6f 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,6 +1,4 @@
-MD5 (x264/x264-snapshot-20100624-2245.tar.bz2) = c510db9f178396d9de2926729a071d40
-SHA256 (x264/x264-snapshot-20100624-2245.tar.bz2) = 58e3093bbdd84c1e7a4797def1e654aae832ae91418971031d14a6048f1c6a43
-SIZE (x264/x264-snapshot-20100624-2245.tar.bz2) = 422940
-MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
+SHA256 (x264/x264-snapshot-20101128-2245.tar.bz2) = 7bcf72cd27780833ee7757de1efe53e8192c9a110d33c1f86e0f70085fab71db
+SIZE (x264/x264-snapshot-20101128-2245.tar.bz2) = 472116
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 10e0da310121..944aaf295a2e 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,38 +1,25 @@
---- configure.orig	2010-06-24 22:45:07.000000000 +0200
-+++ configure	2010-07-18 22:56:20.252020411 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
- 
-@@ -297,11 +297,15 @@
-     ARCH="X86"
-     AS="yasm"
-     ASFLAGS="$ASFLAGS -O2"
--    if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
--      CFLAGS="$CFLAGS -march=i686"
--    fi
--    if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
--      CFLAGS="$CFLAGS -mfpmath=sse -msse"
-+    if [ "$asm" = yes ]; then
-+      case "$CFLAGS" in
-+      *-march*) ;;
-+      *) CFLAGS="$CFLAGS -march=i686" ;;
-+      esac
-+      case "$CFLAGS" in
-+      *-mfpmath*) ;;
-+      *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
-+      esac
-     fi
-     if [ "$SYS" = MACOSX ]; then
-       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
-@@ -572,7 +576,7 @@
-     [ -n "$LAVF_CFLAGS" ] && CFLAGS="$CFLAGS $LAVF_CFLAGS"
- fi
- 
--GPAC_LIBS="-lgpac_static"
-+GPAC_LIBS="-lgpac"
- if [ $SYS = MINGW ]; then
-     GPAC_LIBS="$GPAC_LIBS -lwinmm"
- fi
+--- configure.orig	2010-11-28 22:45:04.000000000 +0100
++++ configure	2010-11-29 22:51:09.651506774 +0100
+@@ -350,12 +350,16 @@
+         ARCH="X86"
+         AS="yasm"
+         ASFLAGS="$ASFLAGS -O2"
+-        if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
+-            CFLAGS="$CFLAGS -march=i686"
+-        fi
+-        if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+-            CFLAGS="$CFLAGS -mfpmath=sse -msse"
+-        fi
++	if [ "$asm" = yes ]; then
++	    case "$CFLAGS" in
++	    *-march*) ;;
++	    *) CFLAGS="$CFLAGS -march=i686" ;;
++	    esac
++	    case "$CFLAGS" in
++	    *-mfpmath*) ;;
++	    *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
++	    esac
++	fi
+         if [ "$SYS" = MACOSX ]; then
+             ASFLAGS="$ASFLAGS -f macho -DPREFIX"
+         elif [ "$SYS" = MINGW ]; then
diff --git a/multimedia/x264/files/patch-version.sh b/multimedia/x264/files/patch-version.sh
deleted file mode 100644
index ca767fdadf7b..000000000000
--- a/multimedia/x264/files/patch-version.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- version.sh.orig	2010-04-23 12:55:03.524324331 +0200
-+++ version.sh	2010-04-23 12:54:56.084537002 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- git rev-list HEAD | sort > config.git-hash
- LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
- if [ $LOCALVER \> 1 ] ; then
diff --git a/multimedia/x264/pkg-plist b/multimedia/x264/pkg-plist
index d761f3ff3768..9fa4cdc81f24 100644
--- a/multimedia/x264/pkg-plist
+++ b/multimedia/x264/pkg-plist
@@ -2,5 +2,5 @@ bin/x264
 include/x264.h
 lib/libx264.a
 lib/libx264.so
-lib/libx264.so.98
+lib/libx264.so.%%X264_BUILD%%
 libdata/pkgconfig/x264.pc