Tue Dec 30 13:47:58 2014 UTC ()
Update to 1.2.11:

1.2.11 was released on 2014-12-19. It is the latest stable FFmpeg
release from the 1.2 release branch, which was cut from master on
2013-03-07. Amongst lots of other changes, it includes all changes
from ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07.


(wiz)
diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg1/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg1/Makefile.common
diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg1/distinfo

cvs diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2014/12/03 16:44:14 1.3
+++ pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2014/12/30 13:47:58 1.4
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2014/12/03 16:44:14 bouyer Exp $ 1# $NetBSD: Makefile,v 1.4 2014/12/30 13:47:58 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/}
4PKGREVISION= 1 
5MAINTAINER= pkgsrc-users@NetBSD.org 4MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 5HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software (v1.x) 6COMMENT= Decoding, encoding and streaming software (v1.x)
8 7
9CONFIGURE_ARGS+= --enable-avfilter 8CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 9#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 10CONFIGURE_ARGS+= --enable-postproc
12 11
13INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1 12INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1
14 13
15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \ 14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \
16 ${PKG_SYSCONFDIR}/ffserver.conf 15 ${PKG_SYSCONFDIR}/ffserver.conf
17 16

cvs diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common 2014/11/10 15:38:22 1.4
+++ pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common 2014/12/30 13:47:58 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.4 2014/11/10 15:38:22 adam Exp $ 1# $NetBSD: Makefile.common,v 1.5 2014/12/30 13:47:58 wiz Exp $
2# used by multimedia/ffplay1/Makefile 2# used by multimedia/ffplay1/Makefile
3# used by multimedia/ffmpeg1/Makefile 3# used by multimedia/ffmpeg1/Makefile
4 4
5DISTNAME= ffmpeg-1.2.10 5DISTNAME= ffmpeg-1.2.11
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PREV_PKGPATH= multimedia/ffmpeg 12PREV_PKGPATH= multimedia/ffmpeg
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg1/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg1/patches
14 14
15USE_LANGUAGES= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake texi2html pod2man 17USE_TOOLS+= gmake texi2html pod2man
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes

cvs diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg1/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2014/12/03 16:44:14 1.5
+++ pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2014/12/30 13:47:58 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2014/12/03 16:44:14 bouyer Exp $ 1$NetBSD: distinfo,v 1.6 2014/12/30 13:47:58 wiz Exp $
2 2
3SHA1 (ffmpeg-1.2.10.tar.bz2) = 8e6d59b87b3390facef624ba3e531726de3ef11b 3SHA1 (ffmpeg-1.2.11.tar.bz2) = a4564ee2218565c1b9370cef73e3c90f701c4470
4RMD160 (ffmpeg-1.2.10.tar.bz2) = 56b8f285748c52da8ef9c27cad1ace1aa55ef19e 4RMD160 (ffmpeg-1.2.11.tar.bz2) = e091ff0d7d056e22f727da2950d96aa28fbba028
5Size (ffmpeg-1.2.10.tar.bz2) = 5972429 bytes 5Size (ffmpeg-1.2.11.tar.bz2) = 5971961 bytes
6SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d 6SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
7SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 7SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
8SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 8SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
9SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14 9SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14
10SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a 10SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a