update to 20101018.0.6.1, from Makoto Fujiwara per pkgsrc-wip,

with two changes by me:
-disabled symbol versioning - this didn't work correctly for me
-changed PKGVERSION to start with the release date, so that it
sorts correctly against the snapshots we had before
vlc-1.0.6 does still build, but can be updated now

13 files changed, 194 insertions, 258 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 33644497e1b..8748a11fa98 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2010/10/24 22:00:15 ahoka Exp $
+# $NetBSD: Makefile,v 1.63 2011/01/17 16:51:04 drochner Exp $
 
-PKGREVISION=	8
+# XXX This is release 0.6.1 but we had date-based pkgnames before.
+PKGNAME=	ffmpeg-20101018.0.6.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
@@ -8,11 +9,12 @@ COMMENT=	Decoding, encoding and streaming software
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFIGURE_ARGS+=	--enable-avfilter \
-			--enable-avfilter-lavf \
-			--enable-postproc \
-			--enable-libvorbis \
-			--enable-libmp3lame
+CONFIGURE_ARGS+=	--enable-avfilter
+CONFIGURE_ARGS+=	--enable-avfilter-lavf
+CONFIGURE_ARGS+=	--enable-postproc
+CONFIGURE_ARGS+=	--enable-libvorbis
+CONFIGURE_ARGS+=	--enable-libmp3lame
+CONFIGURE_ARGS+=	--enable-libx264
 
 INSTALLATION_DIRS=	lib share/examples/ffmpeg share/doc/ffmpeg
 
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index 5275562888c..78d2c581dce 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.7 2010/09/05 22:55:18 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2011/01/17 16:51:04 drochner Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
 DISTNAME=	ffmpeg-${DISTVERSION:S/-//g}
 CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/ahoka/dist/ \
+MASTER_SITES=	http://www.ffmpeg.org/releases/ \
+		ftp://ftp.NetBSD.org/pub/NetBSD/misc/ahoka/dist/ \
 		http://irkmaffia.com/~ahoka/distfiles/
 EXTRACT_SUFX=	.tar.bz2
 
-DISTVERSION=	2009-06-11
+DISTVERSION=	0.6.1
 PREV_PKGPATH=	multimedia/ffmpeg-devel
-WRKSRC=		${WRKDIR}/ffmpeg-export-${DISTVERSION}
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
 HAS_CONFIGURE=	YES
@@ -48,21 +48,25 @@ MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q}
 # LOCALBASE=${LOCALBASE:Q}
 
 # Let's not put garbage into /tmp
