pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/cmus-unofficial Add ffmpeg option, include optio...
details: https://anonhg.NetBSD.org/pkgsrc/rev/137065ff17cd
branches: trunk
changeset: 563507:137065ff17cd
user: ahoka <ahoka%pkgsrc.org@localhost>
date: Mon Aug 17 14:24:32 2009 +0000
description:
Add ffmpeg option, include option.mk from Makefile.
diffstat:
audio/cmus-unofficial/Makefile | 5 +++--
audio/cmus-unofficial/PLIST | 3 ++-
audio/cmus-unofficial/options.mk | 16 +++++++++++++---
3 files changed, 18 insertions(+), 6 deletions(-)
diffs (70 lines):
diff -r 2555cd991a19 -r 137065ff17cd audio/cmus-unofficial/Makefile
--- a/audio/cmus-unofficial/Makefile Mon Aug 17 14:21:42 2009 +0000
+++ b/audio/cmus-unofficial/Makefile Mon Aug 17 14:24:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/06/07 12:49:01 ahoka Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/17 14:24:32 ahoka Exp $
#
DISTNAME= cmus-unofficial-20090605
@@ -13,4 +13,5 @@
CONFLICTS+= cmus-[0-9]*
WRKSRC= ${WRKDIR}/cmus-unofficial
-.include "../cmus/Makefile.common"
+.include "options.mk"
+.include "../cmus/Makefile.common"
\ No newline at end of file
diff -r 2555cd991a19 -r 137065ff17cd audio/cmus-unofficial/PLIST
--- a/audio/cmus-unofficial/PLIST Mon Aug 17 14:21:42 2009 +0000
+++ b/audio/cmus-unofficial/PLIST Mon Aug 17 14:24:32 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/17 14:24:32 ahoka Exp $
bin/cmus
bin/cmus-remote
${PLIST.flac}lib/cmus/ip/flac.so
@@ -11,6 +11,7 @@
${PLIST.mpcdec}lib/cmus/ip/mpc.so
lib/cmus/ip/wav.so
${PLIST.wavpack}lib/cmus/ip/wavpack.so
+${PLIST.ffmpeg}lib/cmus/ip/ffmpeg.so
${PLIST.arts}lib/cmus/op/arts.so
${PLIST.libao}lib/cmus/op/ao.so
${PLIST.oss}lib/cmus/op/oss.so
diff -r 2555cd991a19 -r 137065ff17cd audio/cmus-unofficial/options.mk
--- a/audio/cmus-unofficial/options.mk Mon Aug 17 14:21:42 2009 +0000
+++ b/audio/cmus-unofficial/options.mk Mon Aug 17 14:24:32 2009 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/06/07 12:49:01 ahoka Exp $
+# $NetBSD: options.mk,v 1.2 2009/08/17 14:24:32 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
PKG_SUPPORTED_OPTIONS= flac mad vorbis arts libao mpcdec faad wavpack #alsa
-PKG_SUPPORTED_OPTIONS+= wide-curses
+PKG_SUPPORTED_OPTIONS+= wide-curses ffmpeg
PKG_OPTIONS_OPTIONAL_GROUPS= mod
PKG_OPTIONS_GROUP.mod= modplug mikmod
PKG_SUGGESTED_OPTIONS= flac mad libao vorbis modplug
-PKG_OPTIONS_LEGACY_OPTS=ao:libao
+PKG_OPTIONS_LEGACY_OPTS= ao:libao
.include "../../mk/bsd.options.mk"
@@ -98,6 +98,16 @@
CONFIGURE_ARGS+= CONFIG_WAVPACK=n
.endif
+# FFMPEG support
+#
+.if !empty(PKG_OPTIONS:Mffmpeg)
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+CONFIGURE_ARGS+= CONFIG_FFMPEG=y
+PLIST.ffmpeg= yes
+.else
+CONFIGURE_ARGS+= CONFIG_FFMPEG=n
+.endif
+
# modplay support
#
.if !empty(PKG_OPTIONS:Mmikmod)
Home |
Main Index |
Thread Index |
Old Index