4 files changed, 67 insertions, 30 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index cb4e656ceef2..0ef570458127 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2009-08-12
-PORTREVISION=	1
+DISTVERSION=	2010-04-18
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://people.freebsd.org/~mm/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -27,23 +26,23 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
 
-OPTIONS=	AMR_NB	"AMR Narrow Band encoder" on \
-		AMR_WB	"AMR Wide Band decoder" on \
+OPTIONS=	AMR_NB	"AMR Narrow Band encoder (opencore)" on \
+		AMR_WB	"AMR Wide Band decoder (opencore)" on \
 		DIRAC	"Dirac codec via libdirac" off \
 		FAAC	"FAAC mp4/aac audio encoder" off \
 		FAAD	"FAAD mp4/aac audio decoder" on \
 		FFSERVER "Build and install ffserver" on \
 		GSM	"GSM audio codec" off \
-		IPV6	"IPV6 network support" on \
 		LAME	"LAME MP3 encoder" off \
 		OPENJPEG	"JPEG 2000 decoder" off \
 		OPTIMIZED_CFLAGS "Additional optimizations" off \
 		SCHROEDINGER	"Dirac codec via libschroedinger" on \
 		SDL	"SDL support (build ffplay)" off \
 		SPEEX	"Speex audio decoder" off \
+		SSSE3	"Enable ssse3 support (gcc 4.4+)" off \
 		THEORA	"Theora encoder (implies OGG)" on \
 		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
-		X264	"H.264 encoder" on \
+		X264	"H.264 encoder" off \
 		XVID	"Xvid encoder via xvidcore" on
 
 COMPAT_HEADERS=libavcodec/avcodec.h \
@@ -108,20 +107,25 @@ PORTDOCS=	*
 USE_RC_SUBR=	ffserver
 .endif
 
+.if defined(WITH_SSSE3)
+USE_GCC=	4.4+
+BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils 
+.endif
+
 # sse hardware vector support
-.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
+.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
 WITH_BUILTIN_VECTOR=	yes
 .else
 CONFIGURE_ARGS+=	--disable-sse
 .endif
 
 # mmx support
-.if ${MACHINE_CPU:Mmmx} == ""
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
 CONFIGURE_ARGS+=	--disable-mmx
 WITHOUT_BUILTIN_VECTOR=	yes
 .endif
 
-# builtin vector, requires mmx
+# builtin vector, requires mmx and sse
 .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
 FFMPEG_CFLAGS+=		-msse
 .endif
@@ -129,7 +133,7 @@ FFMPEG_CFLAGS+=		-msse
 # PORTDOCS
 .ifndef(NOPORTDOCS)
 BUILD_DEPENDS+=		texi2html:${PORTSDIR}/textproc/texi2html
-MAN1+=		ffmpeg.1
+MAN1+=		ffmpeg.1 ffprobe.1
 . ifndef(WITHOUT_FFSERVER)
 MAN1+=		ffserver.1
 . endif
@@ -144,7 +148,6 @@ DEBUG_FLAGS+=	-O2
 .endif
 
 # amr
-# amr
 .if defined(WITH_AMR_NB) || defined (WITH_AMR_WB)
 LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
 .endif
@@ -202,13 +205,6 @@ CONFIGURE_ARGS+=	--enable-libgsm
 CONFIGURE_ARGS+=	--disable-libgsm
 .endif
 