-CONFIGURE_ENV+=		TMPDIR=${WRKSRC:Q}/tmp
-
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR} \
-			--cc=${CC:Q} \
-			--prefix=${PREFIX:Q} \
-			--disable-debug \
-			--disable-stripping \
-			--enable-shared \
-			--enable-pthreads \
-			--enable-gpl
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--disable-amd3dnow --disable-amd3dnowext
-CONFIGURE_ARGS+=	--disable-mmx --disable-mmx2
-CONFIGURE_ARGS+=	--disable-sse --disable-ssse3
+CONFIGURE_ENV+=		TMPDIR=${WRKSRC}/tmp
+
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--cc=${CC:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--disable-optimizations
+CONFIGURE_ARGS+=	--disable-stripping
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ARGS+=	--enable-gpl
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--disable-amd3dnow
+CONFIGURE_ARGS+=	--disable-amd3dnowext
+CONFIGURE_ARGS+=	--disable-mmx
+CONFIGURE_ARGS+=	--disable-mmx2
+CONFIGURE_ARGS+=	--disable-sse
+CONFIGURE_ARGS+=	--disable-ssse3
 .else
 CONFIGURE_ARGS+=	--enable-runtime-cpudetect
 .endif
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index d9e9801a21b..e460bc58728 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:08:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/01/17 16:51:05 drochner Exp $
 bin/ffmpeg
+bin/ffprobe
 bin/ffserver
 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
@@ -10,11 +14,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
@@ -22,6 +29,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
@@ -30,23 +38,23 @@ include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.52
-lib/libavcodec.so.52.30.2
+lib/libavcodec.so.52.72.2
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.52
 lib/libavdevice.so.52.2.0
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.0
-lib/libavfilter.so.0.5.0
+lib/libavfilter.so.1
+lib/libavfilter.so.1.19.0
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.52
-lib/libavformat.so.52.34.0
+lib/libavformat.so.52.64.2
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.50
-lib/libavutil.so.50.3.0
+lib/libavutil.so.50.15.1
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.51
@@ -54,7 +62,7 @@ lib/libpostproc.so.51.2.0
 lib/libswscale.a
 lib/libswscale.so
 lib/libswscale.so.0
-lib/libswscale.so.0.7.1
+lib/libswscale.so.0.11.0
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
@@ -63,6 +71,7 @@ lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
 lib/pkgconfig/libswscale.pc
 man/man1/ffmpeg.1
+man/man1/ffprobe.1
 man/man1/ffserver.1
 share/doc/ffmpeg/README
 share/doc/ffmpeg/TODO
@@ -75,10 +84,15 @@ share/doc/ffmpeg/rate_distortion.txt
 share/doc/ffmpeg/snow.txt
 share/doc/ffmpeg/soc.txt
 share/doc/ffmpeg/swscale.txt
+share/doc/ffmpeg/tablegen.txt
 share/doc/ffmpeg/viterbi.txt
 share/examples/ffmpeg/ffserver.conf
 share/ffmpeg/libx264-baseline.ffpreset
 share/ffmpeg/libx264-default.ffpreset
+share/ffmpeg/libx264-fast.ffpreset
+share/ffmpeg/libx264-fast_firstpass.ffpreset
+share/ffmpeg/libx264-faster.ffpreset
+share/ffmpeg/libx264-faster_firstpass.ffpreset
 share/ffmpeg/libx264-fastfirstpass.ffpreset
 share/ffmpeg/libx264-hq.ffpreset
 share/ffmpeg/libx264-ipod320.ffpreset
@@ -91,5 +105,21 @@ share/ffmpeg/libx264-lossless_slower.ffpreset
 share/ffmpeg/libx264-lossless_ultrafast.ffpreset
 share/ffmpeg/libx264-main.ffpreset
 share/ffmpeg/libx264-max.ffpreset
+share/ffmpeg/libx264-medium.ffpreset
+share/ffmpeg/libx264-medium_firstpass.ffpreset
 share/ffmpeg/libx264-normal.ffpreset
+share/ffmpeg/libx264-placebo.ffpreset
+share/ffmpeg/libx264-placebo_firstpass.ffpreset
+share/ffmpeg/libx264-slow.ffpreset
+share/ffmpeg/libx264-slow_firstpass.ffpreset
+share/ffmpeg/libx264-slower.ffpreset
+share/ffmpeg/libx264-slower_firstpass.ffpreset
 share/ffmpeg/libx264-slowfirstpass.ffpreset
+share/ffmpeg/libx264-superfast.ffpreset
+share/ffmpeg/libx264-superfast_firstpass.ffpreset
+share/ffmpeg/libx264-ultrafast.ffpreset
+share/ffmpeg/libx264-ultrafast_firstpass.ffpreset
+share/ffmpeg/libx264-veryfast.ffpreset
+share/ffmpeg/libx264-veryfast_firstpass.ffpreset
+share/ffmpeg/libx264-veryslow.ffpreset
+share/ffmpeg/libx264-veryslow_firstpass.ffpreset
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
index b59394dbee6..7ee83928557 100644
--- a/multimedia/ffmpeg/buildlink3.mk
+++ b/multimedia/ffmpeg/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/06/12 16:39:49 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2011/01/17 16:51:05 drochner Exp $
 
 BUILDLINK_TREE+=	ffmpeg
 
 .if !defined(FFMPEG_BUILDLINK3_MK)
 FFMPEG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=20090611
-BUILDLINK_ABI_DEPENDS.ffmpeg?=	ffmpeg>=20090611
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.6.1
+BUILDLINK_ABI_DEPENDS.ffmpeg?=	ffmpeg>=0.6.1
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 
 pkgbase := ffmpeg
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 1b4f5befa9f..e7b5dc1a7c6 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.38 2010/12/03 12:22:19 wiz Exp $
+$NetBSD: distinfo,v 1.39 2011/01/17 16:51:05 drochner Exp $
 
-SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
-RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
-Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
+SHA1 (ffmpeg-0.6.1.tar.bz2) = 24ada1d35fc000980090e773101e101ca45f85e5
+RMD160 (ffmpeg-0.6.1.tar.bz2) = b85d513c11b0ee30aecb77f4e4c0b94ddd72f7d9
+Size (ffmpeg-0.6.1.tar.bz2) = 3644146 bytes
 SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
-SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7
-SHA1 (patch-ac) = 637911af6e8058f99a624b106743fae807e440e1
-SHA1 (patch-ad) = ebee8a9e3d5caa533459e1547690ee6c2f095018
-SHA1 (patch-ae) = ae9d686450fb6fa1161bb2844282bf530148e368
-SHA1 (patch-af) = 2507866ddc72c7e8ff10b489c86cb679e8e2fd49
-SHA1 (patch-bktr) = 24d691b5360cbe1beb1e0ee33641c1058923af63
-SHA1 (patch-configure) = 2676c15b2fccdf4cde817f6f143885b3faea2467
+SHA1 (patch-ac) = d29395cf05612d6be213a69eafaf549c802b6ce1
+SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
+SHA1 (patch-ae) = 7734efe9f6b496ca292d17859cffcc0129aaa90b
+SHA1 (patch-af) = d29dd9ae373fd086d3c3b952d8831af1717a8ddf
+SHA1 (patch-bktr) = 62c31edc0fa0712d438d0e1ea6539749bfd1df34
+SHA1 (patch-configure) = 3de6a217d60897208e71f201e551095e9d36f8be
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 3ba87848b5f..68b03a8183f 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2010/09/05 22:55:58 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2011/01/17 16:51:05 drochner Exp $
 
 # Global and legacy options
 
@@ -20,31 +20,29 @@ PKG_SUGGESTED_OPTIONS+=	vdpau
 ###
 ### faad option
 ###
-
 .if !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=  --enable-libfaad
+CONFIGURE_ARGS+=	--enable-libfaad
 .include "../../audio/faad2/buildlink3.mk"
 .endif
 
 ###
 ### faac option
 ###
-
 .if !empty(PKG_OPTIONS:Mfaac)
 RESTRICTED=		This software may require the payment of patent royalties
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
-CONFIGURE_ARGS+=	--enable-libfaac \
-			--enable-nonfree
+CONFIGURE_ARGS+=	--enable-libfaac
+CONFIGURE_ARGS+=	--enable-nonfree
 .include "../../audio/faac/buildlink3.mk"
 .endif
 
 ###
 ### opencore-amr option
 ###
-
 .if !empty(PKG_OPTIONS:Mopencore-amr)
-CONFIGURE_ARGS+=  --enable-libopencore-amrnb --enable-libopencore-amrwb
+CONFIGURE_ARGS+=	--enable-libopencore-amrnb
+CONFIGURE_ARGS+=	--enable-libopencore-amrwb
 
 # "The OpenCORE external libraries are under the Apache License
 # 2.0. That license is incompatible with the LGPL v2.1 and the GPL
@@ -56,37 +54,34 @@ CONFIGURE_ARGS+=	--enable-version3
 
 .include "../../audio/opencore-amr/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=  --disable-libopencore-amrnb --disable-libopencore-amrwb
+CONFIGURE_ARGS+=	--disable-libopencore-amrnb
+CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 .endif
 
 ###
 ### OGG Theora support
 ###
-
 .if !empty(PKG_OPTIONS:Mtheora)
-CONFIGURE_ARGS+=  --enable-libtheora
+CONFIGURE_ARGS+=	--enable-libtheora
 .include "../../multimedia/libtheora/buildlink3.mk"
 .endif
 
 ###
 ### XviD support
 ###
-
 .if !empty(PKG_OPTIONS:Mxvid)
-CONFIGURE_ARGS+=  --enable-libxvid
+CONFIGURE_ARGS+=	--enable-libxvid
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .endif
 
 ###
 ### x264 support
 ###
-
 .if !empty(PKG_OPTIONS:Mx264)
-# ABI change between 20090326 and 20090920
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20090920
-# incompatible API change on 20090921
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel<20090921
-CONFIGURE_ARGS+=  --enable-libx264
+# ABI change between 20090326 and 20100201
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20101101
+#BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel<20110102
+CONFIGURE_ARGS+=	--enable-libx264
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .endif
 
@@ -96,5 +91,5 @@ CONFIGURE_ARGS+=  --enable-libx264
 .if !empty(PKG_OPTIONS:Mvdpau)
 .include "../../multimedia/libvdpau/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --disable-vdpau
+CONFIGURE_ARGS+=	--disable-vdpau
 .endif
diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab
deleted file mode 100644
index 734037bac9f..00000000000
--- a/multimedia/ffmpeg/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/09/25 11:10:21 tron Exp $
-
-Patch for the vulnerability reported in SA36760, taken from here:
-
-http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=ebbccbaa5e925c2ddb212559f82c29ef526cc17e
-http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=7798d31bee361724e0a6ede4e2fd67228f24040b
-
---- libavformat/sierravmd.c.orig	2009-02-16 14:45:05.000000000 +0000
-+++ libavformat/sierravmd.c	2009-09-25 11:49:56.000000000 +0100
-@@ -154,7 +154,7 @@
-     vmd->frame_table = NULL;
-     sound_buffers = AV_RL16(&vmd->vmd_header[808]);
-     raw_frame_table_size = vmd->frame_count * 6;
--    if(vmd->frame_count * vmd->frames_per_block  >= UINT_MAX / sizeof(vmd_frame)){
-+    if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame) - sound_buffers){
-         av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n");
-         return -1;
-     }
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index 8a576af9625..5915b46c501 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,35 +1,27 @@
-$NetBSD: patch-ac,v 1.8 2010/12/03 12:22:19 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2011/01/17 16:51:05 drochner Exp $
 
