diff options
| author | drochner <drochner@pkgsrc.org> | 2013-04-11 11:26:23 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2013-04-11 11:26:23 +0000 |
| commit | 8a6cd98f44a82c85b5b5bf2003f317e362ae07a8 (patch) | |
| tree | ec3eb749c55a0fd38cb77405b207974098a96b66 /multimedia/ffmpeg010 | |
| parent | e1217916469b44c53f612d7fbf97b515cb99623d (diff) | |
| download | pkgsrc-8a6cd98f44a82c85b5b5bf2003f317e362ae07a8.tar.gz | |
update to 0.10.7
from the announcement:
It is the latest stable FFmpeg release from the 0.10 release branch, which
was cut from master on 2012-01-26. Amongst lots of other changes, it
includes all changes from ffmpeg-mt, libav master of 2012-01-26,
libav 0.8.6 as of 2013-04-10.
Diffstat (limited to 'multimedia/ffmpeg010')
| -rw-r--r-- | multimedia/ffmpeg010/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/buildlink3.mk | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/distinfo | 9 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/patches/patch-ffserver.c | 13 |
5 files changed, 10 insertions, 24 deletions
diff --git a/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile index 5d93054bff2..467cf7b79d8 100644 --- a/multimedia/ffmpeg010/Makefile +++ b/multimedia/ffmpeg010/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2012/12/14 19:23:43 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2013/04/11 11:26:23 drochner Exp $ -PKGNAME= ffmpeg010-20121026.${DISTVERSION} +PKGNAME= ffmpeg010-20130410.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common index 30a45d1aeb3..b9b1b0afc83 100644 --- a/multimedia/ffmpeg010/Makefile.common +++ b/multimedia/ffmpeg010/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2012/12/14 19:23:43 drochner Exp $ +# $NetBSD: Makefile.common,v 1.7 2013/04/11 11:26:23 drochner Exp $ # used by multimedia/ffmpeg010/Makefile DISTNAME= ffmpeg-${DISTVERSION:S/-//g} @@ -6,7 +6,7 @@ CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 -DISTVERSION= 0.10.6 +DISTVERSION= 0.10.7 PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg010/patches HAS_CONFIGURE= YES diff --git a/multimedia/ffmpeg010/buildlink3.mk b/multimedia/ffmpeg010/buildlink3.mk index 0d309f926e9..1b59d6c2384 100644 --- a/multimedia/ffmpeg010/buildlink3.mk +++ b/multimedia/ffmpeg010/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/01/22 09:49:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2013/04/11 11:26:23 drochner Exp $ BUILDLINK_TREE+= ffmpeg010 .if !defined(FFMPEG010_BUILDLINK3_MK) FFMPEG010_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4<20121028.1.0 +BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4 BUILDLINK_PKGSRCDIR.ffmpeg010?= ../../multimedia/ffmpeg010 BUILDLINK_INCDIRS.ffmpeg010+= include/ffmpeg010 diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo index 3d033a6c097..fe28a855885 100644 --- a/multimedia/ffmpeg010/distinfo +++ b/multimedia/ffmpeg010/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.6 2012/12/19 12:53:25 joerg Exp $ +$NetBSD: distinfo,v 1.7 2013/04/11 11:26:23 drochner Exp $ -SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1 -RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff -Size (ffmpeg-0.10.6.tar.bz2) = 5778721 bytes +SHA1 (ffmpeg-0.10.7.tar.bz2) = 48e49998a665055b586bc8468b64b9aa6342e90e +RMD160 (ffmpeg-0.10.7.tar.bz2) = d404ac7028c8e658088bdcdd9391ed0908e80997 +Size (ffmpeg-0.10.7.tar.bz2) = 5782181 bytes SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16 SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2 SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303 SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24 -SHA1 (patch-ffserver.c) = a2302b88c6462df42ad87734f50de6558d9a3f21 diff --git a/multimedia/ffmpeg010/patches/patch-ffserver.c b/multimedia/ffmpeg010/patches/patch-ffserver.c deleted file mode 100644 index 70cadec3c4b..00000000000 --- a/multimedia/ffmpeg010/patches/patch-ffserver.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ffserver.c,v 1.1 2012/12/19 12:53:25 joerg Exp $ - ---- ffserver.c.orig 2012-12-19 10:57:22.000000000 +0000 -+++ ffserver.c -@@ -3806,7 +3806,7 @@ static void add_codec(FFStream *stream, - AVStream *st; - - if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams)) -- return NULL; -+ return; - - /* compute default parameters */ - switch(av->codec_type) { |