Fri Apr 29 07:41:01 2011 UTC ()
Update ffmpeg to 20110426.0.6.3.

version 0.6.3:
- AMV: Fix possibly exploitable crash.
- Fix apparently exploitable race condition.


(obache)
diff -r1.66 -r1.67 pkgsrc/multimedia/ffmpeg/Makefile
diff -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg/Makefile.common
diff -r1.40 -r1.41 pkgsrc/multimedia/ffmpeg/distinfo
cvs diff -r1.66 -r1.67 pkgsrc/multimedia/ffmpeg/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2011/04/05 11:50:45 1.66
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2011/04/29 07:41:01 1.67
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.66 2011/04/05 11:50:45 drochner Exp $ 1# $NetBSD: Makefile,v 1.67 2011/04/29 07:41:01 obache Exp $
2 2
3# XXX This is release 0.6.1 but we had date-based pkgnames before. 3# XXX This is release 0.6.3 but we had date-based pkgnames before.
4PKGNAME= ffmpeg-20110323.0.6.2 4PKGNAME= ffmpeg-20110426.${DISTVERSION}
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 7HOMEPAGE= http://ffmpeg.mplayerhq.hu/
8COMMENT= Decoding, encoding and streaming software 8COMMENT= Decoding, encoding and streaming software
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12CONFIGURE_ARGS+= --enable-avfilter 12CONFIGURE_ARGS+= --enable-avfilter
13CONFIGURE_ARGS+= --enable-avfilter-lavf 13CONFIGURE_ARGS+= --enable-avfilter-lavf
14CONFIGURE_ARGS+= --enable-postproc 14CONFIGURE_ARGS+= --enable-postproc
15CONFIGURE_ARGS+= --enable-libvorbis 15CONFIGURE_ARGS+= --enable-libvorbis
16CONFIGURE_ARGS+= --enable-libmp3lame 16CONFIGURE_ARGS+= --enable-libmp3lame
17CONFIGURE_ARGS+= --enable-libx264 17CONFIGURE_ARGS+= --enable-libx264
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile.common 2011/04/05 11:50:45 1.9
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile.common 2011/04/29 07:41:01 1.10
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile.common,v 1.9 2011/04/05 11:50:45 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.10 2011/04/29 07:41:01 obache Exp $
2# used by multimedia/ffplay/Makefile 2# used by multimedia/ffplay/Makefile
3# used by multimedia/ffmpeg/Makefile 3# used by multimedia/ffmpeg/Makefile
4 4
5DISTNAME= ffmpeg-${DISTVERSION:S/-//g} 5DISTNAME= ffmpeg-${DISTVERSION:S/-//g}
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ \ 7MASTER_SITES= http://www.ffmpeg.org/releases/ \
8 ftp://ftp.NetBSD.org/pub/NetBSD/misc/ahoka/dist/ \ 8 ftp://ftp.NetBSD.org/pub/NetBSD/misc/ahoka/dist/ \
9 http://irkmaffia.com/~ahoka/distfiles/ 9 http://irkmaffia.com/~ahoka/distfiles/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12DISTVERSION= 0.6.2 12DISTVERSION= 0.6.3
13PREV_PKGPATH= multimedia/ffmpeg-devel 13PREV_PKGPATH= multimedia/ffmpeg-devel
14PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches 14PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches
15 15
16HAS_CONFIGURE= YES 16HAS_CONFIGURE= YES
17USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
19USE_TOOLS+= gmake texi2html pod2man 19USE_TOOLS+= gmake texi2html pod2man
20 20
21.include "../../mk/compiler.mk" 21.include "../../mk/compiler.mk"
22 22
23.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*) 23.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
24SUBST_CLASSES+= sunwspro 24SUBST_CLASSES+= sunwspro
25SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 25SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
cvs diff -r1.40 -r1.41 pkgsrc/multimedia/ffmpeg/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/distinfo 2011/04/05 11:50:45 1.40
+++ pkgsrc/multimedia/ffmpeg/Attic/distinfo 2011/04/29 07:41:01 1.41
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.40 2011/04/05 11:50:45 drochner Exp $ 1$NetBSD: distinfo,v 1.41 2011/04/29 07:41:01 obache Exp $
2 2
3SHA1 (ffmpeg-0.6.2.tar.bz2) = d4e464d4111971b9cef10be7a1efa3677a899338 3SHA1 (ffmpeg-0.6.3.tar.bz2) = 25dd82e8a3627a1a9d4464e15685720215fecb3c
4RMD160 (ffmpeg-0.6.2.tar.bz2) = cd2f5011c65a9eaf5353a8d49ff3a14a467baa63 4RMD160 (ffmpeg-0.6.3.tar.bz2) = 623bf7c60ad7dd4febdac5ae5ef12566fb8dbf38
5Size (ffmpeg-0.6.2.tar.bz2) = 3639261 bytes 5Size (ffmpeg-0.6.3.tar.bz2) = 3750617 bytes
6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
7SHA1 (patch-ac) = d29395cf05612d6be213a69eafaf549c802b6ce1 7SHA1 (patch-ac) = d29395cf05612d6be213a69eafaf549c802b6ce1
8SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6 8SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
9SHA1 (patch-ae) = 7734efe9f6b496ca292d17859cffcc0129aaa90b 9SHA1 (patch-ae) = 7734efe9f6b496ca292d17859cffcc0129aaa90b
10SHA1 (patch-af) = d29dd9ae373fd086d3c3b952d8831af1717a8ddf 10SHA1 (patch-af) = d29dd9ae373fd086d3c3b952d8831af1717a8ddf
11SHA1 (patch-bktr) = 62c31edc0fa0712d438d0e1ea6539749bfd1df34 11SHA1 (patch-bktr) = 62c31edc0fa0712d438d0e1ea6539749bfd1df34
12SHA1 (patch-configure) = 3de6a217d60897208e71f201e551095e9d36f8be 12SHA1 (patch-configure) = 3de6a217d60897208e71f201e551095e9d36f8be