copy ffmpeg10 to ffmpeg, making it the default version

11 files changed, 73 insertions, 111 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a19af2a1988..81b1fa05551 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2012/10/08 09:21:00 asau Exp $
+# $NetBSD: Makefile,v 1.90 2012/10/10 13:33:44 drochner Exp $
 
-# XXX This is release 0.7.13 but we had date-based pkgnames before.
-PKGNAME=	ffmpeg-20120609.${DISTVERSION}
-PKGREVISION=	1
+PKGNAME=	ffmpeg-20120919.${DISTVERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
@@ -23,11 +21,12 @@ CONF_FILES+=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
+# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
+CFLAGS.SunOS+=	-DBROKEN_RELOCATIONS=1
+
 TEST_TARGET=	check
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
-		${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
 		${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index df217f236e0..4ca0c5b524f 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2012/07/02 18:44:31 drochner Exp $
+# $NetBSD: Makefile.common,v 1.22 2012/10/10 13:33:44 drochner Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
@@ -7,7 +7,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-DISTVERSION=	0.7.13
+DISTVERSION=	0.10.5
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index e13fd70b011..0f9b147c52c 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/11/28 11:00:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/10/10 13:33:44 drochner Exp $
 bin/ffmpeg
 bin/ffprobe
 bin/ffserver
@@ -7,6 +7,7 @@ include/libavcodec/avfft.h
 include/libavcodec/dxva2.h
 include/libavcodec/opt.h
 include/libavcodec/vaapi.h
+include/libavcodec/vda.h
 include/libavcodec/vdpau.h
 include/libavcodec/version.h
 include/libavcodec/xvmc.h
@@ -14,7 +15,8 @@ include/libavdevice/avdevice.h
 include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
-include/libavfilter/vsink_buffer.h
+include/libavfilter/buffersink.h
+include/libavfilter/version.h
 include/libavfilter/vsrc_buffer.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
@@ -38,6 +40,7 @@ include/libavutil/eval.h
 include/libavutil/fifo.h
 include/libavutil/file.h
 include/libavutil/imgutils.h
+include/libavutil/intfloat.h
 include/libavutil/intfloat_readwrite.h
 include/libavutil/intreadwrite.h
 include/libavutil/lfg.h
@@ -54,52 +57,56 @@ include/libavutil/random_seed.h
 include/libavutil/rational.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
-include/libavutil/sha1.h
 include/libpostproc/postprocess.h
+include/libswresample/swresample.h
 include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.52
-lib/libavcodec.so.52.123.0
+lib/libavcodec.so.53
+lib/libavcodec.so.53.61.100
 lib/libavdevice.a
 lib/libavdevice.so
-lib/libavdevice.so.52
-lib/libavdevice.so.52.5.0
+lib/libavdevice.so.53
+lib/libavdevice.so.53.4.100
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1
-lib/libavfilter.so.1.80.0
+lib/libavfilter.so.2
+lib/libavfilter.so.2.61.100
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.52
-lib/libavformat.so.52.111.0
+lib/libavformat.so.53
+lib/libavformat.so.53.32.100
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.50
-lib/libavutil.so.50.43.0
+lib/libavutil.so.51
+lib/libavutil.so.51.35.100
 lib/libpostproc.a
 lib/libpostproc.so
-lib/libpostproc.so.51
-lib/libpostproc.so.51.2.0
+lib/libpostproc.so.52
+lib/libpostproc.so.52.0.100
+lib/libswresample.a
+lib/libswresample.so
+lib/libswresample.so.0
+lib/libswresample.so.0.6.100
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.0
-lib/libswscale.so.0.14.1
+lib/libswscale.so.2
+lib/libswscale.so.2.1.100
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
 lib/pkgconfig/libavformat.pc
 lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
+lib/pkgconfig/libswresample.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
 share/doc/ffmpeg/avutil.txt
 share/doc/ffmpeg/build_system.txt
-share/doc/ffmpeg/fate.txt
+share/doc/ffmpeg/errno.txt
+share/doc/ffmpeg/ffmpeg.txt
 share/doc/ffmpeg/git-howto.txt
 share/doc/ffmpeg/issue_tracker.txt
 share/doc/ffmpeg/multithreading.txt
@@ -107,21 +114,16 @@ share/doc/ffmpeg/optimization.txt
 share/doc/ffmpeg/rate_distortion.txt
 share/doc/ffmpeg/snow.txt
 share/doc/ffmpeg/soc.txt
+share/doc/ffmpeg/swresample.txt
 share/doc/ffmpeg/swscale.txt
 share/doc/ffmpeg/tablegen.txt
 share/doc/ffmpeg/viterbi.txt
 share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/ffprobe.xsd
 share/ffmpeg/libvpx-1080p.ffpreset
 share/ffmpeg/libvpx-1080p50_60.ffpreset
 share/ffmpeg/libvpx-360p.ffpreset
 share/ffmpeg/libvpx-720p.ffpreset
 share/ffmpeg/libvpx-720p50_60.ffpreset
-share/ffmpeg/libx264-baseline.ffpreset
 share/ffmpeg/libx264-ipod320.ffpreset
 share/ffmpeg/libx264-ipod640.ffpreset
-share/ffmpeg/libx264-lossless_fast.ffpreset
-share/ffmpeg/libx264-lossless_max.ffpreset
-share/ffmpeg/libx264-lossless_medium.ffpreset
-share/ffmpeg/libx264-lossless_slow.ffpreset
-share/ffmpeg/libx264-lossless_slower.ffpreset
-share/ffmpeg/libx264-lossless_ultrafast.ffpreset
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
index 8e8b6573dbc..91eba79ebf4 100644
--- a/multimedia/ffmpeg/buildlink3.mk
+++ b/multimedia/ffmpeg/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.21 2012/09/27 21:37:55 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2012/10/10 13:33:44 drochner Exp $
 
 BUILDLINK_TREE+=	ffmpeg
 
 .if !defined(FFMPEG_BUILDLINK3_MK)
 FFMPEG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=20120609.0.6.1<20120609.0.10
-BUILDLINK_ABI_DEPENDS.ffmpeg+=	ffmpeg>=20120609.0.7.13nb1
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=20120919.0.10.5
+BUILDLINK_ABI_DEPENDS.ffmpeg+=	ffmpeg>=20120919.0.10.5
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 
 pkgbase := ffmpeg
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 3838c9423fc..b1a9d0e3826 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.56 2012/07/02 18:44:31 drochner Exp $
+$NetBSD: distinfo,v 1.57 2012/10/10 13:33:44 drochner Exp $
 
-SHA1 (ffmpeg-0.7.13.tar.bz2) = f55f553520373e2de644fd05a7feb7a9ce25f797
-RMD160 (ffmpeg-0.7.13.tar.bz2) = 507acb8467784d045e0ba3720822243826d054c1
-Size (ffmpeg-0.7.13.tar.bz2) = 4525507 bytes
+SHA1 (ffmpeg-0.10.5.tar.bz2) = 0afe23de31e68495ceb80344459056059f44c7d9
+RMD160 (ffmpeg-0.10.5.tar.bz2) = acaf5fdcd15eae027bcf156ff897fb9699d12185
+Size (ffmpeg-0.10.5.tar.bz2) = 5774951 bytes
 SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
-SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb
-SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
+SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
 SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3
-SHA1 (patch-configure) = 242f16e06a30b8e55193ee647ab78e9fb2645231
+SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 68aa7184941..64bf44832e8 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2012/02/01 17:56:07 drochner Exp $
+# $NetBSD: options.mk,v 1.25 2012/10/10 13:33:44 drochner Exp $
 
 # Global and legacy options
 
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
index 86c656e6823..11e4baf3ed0 100644
--- a/multimedia/ffmpeg/patches/patch-aa
+++ b/multimedia/ffmpeg/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2011/07/19 19:53:18 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2012/10/10 13:33:44 drochner Exp $
 
 --- libavutil/x86/cpu.c.orig	2011-07-07 20:46:02.000000000 +0000
 +++ libavutil/x86/cpu.c
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index d4266d934f0..b436bb0b815 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,27 +1,13 @@
-$NetBSD: patch-ac,v 1.11 2011/09/14 17:21:08 hans Exp $
+$NetBSD: patch-ac,v 1.12 2012/10/10 13:33:44 drochner Exp $
 
---- Makefile.orig	2011-06-21 21:29:25.000000000 +0200
-+++ Makefile	2011-09-12 17:54:06.075569882 +0200
-@@ -112,7 +112,7 @@ version.h .version:
- # force version.sh to run whenever version might have changed
- -include .version
- 
--DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
-+DOCS = $(MANPAGES) $(PODPAGES)
- 
- documentation: $(DOCS)
- 
-@@ -152,11 +152,11 @@ install-progs: install-progs-yes $(PROGS
+--- Makefile.orig	2012-06-09 20:09:44.000000000 +0000
++++ Makefile
+@@ -124,7 +124,7 @@ install-progs: install-progs-yes $(PROGS
  
  install-data: $(DATA_FILES)
  	$(Q)mkdir -p "$(DATADIR)"
 -	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 +	$(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
  
- install-man: $(MANPAGES)
- 	$(Q)mkdir -p "$(MANDIR)/man1"
--	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
-+	$(INSTALL) -c -m 644 $(MANPAGES) "$(MANDIR)/man1"
- 
- uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data uninstall-man
+ uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
  
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
deleted file mode 100644
index aa5c955bc2c..00000000000
--- a/multimedia/ffmpeg/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2011/01/17 16:51:05 drochner Exp $
-
---- 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)
- 	$(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)
-@@ -69,16 +69,16 @@
- 
- install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
- 	$(Q)mkdir -p "$(LIBDIR)"
--	$$(INSTALL) -m 644 $$< "$(LIBDIR)"
-+	$$(INSTALL) -c -m 644 $$< "$(LIBDIR)"
- 	$(LIB_INSTALL_EXTRA_CMD)
- 
- 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) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
diff --git a/multimedia/ffmpeg/patches/patch-ap b/multimedia/ffmpeg/patches/patch-ap
index 2dea6ee4d6d..d3b09463c10 100644
--- a/multimedia/ffmpeg/patches/patch-ap
+++ b/multimedia/ffmpeg/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2012/02/03 08:43:50 sbd Exp $
+$NetBSD: patch-ap,v 1.5 2012/10/10 13:33:44 drochner Exp $
 
 --- libavutil/common.h.orig	2012-01-12 21:34:32.000000000 +0000
 +++ libavutil/common.h
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index a85b0bfdc24..8c1a43c9bbf 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.15 2011/11/29 17:58:17 jmmv Exp $
+$NetBSD: patch-configure,v 1.16 2012/10/10 13:33:44 drochner Exp $
 
---- configure.orig	2011-11-21 19:49:30.000000000 +0000
+--- configure.orig	2012-06-09 20:09:44.000000000 +0000
 +++ configure
-@@ -2412,6 +2412,11 @@ case $target_os in
+@@ -2604,6 +2604,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.15 2011/11/29 17:58:17 jmmv Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          ;;
-@@ -2637,10 +2642,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -2835,10 +2840,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,28 +31,37 @@ $NetBSD: patch-configure,v 1.15 2011/11/29 17:58:17 jmmv Exp $
  
  if enabled alpha; then
  
-@@ -2974,7 +2982,7 @@ else
+@@ -3195,7 +3203,7 @@ else
  fi
  enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
 -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
 +which texi2html > /dev/null 2>&1 && enable texi2html || disable texi2html
+ makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
  
  check_header linux/fb.h
- check_header linux/videodev.h
-@@ -3060,6 +3068,7 @@ check_ldflags -Wl,--warn-common
- check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
+@@ -3291,6 +3299,7 @@ check_ldflags -Wl,--warn-common
+ check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -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'
-@@ -3072,6 +3081,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -3303,6 +3312,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
 +fi
  
- if enabled small; then
-     add_cflags $size_cflags
+ if [ -n "$optflags" ]; then
+     add_cflags $optflags
+@@ -3726,7 +3736,7 @@ Version: $version
+ Requires: $(enabled shared || echo $requires)
+ Requires.private: $(enabled shared && echo $requires)
+ Conflicts:
+-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
++Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
+ Libs.private: $(enabled shared && echo $libs)
+ Cflags: -I\${includedir}
+ EOF