-# ipv6
-.ifndef(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 # mp3
 .ifdef(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
@@ -270,8 +266,8 @@ CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 # x264
-.ifndef(WITHOUT_X264)
-LIB_DEPENDS+=	x264.65:${PORTSDIR}/multimedia/x264
+.ifdef(WITH_X264)
+LIB_DEPENDS+=	x264.85:${PORTSDIR}/multimedia/x264-devel
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
@@ -301,10 +297,12 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g; \
-		s|-pthread|${PTHREAD_LIBS}|g" \
+		s|-pthread|${PTHREAD_LIBS}|g; \
+		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@cd ${WRKSRC}/libavcodec && ${LN} -s x86 amd64
 .ifdef(WITH_SDL)
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index 0cab5d932a59..e73b790cfb7e 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2009-08-12.tar.bz2) = 1cb4e913f2e6708e332a460c04eba784
-SHA256 (ffmpeg-2009-08-12.tar.bz2) = 952e3ca78405be51d4c8ba4a0059b130fa6237463cadeda6b41664309a4a15df
-SIZE (ffmpeg-2009-08-12.tar.bz2) = 2846957
+MD5 (ffmpeg-2010-04-18.tar.bz2) = 469475ce63379d3858e92137446fd4ec
+SHA256 (ffmpeg-2010-04-18.tar.bz2) = f6cd1b2807fc92f0a2fdbce41231bc17ae37a352fbcdc5de1f02eda3ef14ef0a
+SIZE (ffmpeg-2010-04-18.tar.bz2) = 3693733
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c
new file mode 100644
index 000000000000..7e1368f823fb
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c
@@ -0,0 +1,11 @@
+--- libavcodec/libgsm.c.orig	2010-04-18 19:05:53.640509610 +0200
++++ libavcodec/libgsm.c	2010-04-18 19:05:59.140526816 +0200
+@@ -28,7 +28,7 @@
+ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
+ 
+ #include "avcodec.h"
+-#include <gsm/gsm.h>
++#include <gsm.h>
+ 
+ // gsm.h misses some essential constants
+ #define GSM_BLOCK_SIZE 33
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index a8118a71caa4..bbf6eb1f849b 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/ffmpeg
+bin/ffprobe
 %%FFSERVER%%bin/ffserver
 %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
 %%FFSERVER%%etc/ffserver.conf-dist
@@ -30,7 +31,10 @@ include/ffmpeg/swscale.h
 include/ffmpeg/vdpau.h
 include/ffmpeg/xvmc.h
 include/libavcodec/avcodec.h
+include/libavcodec/avfft.h
+include/libavcodec/dxva2.h
 include/libavcodec/opt.h
+include/libavcodec/vaapi.h
 include/libavcodec/vdpau.h
 include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
@@ -38,11 +42,14 @@ include/libavfilter/avfilter.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
 include/libavutil/adler32.h
+include/libavutil/attributes.h
+include/libavutil/avconfig.h
 include/libavutil/avstring.h
 include/libavutil/avutil.h
 include/libavutil/base64.h
 include/libavutil/common.h
 include/libavutil/crc.h
+include/libavutil/error.h
 include/libavutil/fifo.h
 include/libavutil/intfloat_readwrite.h
 include/libavutil/log.h
@@ -50,6 +57,7 @@ include/libavutil/lzo.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
+include/libavutil/pixdesc.h
 include/libavutil/pixfmt.h
 include/libavutil/rational.h
 include/libavutil/sha1.h
@@ -59,30 +67,30 @@ include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.52.32.0
+lib/libavcodec.so.52.66.0
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.1
 lib/libavdevice.so.52.2.0
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.0.5.0
+lib/libavfilter.so.1.19.0
 lib/libavfilter.so.1
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.52.37.0
+lib/libavformat.so.52.61.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.50.3.0
+lib/libavutil.so.50.14.0
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.1
 lib/libpostproc.so.51.2.0
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.0.7.1
+lib/libswscale.so.0.10.0
 lib/libswscale.so.1
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
@@ -93,6 +101,10 @@ libdata/pkgconfig/libpostproc.pc
 libdata/pkgconfig/libswscale.pc
 %%DATADIR%%/libx264-baseline.ffpreset
 %%DATADIR%%/libx264-default.ffpreset
+%%DATADIR%%/libx264-fast.ffpreset
+%%DATADIR%%/libx264-fast_firstpass.ffpreset
+%%DATADIR%%/libx264-faster.ffpreset
+%%DATADIR%%/libx264-faster_firstpass.ffpreset
 %%DATADIR%%/libx264-fastfirstpass.ffpreset
 %%DATADIR%%/libx264-hq.ffpreset
 %%DATADIR%%/libx264-ipod320.ffpreset
@@ -105,9 +117,25 @@ libdata/pkgconfig/libswscale.pc
 %%DATADIR%%/libx264-lossless_ultrafast.ffpreset
 %%DATADIR%%/libx264-main.ffpreset
 %%DATADIR%%/libx264-max.ffpreset
+%%DATADIR%%/libx264-medium.ffpreset
+%%DATADIR%%/libx264-medium_firstpass.ffpreset
 %%DATADIR%%/libx264-normal.ffpreset
+%%DATADIR%%/libx264-placebo.ffpreset
+%%DATADIR%%/libx264-placebo_firstpass.ffpreset
+%%DATADIR%%/libx264-slow.ffpreset
+%%DATADIR%%/libx264-slow_firstpass.ffpreset
+%%DATADIR%%/libx264-slower.ffpreset
+%%DATADIR%%/libx264-slower_firstpass.ffpreset
 %%DATADIR%%/libx264-slowfirstpass.ffpreset
-@dirrm %%DATADIR%%
+%%DATADIR%%/libx264-superfast.ffpreset
+%%DATADIR%%/libx264-superfast_firstpass.ffpreset
+%%DATADIR%%/libx264-ultrafast.ffpreset
+%%DATADIR%%/libx264-ultrafast_firstpass.ffpreset
+%%DATADIR%%/libx264-veryfast.ffpreset
+%%DATADIR%%/libx264-veryfast_firstpass.ffpreset
+%%DATADIR%%/libx264-veryslow.ffpreset
+%%DATADIR%%/libx264-veryslow_firstpass.ffpreset
+@dirrm %%DATADIR%%/
 @dirrm include/postproc
 @dirrm include/libswscale
 @dirrm include/libpostproc