-Avoid using obsolete texi2html command line flags.
-Fix installation using the "install-sh" the package.
-
---- Makefile.orig	2009-05-28 22:13:17.000000000 +0000
-+++ Makefile
-@@ -80,7 +80,7 @@ documentation: $(addprefix doc/, ffmpeg-
-                                  ffplay-doc.html general.html $(ALLMANPAGES))
+--- Makefile.orig	2010-04-19 22:05:26.000000000 +0900
++++ Makefile	2011-01-05 17:04:14.000000000 +0900
+@@ -107,7 +107,7 @@
  
+ doc/%.html: TAG = HTML
  doc/%.html: doc/%.texi
--	texi2html -monolithic -number $<
-+	texi2html -monolithic -number-sections $<
- 	mv $(@F) $@
+-	$(M)cd doc && texi2html -monolithic -number $(<:doc/%=%)
++	$(M)cd doc && texi2html -monolithic -number-sections $(<:doc/%=%)
  
+ doc/%.pod: TAG = POD
  doc/%.pod: doc/%-doc.texi
-@@ -93,15 +93,15 @@ install: $(INSTALL_TARGETS-yes)
- 
- install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
- 	install -d "$(BINDIR)"
--	install -c -m 755 $(PROGS) "$(BINDIR)"
-+	install -c -c -m 755 $(PROGS) "$(BINDIR)"
+@@ -125,11 +125,11 @@
  
  install-data: $(DATA_FILES)
