- Update to 2010-07-25

3 files changed, 29 insertions, 30 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 444500cf7683..a09c6a034fcb 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2010-04-18
-PORTREVISION=	3
+DISTVERSION=	2010-07-25
 CATEGORIES=	multimedia audio ipv6 net
-MASTER_SITES=	http://people.freebsd.org/~mm/distfiles/
-PKGNAMESUFFIX=	-devel
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	mm
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
@@ -31,7 +30,6 @@ 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 \
 		LAME	"LAME MP3 encoder" off \
@@ -99,13 +97,13 @@ PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
 DOC_FILES=	Changelog COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 \
-		COPYING.LGPLv3 CREDITS INSTALL MAINTAINERS README
+		COPYING.LGPLv3 CREDITS INSTALL LICENSE MAINTAINERS README
 # under doc subdirectory
-DOC_DOCFILES=	APIchanges avutil.txt faq.html ffmpeg-doc.html \
-		ffmpeg_powerpc_performance_evaluation_howto.txt \
-		ffplay-doc.html ffserver-doc.html general.html \
-		issue_tracker.txt optimization.txt \
-		snow.txt soc.txt swscale.txt TODO
+DOC_DOCFILES=	APIchanges TODO avutil.txt developer.html faq.html \
+		ffmpeg-doc.html ffplay-doc.html ffprobe-doc.html \
+		ffserver-doc.html general.html issue_tracker.txt \
+		libavfilter.html optimization.txt rate_distortion.txt \
+		snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt
 PORTDOCS=	*
 
 .if !defined(WITHOUT_SSSE3)
@@ -183,15 +181,6 @@ CONFIGURE_ARGS+=	--enable-libfaac --enable-nonfree
 CONFIGURE_ARGS+=	--disable-libfaac
 .endif
 
-# faad
-.ifndef(WITHOUT_FAAD)
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
-CONFIGURE_ARGS+=	--enable-libfaad \
-			--enable-libfaadbin
-.else
-CONFIGURE_ARGS+=	--disable-libfaad
-.endif
-
 # ffserver
 .ifndef(WITHOUT_FFSERVER)
 PLIST_SUB+=	FFSERVER=""
@@ -290,8 +279,6 @@ pre-configure:
 .endif
 
 post-patch:
-# faad compat
-	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/subdir.mak
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index e73b790cfb7e..8508f5d98dea 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2010-04-18.tar.bz2) = 469475ce63379d3858e92137446fd4ec
-SHA256 (ffmpeg-2010-04-18.tar.bz2) = f6cd1b2807fc92f0a2fdbce41231bc17ae37a352fbcdc5de1f02eda3ef14ef0a
-SIZE (ffmpeg-2010-04-18.tar.bz2) = 3693733
+MD5 (ffmpeg-2010-07-25.tar.bz2) = ccd60e8c8869a32bc91bb54f71862e56
+SHA256 (ffmpeg-2010-07-25.tar.bz2) = 2af1dbde675cd08af5f9e885eccf07e17f56f811c612a9b7f0558ed8bbe4e15d
+SIZE (ffmpeg-2010-07-25.tar.bz2) = 3846115
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index bbf6eb1f849b..6d739b97dcc6 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -37,6 +37,7 @@ include/libavcodec/opt.h
 include/libavcodec/vaapi.h
 include/libavcodec/vdpau.h
 include/libavcodec/xvmc.h
+include/libavcore/avcore.h
 include/libavdevice/avdevice.h
 include/libavfilter/avfilter.h
 include/libavformat/avformat.h
@@ -47,11 +48,15 @@ include/libavutil/avconfig.h
 include/libavutil/avstring.h
 include/libavutil/avutil.h
 include/libavutil/base64.h
+include/libavutil/bswap.h
 include/libavutil/common.h
 include/libavutil/crc.h
 include/libavutil/error.h
+include/libavutil/eval.h
 include/libavutil/fifo.h
 include/libavutil/intfloat_readwrite.h
+include/libavutil/intreadwrite.h
+include/libavutil/lfg.h
 include/libavutil/log.h
 include/libavutil/lzo.h
 include/libavutil/mathematics.h
@@ -59,6 +64,7 @@ include/libavutil/md5.h
 include/libavutil/mem.h
 include/libavutil/pixdesc.h
 include/libavutil/pixfmt.h
+include/libavutil/random_seed.h
 include/libavutil/rational.h
 include/libavutil/sha1.h
 include/libpostproc/postprocess.h
@@ -67,32 +73,37 @@ include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.52.66.0
+lib/libavcodec.so.52.84.0
+lib/libavcore.a
+lib/libavcore.so
+lib/libavcore.so.0.0.0
+lib/libavcore.so.1
 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.1.19.0
+lib/libavfilter.so.1.26.1
 lib/libavfilter.so.1
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.52.61.0
+lib/libavformat.so.52.77.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.50.14.0
+lib/libavutil.so.50.23.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.10.0
+lib/libswscale.so.0.11.0
 lib/libswscale.so.1
 libdata/pkgconfig/libavcodec.pc
+libdata/pkgconfig/libavcore.pc
 libdata/pkgconfig/libavdevice.pc
 libdata/pkgconfig/libavfilter.pc
 libdata/pkgconfig/libavformat.pc
@@ -143,5 +154,6 @@ libdata/pkgconfig/libswscale.pc
 @dirrm include/libavformat
 @dirrm include/libavfilter
 @dirrm include/libavdevice
+@dirrm include/libavcore
 @dirrm include/libavcodec
 @dirrm include/ffmpeg