diff options
author | gls <gls@pkgsrc.org> | 2014-08-18 09:34:49 +0000 |
---|---|---|
committer | gls <gls@pkgsrc.org> | 2014-08-18 09:34:49 +0000 |
commit | 4b07cb07deed9e93b55443c94d29c565cad8ac3b (patch) | |
tree | 6d0bac4e412dd4f4b2878b7f2fae12fac406843e | |
parent | 95a4d503825ea4daad083ec47d6b234dc0c8e03d (diff) | |
download | pkgsrc-4b07cb07deed9e93b55443c94d29c565cad8ac3b.tar.gz |
Update audio/cmus to 2.6.0
pkgsrc changes:
---------------
Fix MASTER_SITES and HOMEPAGE.
Add opus and jack options.
Remove upstreamed patch
upstream changes:
-----------------
Lots of new features and fixes since 2.5.0 (which was released loooong ago)!
Major new features:
show all tracks when artist is selected in the tree view
JACK output plugin
Opus input plugin
Other notable new things:
«Night» and «Solarized» color schemes
reverse sort order support
ReplayGain closer to the spec
vim-style <c-e> / <c-y> scrolling
follow option
show_playback_position option
XDG directories support
better support for newer versions of FFmpeg
support for .oga and .ogx file extensions
stream metadata in cmus-remote -Q
-rw-r--r-- | audio/cmus/Makefile | 16 | ||||
-rw-r--r-- | audio/cmus/PLIST | 8 | ||||
-rw-r--r-- | audio/cmus/distinfo | 9 | ||||
-rw-r--r-- | audio/cmus/options.mk | 24 | ||||
-rw-r--r-- | audio/cmus/patches/patch-modplug.c | 15 |
5 files changed, 40 insertions, 32 deletions
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 81b96734c63..1e2773e6a08 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.51 2014/08/11 23:09:44 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2014/08/18 09:34:49 gls Exp $ -DISTNAME= cmus-v2.5.0 -PKGNAME= ${DISTNAME:S/-v/-/} -PKGREVISION= 8 +DISTNAME= v2.6.0 +PKGNAME= ${DISTNAME:S/v/cmus-/} CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= https://github.com/cmus/cmus/archive/ +#EXTRACT_SUFX= .tar.bz2 MAINTAINER= ahoka@NetBSD.org -HOMEPAGE= http://cmus.sourceforge.net/ +HOMEPAGE= http://cmus.github.io/ COMMENT= Cmus is a small, fast and powerful text mode music player LICENSE= gnu-gpl-v2 -CONFLICTS+= cmus-unofficial-[0-9]* - +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} HAS_CONFIGURE= yes USE_TOOLS+= gmake pkg-config diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST index 76a7042c7f7..71d8bc3e558 100644 --- a/audio/cmus/PLIST +++ b/audio/cmus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2013/05/06 19:55:27 gls Exp $ +@comment $NetBSD: PLIST,v 1.13 2014/08/18 09:34:49 gls Exp $ bin/cmus bin/cmus-remote ${PLIST.flac}lib/cmus/ip/flac.so @@ -8,7 +8,9 @@ ${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.ffmpeg}lib/cmus/ip/ffmpeg.so ${PLIST.musepack}lib/cmus/ip/mpc.so +${PLIST.opus}lib/cmus/ip/opus.so lib/cmus/ip/wav.so ${PLIST.wavpack}lib/cmus/ip/wavpack.so ${PLIST.arts}lib/cmus/op/arts.so @@ -16,6 +18,7 @@ ${PLIST.pulseaudio}lib/cmus/op/pulse.so ${PLIST.libao}lib/cmus/op/ao.so ${PLIST.oss}lib/cmus/op/oss.so ${PLIST.sunaudio}lib/cmus/op/sun.so +${PLIST.jack}lib/cmus/op/jack.so man/man1/cmus-remote.1 man/man1/cmus.1 man/man7/cmus-tutorial.7 @@ -24,7 +27,10 @@ share/cmus/default.theme share/cmus/gray-88.theme share/cmus/green-mono-88.theme share/cmus/green.theme +share/cmus/night.theme share/cmus/rc +share/cmus/solarized-dark.theme +share/cmus/solarized-light.theme share/cmus/xterm-white.theme share/cmus/zenburn.theme share/doc/cmus/examples/cmus-status-display diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo index c0d255d7c44..c43012880be 100644 --- a/audio/cmus/distinfo +++ b/audio/cmus/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2014/04/21 09:49:49 wiz Exp $ +$NetBSD: distinfo,v 1.19 2014/08/18 09:34:49 gls Exp $ -SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b -RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece -Size (cmus-v2.5.0.tar.bz2) = 224675 bytes +SHA1 (v2.6.0.tar.gz) = aba00eb75335532c0413f7c819c2e2d12fcd4314 +RMD160 (v2.6.0.tar.gz) = f0330b9394be19083b850d7d5b68d1bf846ce775 +Size (v2.6.0.tar.gz) = 287834 bytes SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643 -SHA1 (patch-modplug.c) = b08ea6c1c3501de9b3b2614df9f6450c0b508895 SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk index 36570409404..dbb7e3931d2 100644 --- a/audio/cmus/options.mk +++ b/audio/cmus/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.13 2014/08/11 23:09:44 wiz Exp $ +# $NetBSD: options.mk,v 1.14 2014/08/18 09:34:49 gls Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cmus PKG_SUPPORTED_OPTIONS= flac mad vorbis arts libao musepack faad wavpack pulseaudio -PKG_SUPPORTED_OPTIONS+= wide-curses ffmpeg +PKG_SUPPORTED_OPTIONS+= wide-curses ffmpeg opus jack PKG_OPTIONS_OPTIONAL_GROUPS= mod PKG_OPTIONS_GROUP.mod= modplug mikmod PKG_SUGGESTED_OPTIONS= flac libao mad modplug vorbis @@ -55,6 +55,16 @@ PLIST.pulseaudio= yes CONFIGURE_ARGS+= CONFIG_PULSE=n .endif +# JACK support +# +.if !empty(PKG_OPTIONS:Mjack) +.include "../../audio/jack/buildlink3.mk" +CONFIGURE_ARGS+= CONFIG_JACK=y +PLIST.jack= yes +.else +CONFIGURE_ARGS+= CONFIG_JACK=n +.endif + ### ### Codecs ### @@ -148,6 +158,16 @@ CONFIGURE_ARGS+= CONFIG_AAC=n CONFIGURE_ARGS+= CONFIG_MP4=n .endif +# Opus support +# +.if !empty(PKG_OPTIONS:Mopus) +.include "../../audio/opusfile/buildlink3.mk" +CONFIGURE_ARGS+= CONFIG_OPUS=y +PLIST.opus= yes +.else +CONFIGURE_ARGS+= CONFIG_OPUS=n +.endif + ### ### Wide curses support; otherwise, default to using narrow curses. ### diff --git a/audio/cmus/patches/patch-modplug.c b/audio/cmus/patches/patch-modplug.c deleted file mode 100644 index dd841d2d3a0..00000000000 --- a/audio/cmus/patches/patch-modplug.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-modplug.c,v 1.2 2014/04/21 09:49:49 wiz Exp $ - -Adapt for header path change. - ---- modplug.c.orig 2014-04-19 13:01:44.000000000 +0000 -+++ modplug.c -@@ -24,7 +24,7 @@ - #include "config/modplug.h" - #endif - --#include <modplug.h> -+#include <libmodplug/modplug.h> - #include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> |