- 	install -d "$(DATADIR)"
--	install -m 644 $(DATA_FILES) "$(DATADIR)"
-+	install -c -m 644 $(DATA_FILES) "$(DATADIR)"
+ 	$(Q)mkdir -p "$(DATADIR)"
+-	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
++	$(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
  
  install-man: $(MANPAGES)
- 	install -d "$(MANDIR)/man1"
--	install -m 644 $(MANPAGES) "$(MANDIR)/man1"
-+	install -c -m 644 $(MANPAGES) "$(MANDIR)/man1"
+ 	$(Q)mkdir -p "$(MANDIR)/man1"
+-	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
++	$(INSTALL) -c -m 644 $(MANPAGES) "$(MANDIR)/man1"
  
  uninstall: uninstall-progs uninstall-data uninstall-man
  
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
index 80b555239d8..aa5c955bc2c 100644
--- a/multimedia/ffmpeg/patches/patch-ad
+++ b/multimedia/ffmpeg/patches/patch-ad
@@ -1,33 +1,33 @@
-$NetBSD: patch-ad,v 1.8 2010/03/14 21:44:49 tron Exp $
+$NetBSD: patch-ad,v 1.9 2011/01/17 16:51:05 drochner Exp $
 
-Fix installation using the "install-sh" the package.
-
---- subdir.mak.orig	Wed May 20 20:37:34 2009
-+++ subdir.mak	Sun Mar 14 22:37:07 2010
-@@ -64,7 +64,7 @@
+--- subdir.mak.orig	2010-03-17 23:43:05.000000000 +0900
++++ subdir.mak	2011-01-05 17:06:02.000000000 +0900
+@@ -59,7 +59,7 @@
  
  install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
- 	install -d "$(SHLIBDIR)"
--	install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-+	install -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
- 	$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
- 	cd "$(SHLIBDIR)" && \
+ 	$(Q)mkdir -p "$(SHLIBDIR)"
+-	$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
++	$$(INSTALL) -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+ 	$$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+ 	$(Q)cd "$(SHLIBDIR)" && \
  		$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-@@ -74,14 +74,14 @@
+@@ -69,16 +69,16 @@
  
  install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
- 	install -d "$(LIBDIR)"
--	install -m 644 $$< "$(LIBDIR)"
-+	install -c -m 644 $$< "$(LIBDIR)"
+ 	$(Q)mkdir -p "$(LIBDIR)"
+-	$$(INSTALL) -m 644 $$< "$(LIBDIR)"
++	$$(INSTALL) -c -m 644 $$< "$(LIBDIR)"
  	$(LIB_INSTALL_EXTRA_CMD)
  
- install-headers::
- 	install -d "$(INCINSTDIR)"
- 	install -d "$(LIBDIR)/pkgconfig"
--	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
--	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
-+	install -c -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
-+	install -c -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
+ 	$(Q)mkdir -p "$(INCINSTDIR)"
+-	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
++	$$(INSTALL) -c -m 644 $$^ "$(INCINSTDIR)"
+ 
+ install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+ 	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
+-	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
++	$$(INSTALL) -c -m 644 $$^ "$(LIBDIR)/pkgconfig"
  
  uninstall-libs::
- 	-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+ 	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
index f80667736bc..e33d18d136b 100644
--- a/multimedia/ffmpeg/patches/patch-ae
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -1,25 +1,22 @@
-$NetBSD: patch-ae,v 1.11 2010/05/24 22:10:02 tron Exp $
+$NetBSD: patch-ae,v 1.12 2011/01/17 16:51:05 drochner Exp $
 
-Really turn AMD 3DNow (and MMX, etc.) because the shared library
-will otherwise not build (Mac OS X) or work (Solaris) on Intel CPUs.
-
---- libswscale/rgb2rgb.c.orig	Thu Mar 19 04:45:29 2009
-+++ libswscale/rgb2rgb.c	Sun Mar 14 23:55:39 2010
-@@ -101,7 +101,7 @@
-                                       long lumStride, long chromStride, long srcStride);
+--- libswscale/rgb2rgb.c.orig	2010-06-04 05:16:42.000000000 +0900
++++ libswscale/rgb2rgb.c	2011-01-05 17:09:12.000000000 +0900
+@@ -98,7 +98,7 @@
+                      long lumStride, long chromStride, long srcStride);
  
  
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
+-#if ARCH_X86
++#if ARCH_X86 && !defined(sun)
  DECLARE_ASM_CONST(8, uint64_t, mmx_null)     = 0x0000000000000000ULL;
  DECLARE_ASM_CONST(8, uint64_t, mmx_one)      = 0xFFFFFFFFFFFFFFFFULL;
  DECLARE_ASM_CONST(8, uint64_t, mask32b)      = 0x000000FF000000FFULL;
