summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/ffmpeg/options.mk5
2 files changed, 5 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index d7669f05cc8..4d55206e295 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/01/07 09:14:01 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2007/08/02 21:53:05 dbj Exp $
DISTNAME= ffmpeg-0.4.9-pre1
PKGNAME= ffmpeg-0.4.9pre1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 5110e7b0783..560209bda10 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/08/02 21:51:52 dbj Exp $
+# $NetBSD: options.mk,v 1.6 2007/08/02 21:53:05 dbj Exp $
# Global and legacy options
@@ -90,7 +90,8 @@ CONFIGURE_ARGS+= --disable-faac
.if !empty(PKG_OPTIONS:Ma52)
CONFIGURE_ARGS+= --enable-a52
-.include "../../audio/liba52/buildlink3.mk"
+# XXX this pkg currently compiles its own liba52 into libavcodec
+#.include "../../audio/liba52/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-a52
.endif