pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/cmus audio/cmus: Update to 2.8.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/bb13c91b3b30
branches: trunk
changeset: 329548:bb13c91b3b30
user: nia <nia%pkgsrc.org@localhost>
date: Mon Feb 11 10:07:37 2019 +0000
description:
audio/cmus: Update to 2.8.0
Major new features:
multiple playlists support in playlist view
new :pl-* commands for playlist management
CoreAudio output plugin
BASS input plugin
D-Bus (MPRIS) support
Notable changes:
use of internal cue parser instead of libcue
24-bit playback support for
FLAC
JACK
sndio
plugin ABI versioning checks
new themes:
dracula
gruvbox
gruvbox-alt
jellybeans
new commands:
:left-view / :right-view
:player-pause-playback
:raise-vte
:rand
:version
:win-half-page-down / :win-half-page-up
new options:
color_win_cur_attr
input.*.priority
lib_add_filter
start_view
time_show_leading_zero
diffstat:
audio/cmus/Makefile | 10 ++--
audio/cmus/PLIST | 7 +++-
audio/cmus/distinfo | 14 +++---
audio/cmus/options.mk | 15 ++++---
audio/cmus/patches/patch-mixer__sun.c | 53 ----------------------------
audio/cmus/patches/patch-op_mixer__sun.c | 53 ++++++++++++++++++++++++++++
audio/cmus/patches/patch-op_sun.c | 59 ++++++++++++++++++++++++++++++++
audio/cmus/patches/patch-sun.c | 59 --------------------------------
8 files changed, 139 insertions(+), 131 deletions(-)
diffs (truncated from 364 to 300 lines):
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/Makefile
--- a/audio/cmus/Makefile Mon Feb 11 09:24:54 2019 +0000
+++ b/audio/cmus/Makefile Mon Feb 11 10:07:37 2019 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.74 2018/07/06 15:06:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/02/11 10:07:37 nia Exp $
-DISTNAME= cmus-2.7.1
-PKGREVISION= 11
+DISTNAME= cmus-2.8.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=cmus/}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= ahoka%NetBSD.org@localhost
HOMEPAGE= https://cmus.github.io/
-COMMENT= Cmus is a small, fast and powerful text mode music player
+COMMENT= Small, fast and powerful text mode music player
LICENSE= gnu-gpl-v2
+EXTRACT_USING= bsdtar
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
@@ -18,7 +18,7 @@
CONFIGURE_ARGS+= prefix=${PREFIX}
CONFIGURE_ARGS+= CONFIG_ALSA=n
-CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
+CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}
PLIST_VARS+= sunaudio oss
.include "../../mk/oss.buildlink3.mk"
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/PLIST
--- a/audio/cmus/PLIST Mon Feb 11 09:24:54 2019 +0000
+++ b/audio/cmus/PLIST Mon Feb 11 10:07:37 2019 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2018/01/01 22:29:16 rillig Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/02/11 10:07:37 nia Exp $
bin/cmus
bin/cmus-remote
${PLIST.faad}lib/cmus/ip/aac.so
+lib/cmus/ip/cue.so
${PLIST.ffmpeg}lib/cmus/ip/ffmpeg.so
${PLIST.flac}lib/cmus/ip/flac.so
${PLIST.mad}lib/cmus/ip/mad.so
@@ -23,9 +24,13 @@
man/man7/cmus-tutorial.7
share/cmus/cyan.theme
share/cmus/default.theme
+share/cmus/dracula.theme
share/cmus/gray-88.theme
share/cmus/green-mono-88.theme
share/cmus/green.theme
+share/cmus/gruvbox-alt.theme
+share/cmus/gruvbox.theme
+share/cmus/jellybeans.theme
share/cmus/night.theme
share/cmus/rc
share/cmus/solarized-dark.theme
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/distinfo
--- a/audio/cmus/distinfo Mon Feb 11 09:24:54 2019 +0000
+++ b/audio/cmus/distinfo Mon Feb 11 10:07:37 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2016/08/02 13:57:48 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2019/02/11 10:07:37 nia Exp $
-SHA1 (cmus-2.7.1.tar.gz) = e31000f430054f96a0cf5897caef88741992cd32
-RMD160 (cmus-2.7.1.tar.gz) = f15e690243c0ed693f3c2e0e3c68630e0f5a8631
-SHA512 (cmus-2.7.1.tar.gz) = b29ce10bbb61eb41c33c4912be320718fcf005a5797320145b124f048f6be5f5b0cebb67471ef7b062bd6f854849b6aae0e82e9adbf289a44237787932ea1576
-Size (cmus-2.7.1.tar.gz) = 296818 bytes
-SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
-SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
+SHA1 (cmus-2.8.0.tar.gz) = f2ef867a481190f1f1b34dad450a12ae94201d44
+RMD160 (cmus-2.8.0.tar.gz) = 00cb515afa9848db7610771052409d0d3f9d29d7
+SHA512 (cmus-2.8.0.tar.gz) = cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
+Size (cmus-2.8.0.tar.gz) = 317243 bytes
+SHA1 (patch-op_mixer__sun.c) = 13cb31e8b4aeab487b10af2aceeff9e248eb4b58
+SHA1 (patch-op_sun.c) = d8ab18cf049b05cfa1228483456523e7682d4c55
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/options.mk
--- a/audio/cmus/options.mk Mon Feb 11 09:24:54 2019 +0000
+++ b/audio/cmus/options.mk Mon Feb 11 10:07:37 2019 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.19 2018/05/11 04:12:47 maya Exp $
+# $NetBSD: options.mk,v 1.20 2019/02/11 10:07:37 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
-PKG_SUPPORTED_OPTIONS= flac mad vorbis libao musepack faad wavpack pulseaudio
-PKG_SUPPORTED_OPTIONS+= ffmpeg opus jack
+PKG_SUPPORTED_OPTIONS= flac mad vorbis libao musepack faad wavpack \
+ ffmpeg opus jack pulseaudio
PKG_OPTIONS_OPTIONAL_GROUPS= mod
PKG_OPTIONS_GROUP.mod= modplug mikmod
PKG_SUGGESTED_OPTIONS= faad flac libao mad modplug opus vorbis
-PKG_OPTIONS_LEGACY_OPTS= ao:libao
-PKG_OPTIONS_LEGACY_OPTS= mpcdec:musepack
+PKG_OPTIONS_LEGACY_OPTS+= ao:libao
+PKG_OPTIONS_LEGACY_OPTS+= mpcdec:musepack
.include "../../mk/bsd.options.mk"
@@ -49,10 +49,13 @@
#
.if !empty(PKG_OPTIONS:Mjack)
.include "../../audio/jack/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_JACK=y
+CONFIGURE_ARGS+= CONFIG_SAMPLERATE=y
PLIST.jack= yes
.else
CONFIGURE_ARGS+= CONFIG_JACK=n
+CONFIGURE_ARGS+= CONFIG_SAMPLERATE=n
.endif
###
@@ -112,7 +115,7 @@
# FFMPEG support
#
.if !empty(PKG_OPTIONS:Mffmpeg)
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_FFMPEG=y
PLIST.ffmpeg= yes
.else
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/patches/patch-mixer__sun.c
--- a/audio/cmus/patches/patch-mixer__sun.c Mon Feb 11 09:24:54 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-$NetBSD: patch-mixer__sun.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
-
-Fix build on SunOS.
-
---- mixer_sun.c.orig 2011-11-30 09:57:20.000000000 +0100
-+++ mixer_sun.c 2012-02-15 21:12:05.691072986 +0100
-@@ -55,6 +55,7 @@ static int sun_mixer_get_option(int, cha
-
- static int mixer_open(const char *dev)
- {
-+#ifdef AUDIO_MIXER_DEVINFO
- struct mixer_devinfo minf;
- int output_class;
-
-@@ -100,6 +101,7 @@ static int mixer_open(const char *dev)
-
- if (sun_mixer_volume_delta == 0)
- sun_mixer_volume_delta = 1;
-+#endif
-
- return 0;
-
-@@ -192,6 +194,7 @@ static int sun_mixer_close(void)
-
- static int sun_mixer_set_volume(int l, int r)
- {
-+#ifdef AUDIO_MIXER_DEVINFO
- struct mixer_ctrl minf;
- int ovall, ovalr;
-
-@@ -215,12 +218,14 @@ static int sun_mixer_set_volume(int l, i
-
- if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, &minf) == -1)
- return -1;
-+#endif
-
- return 0;
- }
-
- static int sun_mixer_get_volume(int *l, int *r)
- {
-+#ifdef AUDIO_MIXER_DEVINFO
- struct mixer_ctrl minf;
-
- minf.dev = sun_mixer_device_id;
-@@ -237,6 +242,7 @@ static int sun_mixer_get_volume(int *l,
- *l = minf.un.value.level[AUDIO_MIXER_LEVEL_LEFT];
- *r = minf.un.value.level[AUDIO_MIXER_LEVEL_RIGHT];
- }
-+#endif
-
- return 0;
- }
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/patches/patch-op_mixer__sun.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-op_mixer__sun.c Mon Feb 11 10:07:37 2019 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-op_mixer__sun.c,v 1.1 2019/02/11 10:07:37 nia Exp $
+
+Fix build on SunOS.
+
+--- op/mixer_sun.c.orig 2011-11-30 09:57:20.000000000 +0100
++++ op/mixer_sun.c 2012-02-15 21:12:05.691072986 +0100
+@@ -55,6 +55,7 @@ static int sun_mixer_get_option(int, cha
+
+ static int mixer_open(const char *dev)
+ {
++#ifdef AUDIO_MIXER_DEVINFO
+ struct mixer_devinfo minf;
+ int output_class;
+
+@@ -100,6 +101,7 @@ static int mixer_open(const char *dev)
+
+ if (sun_mixer_volume_delta == 0)
+ sun_mixer_volume_delta = 1;
++#endif
+
+ return 0;
+
+@@ -192,6 +194,7 @@ static int sun_mixer_close(void)
+
+ static int sun_mixer_set_volume(int l, int r)
+ {
++#ifdef AUDIO_MIXER_DEVINFO
+ struct mixer_ctrl minf;
+ int ovall, ovalr;
+
+@@ -215,12 +218,14 @@ static int sun_mixer_set_volume(int l, i
+
+ if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, &minf) == -1)
+ return -1;
++#endif
+
+ return 0;
+ }
+
+ static int sun_mixer_get_volume(int *l, int *r)
+ {
++#ifdef AUDIO_MIXER_DEVINFO
+ struct mixer_ctrl minf;
+
+ minf.dev = sun_mixer_device_id;
+@@ -237,6 +242,7 @@ static int sun_mixer_get_volume(int *l,
+ *l = minf.un.value.level[AUDIO_MIXER_LEVEL_LEFT];
+ *r = minf.un.value.level[AUDIO_MIXER_LEVEL_RIGHT];
+ }
++#endif
+
+ return 0;
+ }
diff -r 77ffa8523243 -r bb13c91b3b30 audio/cmus/patches/patch-op_sun.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-op_sun.c Mon Feb 11 10:07:37 2019 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-op_sun.c,v 1.1 2019/02/11 10:07:37 nia Exp $
+
+Fix build on SunOS.
+
+--- op/sun.c.orig 2011-11-30 09:57:20.000000000 +0100
++++ op/sun.c 2012-02-15 21:12:09.658462551 +0100
+@@ -32,6 +32,26 @@
+ #include "sf.h"
+ #include "xmalloc.h"
+
++/* Compatibility defines, for old *BSD or SunOS systems */
++#ifndef AUDIO_ENCODING_SLINEAR_LE
++#define AUDIO_ENCODING_SLINEAR_LE AUDIO_ENCODING_LINEAR
++#endif
++#ifndef AUDIO_ENCODING_SLINEAR_BE
++#define AUDIO_ENCODING_SLINEAR_BE AUDIO_ENCODING_LINEAR
++#endif
++#ifndef AUDIO_ENCODING_ULINEAR_BE
++#define AUDIO_ENCODING_ULINEAR_BE AUDIO_ENCODING_LINEAR
++#endif
++#ifndef AUDIO_ENCODING_ULINEAR_LE
++#define AUDIO_ENCODING_ULINEAR_LE AUDIO_ENCODING_LINEAR
++#endif
++#ifndef AUDIO_ENCODING_SLINEAR
++#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR8
++#endif
++#ifndef AUDIO_ENCODING_ULINEAR
++#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8
++#endif
++
+ static sample_format_t sun_sf;
+ static int sun_fd = -1;
+
+@@ -39,7 +59,11 @@ static char *sun_audio_device = NULL;
+
+ static int sun_reset(void)
+ {
++#if defined(AUDIO_FLUSH) /* BSD extension */
+ if (ioctl(sun_fd, AUDIO_FLUSH, NULL) == -1)
++#elif defined(I_FLUSH) && defined(FLUSHW)
++ if (ioctl(sun_fd, I_FLUSH, FLUSHW) == -1)
++#endif
+ return -1;
+
+ return 0;
+@@ -57,7 +81,13 @@ static int sun_set_sf(sample_format_t sf
+ ainf.play.channels = sf_get_channels(sun_sf);
+ ainf.play.sample_rate = sf_get_rate(sun_sf);
+ ainf.play.pause = 0;
++#if defined __NetBSD__ || defined __OpenBSD__
++#if defined AUMODE_PLAY_ALL
++ ainf.mode = AUMODE_PLAY | AUMODE_PLAY_ALL;
++#else
+ ainf.mode = AUMODE_PLAY;
++#endif
++#endif
+
+ switch (sf_get_bits(sun_sf)) {
Home |
Main Index |
Thread Index |
Old Index