-@@ -162,7 +162,7 @@
+@@ -159,7 +159,7 @@
  #define RENAME(a) a ## _C
  #include "rgb2rgb_template.c"
  
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun) && !defined(__APPLE__)
+-#if ARCH_X86
++#if ARCH_X86 && !defined(sun) && !defined(__APPLE__)
  
  //MMX versions
  #undef RENAME
diff --git a/multimedia/ffmpeg/patches/patch-af b/multimedia/ffmpeg/patches/patch-af
index 3346a971703..16704773eca 100644
--- a/multimedia/ffmpeg/patches/patch-af
+++ b/multimedia/ffmpeg/patches/patch-af
@@ -1,37 +1,26 @@
-$NetBSD: patch-af,v 1.7 2010/03/14 23:07:30 tron Exp $
+$NetBSD: patch-af,v 1.8 2011/01/17 16:51:05 drochner Exp $
 
-1.) Fixes pkg/42000, not necessary after the next upgrade.
-2.) Really turn AMD 3DNow (and MMX, etc.) because the shared library
-    will otherwise not work on Intel CPUs.
-
---- libswscale/swscale.c.orig	Thu Jun  4 23:55:52 2009
-+++ libswscale/swscale.c	Sun Mar 14 23:53:08 2010
-@@ -221,7 +221,7 @@
+--- libswscale/swscale.c.orig	2010-06-04 05:16:42.000000000 +0900
++++ libswscale/swscale.c	2011-01-05 17:13:47.000000000 +0900
+@@ -127,7 +127,7 @@
  write special BGR->BGR scaler
  */
  
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
+-#if ARCH_X86
++#if ARCH_X86 && !defined(sun)
  DECLARE_ASM_CONST(8, uint64_t, bF8)=       0xF8F8F8F8F8F8F8F8LL;
  DECLARE_ASM_CONST(8, uint64_t, bFC)=       0xFCFCFCFCFCFCFCFCLL;
  DECLARE_ASM_CONST(8, uint64_t, w10)=       0x0010001000100010LL;
