pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/cmus Add wavpack and aac/mp4 support.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ad84f0648a5e
branches: trunk
changeset: 544608:ad84f0648a5e
user: ahoka <ahoka%pkgsrc.org@localhost>
date: Wed Jul 16 14:04:29 2008 +0000
description:
Add wavpack and aac/mp4 support.
Fix PLIST handling with options.
Add dlopen include.
Don't force OSS when not availible.
Handle sun output with more care (including PLIST).
Take maintainership.
diffstat:
audio/cmus/DESCR | 2 +-
audio/cmus/Makefile | 24 ++++++++++++++++--------
audio/cmus/PLIST | 20 +++++++++++++-------
audio/cmus/options.mk | 45 +++++++++++++++++++++++++++++++++------------
4 files changed, 63 insertions(+), 28 deletions(-)
diffs (219 lines):
diff -r 2678a02ca3a5 -r ad84f0648a5e audio/cmus/DESCR
--- a/audio/cmus/DESCR Wed Jul 16 13:54:14 2008 +0000
+++ b/audio/cmus/DESCR Wed Jul 16 14:04:29 2008 +0000
@@ -2,7 +2,7 @@
CMus has vi-style command interface, e.g. searching using '/' or
'?' and adding files to playlist ':add ~/foo.ogg'.
- * Plays FLAC, OGG, MP3, WAV, modules
+ * Plays FLAC, OGG, MP3, MP4, AAC, WAV, WV and modules
* MP3 and Ogg streaming (Shoutcast/Icecast)
* WinAmp / XMMS keys "zxcvb"
* Can be controlled via UNIX socket
diff -r 2678a02ca3a5 -r ad84f0648a5e audio/cmus/Makefile
--- a/audio/cmus/Makefile Wed Jul 16 13:54:14 2008 +0000
+++ b/audio/cmus/Makefile Wed Jul 16 14:04:29 2008 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2008/05/10 14:56:33 obache Exp $
+# $NetBSD: Makefile,v 1.12 2008/07/16 14:04:29 ahoka Exp $
#
DISTNAME= cmus-2.2.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://mirror.greaterscope.net/cmus/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= webmaster%deepblack24.de@localhost
+MAINTAINER= ahoka%NetBSD.org@localhost
HOMEPAGE= http://cmus.sourceforge.net/
-COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features
+COMMENT= Cmus is an ncurses based music player with a lot of features
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,20 +18,27 @@
CONFIGURE_ARGS+= prefix=${PREFIX}
CONFIGURE_ARGS+= CONFIG_ALSA=n
-CONFIGURE_ARGS+= CONFIG_OSS=y
CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
-PLIST_VARS= sunaudio
+PLIST_VARS+= sunaudio oss
-.if exists(/usr/include/sys/audioio.h)
-PLIST.sunaudio= yes
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
+PLIST.oss= yes
+CONFIGURE_ARGS+= CONFIG_OSS=y
+.else
+CONFIGURE_ARGS+= CONFIG_OSS=n
.endif
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
CONFIGURE_ARGS+= CONFIG_SUN=y
+PLIST.sunaudio= yes
+.else
+CONFIGURE_ARGS+= CONFIG_SUN=n
.endif
.include "options.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 2678a02ca3a5 -r ad84f0648a5e audio/cmus/PLIST
--- a/audio/cmus/PLIST Wed Jul 16 13:54:14 2008 +0000
+++ b/audio/cmus/PLIST Wed Jul 16 14:04:29 2008 +0000
@@ -1,13 +1,19 @@
-@comment $NetBSD: PLIST,v 1.5 2008/05/10 14:56:33 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/07/16 14:04:29 ahoka Exp $
bin/cmus
bin/cmus-remote
-lib/cmus/ip/flac.so
-lib/cmus/ip/mad.so
-lib/cmus/ip/modplug.so
-lib/cmus/ip/vorbis.so
+${PLIST.flac}lib/cmus/ip/flac.so
+${PLIST.mad}lib/cmus/ip/mad.so
+${PLIST.modplug}lib/cmus/ip/modplug.so
+${PLIST.mikmod}lib/cmus/ip/mikmod.so
+${PLIST.vorbis}lib/cmus/ip/vorbis.so
+${PLIST.faad}lib/cmus/ip/aac.so
+${PLIST.faad}lib/cmus/ip/mp4.so
+${PLIST.mpcdec}lib/cmus/ip/mpc.so
lib/cmus/ip/wav.so
-lib/cmus/op/ao.so
-lib/cmus/op/oss.so
+${PLIST.wavpack}lib/cmus/ip/wavpack.so
+${PLIST.arts}lib/cmus/op/arts.so
+${PLIST.ao}lib/cmus/op/ao.so
+${PLIST.oss}lib/cmus/op/oss.so
${PLIST.sunaudio}lib/cmus/op/sun.so
man/man1/cmus-remote.1
man/man1/cmus.1
diff -r 2678a02ca3a5 -r ad84f0648a5e audio/cmus/options.mk
--- a/audio/cmus/options.mk Wed Jul 16 13:54:14 2008 +0000
+++ b/audio/cmus/options.mk Wed Jul 16 14:04:29 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2008/05/10 14:56:33 obache Exp $
+# $NetBSD: options.mk,v 1.5 2008/07/16 14:04:29 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
-PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec #faad alsa
+PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec faad wavpack #alsa
PKG_SUPPORTED_OPTIONS+= wide-curses
PKG_OPTIONS_OPTIONAL_GROUPS= mod
PKG_OPTIONS_GROUP.mod= modplug mikmod
@@ -9,6 +9,8 @@
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
+
###
### Backends
###
@@ -18,6 +20,7 @@
.if !empty(PKG_OPTIONS:Mao)
. include "../../audio/libao/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_AO=y
+PLIST.ao= yes
.else
CONFIGURE_ARGS+= CONFIG_AO=n
.endif
@@ -27,6 +30,7 @@
.if !empty(PKG_OPTIONS:Marts)
. include "../../audio/arts/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_ARTS=y
+PLIST.arts= yes
.else
CONFIGURE_ARGS+= CONFIG_ARTS=n
.endif
@@ -48,6 +52,7 @@
.if !empty(PKG_OPTIONS:Mmad)
.include "../../audio/libmad/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_MAD=y
+PLIST.mad= yes
.else
CONFIGURE_ARGS+= CONFIG_MAD=n
.endif
@@ -57,6 +62,7 @@
.if !empty(PKG_OPTIONS:Mvorbis)
.include "../../audio/libvorbis/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_VORBIS=y
+PLIST.vorbis= yes
.else
CONFIGURE_ARGS+= CONFIG_VORBIS=n
.endif
@@ -66,6 +72,7 @@
.if !empty(PKG_OPTIONS:Mflac)
.include "../../audio/flac/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_FLAC=y
+PLIST.flac= yes
.else
CONFIGURE_ARGS+= CONFIG_FLAC=n
.endif
@@ -75,35 +82,49 @@
.if !empty(PKG_OPTIONS:Mmpcdec)
.include "../../audio/libmpcdec/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_MPC=y
+PLIST.mpcdec= yes
.else
CONFIGURE_ARGS+= CONFIG_MPC=n
.endif
+# VAWPACK support
+#
+.if !empty(PKG_OPTIONS:Mwavpack)
+.include "../../audio/wavpack/buildlink3.mk"
+CONFIGURE_ARGS+= CONFIG_WAVPACK=y
+PLIST.wavpack= yes
+.else
+CONFIGURE_ARGS+= CONFIG_WAVPACK=n
+.endif
+
# modplay support
#
.if !empty(PKG_OPTIONS:Mmikmod)
.include "../../audio/libmikmod/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_MODPLUG=n
CONFIGURE_ARGS+= CONFIG_MIKMOD=y
+PLIST.mikmod= yes
.endif
.if !empty(PKG_OPTIONS:Mmodplug)
.include "../../audio/libmodplug/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_MODPLUG=y
CONFIGURE_ARGS+= CONFIG_MIKMOD=n
+PLIST.modplug= yes
.endif
# FAAD support
#
-# XXX: faad2 in pkgsrc is heavily outdated as of 2007Q3, cmus needs newer.
-#
-#.if !empty(PKG_OPTIONS:Mfaad)
-#.include "../../audio/faad2/buildlink3.mk"
-#CONFIGURE_ARGS+= CONFIG_AAC=y
-#CONFIGURE_ARGS+= CONFIG_MP4=y
-#.else
-#CONFIGURE_ARGS+= CONFIG_AAC=n
-#CONFIGURE_ARGS+= CONFIG_MP4=n
-#.endif
+.if !empty(PKG_OPTIONS:Mfaad)
+.include "../../audio/faad2/buildlink3.mk"
+.include "../../multimedia/libmp4v2/buildlink3.mk"
+CONFIGURE_ARGS+= CONFIG_AAC=y
+CONFIGURE_ARGS+= CONFIG_MP4=y
+PLIST.faad= yes
+.else
+CONFIGURE_ARGS+= CONFIG_AAC=n
+CONFIGURE_ARGS+= CONFIG_MP4=n
+.endif
###
### Wide curses support; otherwise, default to using narrow curses.
Home |
Main Index |
Thread Index |
Old Index