summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-08-04 23:43:47 +0000
committerwiz <wiz@pkgsrc.org>2011-08-04 23:43:47 +0000
commit1485c4ca2f0c343aabec963970a6b3c4820f926f (patch)
treefd9a5c32cc01e5c4e4800a4f5cb8a92315443ca2 /multimedia
parent1ab5e1f32e23ac83d1830acb852de8325213c3a8 (diff)
downloadpkgsrc-1485c4ca2f0c343aabec963970a6b3c4820f926f.tar.gz
Enable vorbis support. From Matthew Mondor in PR 45208.
Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile3
-rw-r--r--multimedia/ffmpeg/options.mk14
2 files changed, 13 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index e9312f1af60..ae9131ccc4f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2011/08/02 17:03:14 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2011/08/04 23:43:47 wiz Exp $
# XXX This is release 0.7.1 but we had date-based pkgnames before.
PKGNAME= ffmpeg-20110623.${DISTVERSION}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index ccf602fe528..a159da62e8c 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.20 2011/07/19 19:53:18 drochner Exp $
+# $NetBSD: options.mk,v 1.21 2011/08/04 23:43:48 wiz Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= theora xvid faad faac x264 opencore-amr libvpx
-PKG_SUGGESTED_OPTIONS= theora xvid x264 libvpx
+PKG_SUPPORTED_OPTIONS= theora vorbis xvid faad faac x264 opencore-amr libvpx
+PKG_SUGGESTED_OPTIONS= theora vorbis xvid x264 libvpx
#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
#PKG_OPTIONS_GROUP.aac-decoder= faad faac
@@ -67,6 +67,14 @@ CONFIGURE_ARGS+= --enable-libtheora
.endif
###
+### OGG Vorbis support
+###
+.if !empty(PKG_OPTIONS:Mvorbis)
+CONFIGURE_ARGS+= --enable-libvorbis
+.include "../../audio/libvorbis/buildlink3.mk"
+.endif
+
+###
### XviD support
###
.if !empty(PKG_OPTIONS:Mxvid)