-@@ -1307,12 +1307,14 @@
- 
- #if ARCH_PPC
- #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
-+#if !CONFIG_RUNTIME_CPUDETECT
- #undef COMPILE_C
-+#endif
- #define COMPILE_ALTIVEC
+@@ -1161,7 +1161,7 @@
  #endif
  #endif //ARCH_PPC
  
 -#if ARCH_X86
 +#if ARCH_X86 && !defined(sun)
  
- #if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+ #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT
  #define COMPILE_MMX
-@@ -1349,7 +1351,7 @@
+@@ -1194,7 +1194,7 @@
  #include "swscale_template.c"
  #endif
  
@@ -40,48 +29,3 @@ $NetBSD: patch-af,v 1.7 2010/03/14 23:07:30 tron Exp $
  
  //MMX versions
  #ifdef COMPILE_MMX
-@@ -1417,7 +1419,7 @@
-     int64_t *filter2=NULL;
-     const int64_t fone= 1LL<<54;
-     int ret= -1;
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     if (flags & SWS_CPU_CAPS_MMX)
-         __asm__ volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions)
- #endif
-@@ -1976,7 +1978,7 @@
- #if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL
-     int flags = c->flags;
- 
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     // ordered per speed fastest first
-     if (flags & SWS_CPU_CAPS_MMX2) {
-         sws_init_swScale_MMX2(c);
-@@ -2561,7 +2563,7 @@
-     int unscaled, needsDither;
-     int srcRange, dstRange;
-     SwsFilter dummyFilter= {NULL, NULL, NULL, NULL};
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-     if (flags & SWS_CPU_CAPS_MMX)
-         __asm__ volatile("emms\n\t"::: "memory");
- #endif
-@@ -3046,7 +3048,7 @@
-         }
-         else
-         {
--#if ARCH_X86
-+#if ARCH_X86 && !defined(sun)
-             av_log(c, AV_LOG_VERBOSE, "using x86 asm scaler for horizontal scaling\n");
- #else
-             if (flags & SWS_FAST_BILINEAR)
-@@ -3555,7 +3557,7 @@
-     av_freep(&c->hLumFilterPos);
-     av_freep(&c->hChrFilterPos);
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(sun)
- #ifdef MAP_ANONYMOUS
-     if (c->funnyYCode ) munmap(c->funnyYCode , MAX_FUNNY_CODE_SIZE);
-     if (c->funnyUVCode) munmap(c->funnyUVCode, MAX_FUNNY_CODE_SIZE);
diff --git a/multimedia/ffmpeg/patches/patch-bktr b/multimedia/ffmpeg/patches/patch-bktr
index 99732598e3f..74d3cccbda4 100644
--- a/multimedia/ffmpeg/patches/patch-bktr
+++ b/multimedia/ffmpeg/patches/patch-bktr
@@ -1,25 +1,18 @@
-$NetBSD: patch-bktr,v 1.4 2010/09/05 22:55:24 wiz Exp $
+$NetBSD: patch-bktr,v 1.5 2011/01/17 16:51:05 drochner Exp $
 
---- libavdevice/bktr.c.orig	2009-01-19 15:46:40 +0000
-+++ libavdevice/bktr.c	2009-09-21 11:29:29 +0000
-@@ -24,7 +24,11 @@
+--- libavdevice/bktr.c.orig	2010-03-31 08:30:55.000000000 +0900
++++ libavdevice/bktr.c	2011-01-05 16:58:47.000000000 +0900
+@@ -24,8 +24,12 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +/* u_short, u_int */
  #define _BSD_SOURCE 1
+-#define _NETBSD_SOURCE
++ #define _BSD_SOURCE 1
 +#ifdef __NetBSD__
 +# define _NETBSD_SOURCE 1
 +#endif
+ 
  #include "libavformat/avformat.h"
  #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
- # include <dev/bktr/ioctl_meteor.h>
-@@ -32,7 +36,7 @@
- #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
- # include <machine/ioctl_meteor.h>
- # include <machine/ioctl_bt848.h>
--#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H
-+#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H
- # include <dev/video/meteor/ioctl_meteor.h>
- # include <dev/video/bktr/ioctl_bt848.h>
- #elif HAVE_DEV_IC_BT8XX_H
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index 159a7914c7b..0334a97dc20 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,31 +1,22 @@
-$NetBSD: patch-configure,v 1.10 2010/05/04 18:33:43 drochner Exp $
+$NetBSD: patch-configure,v 1.11 2011/01/17 16:51:05 drochner Exp $
 
---- configure.orig	2009-06-10 20:50:53.000000000 +0000
+--- configure.orig	2010-06-15 19:44:30.000000000 +0000
 +++ configure
-@@ -1619,6 +1619,10 @@ case $target_os in
-         add_cflags -D__EXTENSIONS__
+@@ -2160,6 +2160,10 @@ case $target_os in
+         nm_opts='-P -g'
          ;;
      netbsd)
