summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-02-20 09:53:15 +0000
committerwiz <wiz@pkgsrc.org>2014-02-20 09:53:15 +0000
commitc0c0778ed66fa0847a617b4247cba26ff08e746f (patch)
tree0c73146bca531a28af14ba33a2875e8cd5266e9d /multimedia
parenteecece8a19027bcc7cee24d32592c0e21c903b04 (diff)
downloadpkgsrc-c0c0778ed66fa0847a617b4247cba26ff08e746f.tar.gz
Update to 1.2.5:
1.2.5 was released on 2014-01-16. 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.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile5
-rw-r--r--multimedia/ffmpeg/Makefile.common4
-rw-r--r--multimedia/ffmpeg/distinfo8
3 files changed, 8 insertions, 9 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5986f18d26a..ea715575598 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2013/10/20 21:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2014/02/20 09:53:15 wiz Exp $
-PKGNAME= ffmpeg-20131006.${DISTVERSION}
-PKGREVISION= 1
+PKGNAME= ffmpeg-20140116.${DISTVERSION}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index 42958ca6660..c1fdc0eec2e 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2013/10/06 16:33:23 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2014/02/20 09:53:15 wiz Exp $
# used by multimedia/ffplay/Makefile
# used by multimedia/ffmpeg/Makefile
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2
LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
-DISTVERSION= 1.2.4
+DISTVERSION= 1.2.5
PREV_PKGPATH= multimedia/ffmpeg-devel
PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 815e9a6d818..5c0b3544a0f 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.71 2013/10/06 16:33:23 wiz Exp $
+$NetBSD: distinfo,v 1.72 2014/02/20 09:53:15 wiz Exp $
-SHA1 (ffmpeg-1.2.4.tar.bz2) = ee73a05bde209fc23441c7e49767c1b7a4b6f124
-RMD160 (ffmpeg-1.2.4.tar.bz2) = 161a2c415799bfb815957ed132dceccfe901d8ed
-Size (ffmpeg-1.2.4.tar.bz2) = 5967562 bytes
+SHA1 (ffmpeg-1.2.5.tar.bz2) = b154487c1a3e51df9e7c33f2165784e17d6fa947
+RMD160 (ffmpeg-1.2.5.tar.bz2) = 63ea2b1e02a8a954f06a41eb47dc3f06543d48d6
+Size (ffmpeg-1.2.5.tar.bz2) = 5971768 bytes
SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e