Mon Feb 11 12:33:31 2013 UTC ()
Update to 20130602.1.1.2:
1.1.2 was released on 2013-02-06. It is the latest stable FFmpeg
release from the 1.1 release branch, which was cut from master on
2013-01-06. Amongst lots of other changes, it includes all changes
from ffmpeg-mt, libav master of 2013-01-06, libav 9.1 as of
2013-02-05.


(wiz)
diff -r1.100 -r1.101 pkgsrc/multimedia/ffmpeg/Makefile
diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg/Makefile.common
diff -r1.64 -r1.65 pkgsrc/multimedia/ffmpeg/distinfo

cvs diff -r1.100 -r1.101 pkgsrc/multimedia/ffmpeg/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/01/21 14:50:42 1.100
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/02/11 12:33:31 1.101
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.100 2013/01/21 14:50:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.101 2013/02/11 12:33:31 wiz Exp $
2 2
3PKGNAME= ffmpeg-20130120.${DISTVERSION} 3PKGNAME= ffmpeg-20130602.${DISTVERSION}
4 4
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software 7COMMENT= Decoding, encoding and streaming software
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12 12
13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
14 14
15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
16 ${PKG_SYSCONFDIR}/ffserver.conf 16 ${PKG_SYSCONFDIR}/ffserver.conf

cvs diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile.common 2013/01/21 14:50:42 1.28
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile.common 2013/02/11 12:33:31 1.29
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile.common,v 1.28 2013/01/21 14:50:42 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.29 2013/02/11 12:33:31 wiz 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/
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
12DISTVERSION= 1.1.1 12DISTVERSION= 1.1.2
13PREV_PKGPATH= multimedia/ffmpeg-devel 13PREV_PKGPATH= multimedia/ffmpeg-devel
14PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches 14PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches
15 15
16USE_LANGUAGES= c99 16USE_LANGUAGES= c99
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake texi2html pod2man 18USE_TOOLS+= gmake texi2html pod2man
19HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
20CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 20CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
21CONFIGURE_ARGS+= --cc=${CC:Q} 21CONFIGURE_ARGS+= --cc=${CC:Q}
22CONFIGURE_ARGS+= --prefix=${PREFIX} 22CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --disable-debug 23CONFIGURE_ARGS+= --disable-debug
24CONFIGURE_ARGS+= --disable-optimizations 24CONFIGURE_ARGS+= --disable-optimizations
25CONFIGURE_ARGS+= --disable-stripping 25CONFIGURE_ARGS+= --disable-stripping

cvs diff -r1.64 -r1.65 pkgsrc/multimedia/ffmpeg/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/distinfo 2013/01/21 14:50:42 1.64
+++ pkgsrc/multimedia/ffmpeg/Attic/distinfo 2013/02/11 12:33:31 1.65
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.64 2013/01/21 14:50:42 wiz Exp $ 1$NetBSD: distinfo,v 1.65 2013/02/11 12:33:31 wiz Exp $
2 2
3SHA1 (ffmpeg-1.1.1.tar.bz2) = ad02037de190fb04611ec5347c5a97130249bebf 3SHA1 (ffmpeg-1.1.2.tar.bz2) = 1fb1c2019ff13440b3670dc83846c654b245c4c9
4RMD160 (ffmpeg-1.1.1.tar.bz2) = 14dd4d0f324d982194bcbed56232a0a0af2b3285 4RMD160 (ffmpeg-1.1.2.tar.bz2) = 5b1ea52697c964016c65d78ef96abcff29b292b3
5Size (ffmpeg-1.1.1.tar.bz2) = 5808380 bytes 5Size (ffmpeg-1.1.2.tar.bz2) = 5810976 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) = 2a1085bef529b883270a4d55450c202f83c478db 9SHA1 (patch-configure) = 2a1085bef529b883270a4d55450c202f83c478db