-+	if test "${subarch}" != "x86_32"; then
-+	    LIBOBJFLAGS='$(PIC)'
-+	    SHFLAGS='-shared'
-+	fi
-         oss_demuxer_extralibs="-lossaudio"
-         oss_muxer_extralibs="-lossaudio"
-         ;;
-@@ -1632,6 +1636,8 @@ case $target_os in
-     freebsd)
-         disable need_memalign
-         ;;
-+    dragonfly)
-+        ;;
-     bsd/os)
-         osextralibs="-lpoll -lgnugetopt"
-         strip="strip -d"
-@@ -1996,10 +2002,13 @@ enabled vis && add_cflags -mcpu=ultraspa
++        if test "${subarch}" != "x86_32"; then
++            LIBOBJFLAGS='$(PIC)'
++            SHFLAGS='-shared'
++        fi
+         oss_indev_extralibs="-lossaudio"
+         oss_outdev_extralibs="-lossaudio"
+         add_cppflags -D_XOPEN_SOURCE=600
+@@ -2387,10 +2391,13 @@ check_cc <<EOF && enable attribute_may_a
+ union { int x; } __attribute__((may_alias)) x;
+ EOF
  
- # ---
- # big/little-endian test
 -check_cc <<EOF || die "endian test failed"
 -unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
 +check_exec <<EOF || enable bigendian
@@ -35,16 +26,23 @@ $NetBSD: patch-configure,v 1.10 2010/05/04 18:33:43 drochner Exp $
 + return !(*((char *)(&one)));
 +}
  EOF
--od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
+-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
+ 
+ if enabled alpha; then
+ 
+@@ -2738,6 +2745,7 @@ check_ldflags -Wl,--as-needed
+ check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+ check_ldflags -Wl,-Bsymbolic
+ 
++if false; then
+ echo "X{};" > $TMPV
+ if test_ldflags -Wl,--version-script,$TMPV; then
+     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
+@@ -2750,6 +2758,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+ void ff_foo(void) {}
+ EOF
+ fi
++fi
  
- # ---
- # check availability of some header files
-@@ -2101,7 +2110,7 @@ enabled libschroedinger && add_cflags $(
- enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
- enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
- enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
--enabled libx264    && require  libx264 x264.h x264_encoder_open -lx264 -lm &&
-+enabled libx264    && require  libx264 x264.h x264_encoder_close -lx264 -lm &&
-                       { check_cpp_condition x264.h "X264_BUILD >= 65" ||
-                         die "ERROR: libx264 version must be >= 0.65."; }
- enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
+ if enabled small; then
+     add_cflags $size_cflags