summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2013-03-02 09:57:02 +0000
committeradam <adam@pkgsrc.org>2013-03-02 09:57:02 +0000
commit2ffc127e9e21887e61b0f8c162d427b849d706ba (patch)
tree229e90bf8464f2142cb1bb6f8be252ee015e5a64 /multimedia/ffmpeg
parentee008f554541dda777ddfaf27fc4561d6d24324a (diff)
downloadpkgsrc-2ffc127e9e21887e61b0f8c162d427b849d706ba.tar.gz
Changes 1.1.3:
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-23.
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/ffmpeg/Makefile.common4
-rw-r--r--multimedia/ffmpeg/distinfo8
-rw-r--r--multimedia/ffmpeg/options.mk4
4 files changed, 10 insertions, 10 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index aad5f07bcd9..f1bbdd2aaac 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2013/02/12 12:16:25 drochner Exp $
+# $NetBSD: Makefile,v 1.103 2013/03/02 09:57:02 adam Exp $
-PKGNAME= ffmpeg-20130206.${DISTVERSION}
+PKGNAME= ffmpeg-20130223.${DISTVERSION}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index ea4c456092f..a743177c4e8 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2013/02/11 12:33:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2013/03/02 09:57:02 adam 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.1.2
+DISTVERSION= 1.1.3
PREV_PKGPATH= multimedia/ffmpeg-devel
PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index f7176516368..084db15fa66 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.65 2013/02/11 12:33:31 wiz Exp $
+$NetBSD: distinfo,v 1.66 2013/03/02 09:57:02 adam Exp $
-SHA1 (ffmpeg-1.1.2.tar.bz2) = 1fb1c2019ff13440b3670dc83846c654b245c4c9
-RMD160 (ffmpeg-1.1.2.tar.bz2) = 5b1ea52697c964016c65d78ef96abcff29b292b3
-Size (ffmpeg-1.1.2.tar.bz2) = 5810976 bytes
+SHA1 (ffmpeg-1.1.3.tar.bz2) = d82d6f53c5130ee21dcb87f76bdbdf768d3f0db9
+RMD160 (ffmpeg-1.1.3.tar.bz2) = 4928794fb16c3943372104dfc47ee77bb31359ac
+Size (ffmpeg-1.1.3.tar.bz2) = 5812644 bytes
SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 4d6edf0c0ea..1cc2f43f64f 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.26 2012/12/14 21:50:46 cheusov Exp $
+# $NetBSD: options.mk,v 1.27 2013/03/02 09:57:02 adam Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
opencore-amr
-PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
+PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
#PKG_OPTIONS_GROUP.aac-decoder= faac