CVS commit: pkgsrc/audio/cmus

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Sep 30 13:07:09 UTC 2022

Modified Files:
        pkgsrc/audio/cmus: Makefile PLIST distinfo
        pkgsrc/audio/cmus/patches: patch-op_mixer__sun.c

Log Message:
cmus: Update to 2.10.0

upstream changes:
-----------------
  * https://github.com/cmus/cmus/releases/tag/v2.10.0


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/cmus/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/cmus/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/cmus/Makefile
diff -u pkgsrc/audio/cmus/Makefile:1.103 pkgsrc/audio/cmus/Makefile:1.104
--- pkgsrc/audio/cmus/Makefile:1.103    Tue Sep 27 20:58:21 2022
+++ pkgsrc/audio/cmus/Makefile  Fri Sep 30 13:07:09 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2022/09/27 20:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2022/09/30 13:07:09 triaxx Exp $
 
-DISTNAME=              cmus-2.9.1
-PKGREVISION=           10
+DISTNAME=              cmus-2.10.0
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=cmus/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}

Index: pkgsrc/audio/cmus/PLIST
diff -u pkgsrc/audio/cmus/PLIST:1.19 pkgsrc/audio/cmus/PLIST:1.20
--- pkgsrc/audio/cmus/PLIST:1.19        Wed Feb  3 09:46:08 2021
+++ pkgsrc/audio/cmus/PLIST     Fri Sep 30 13:07:09 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2021/02/03 09:46:08 nia Exp $
+@comment $NetBSD: PLIST,v 1.20 2022/09/30 13:07:09 triaxx Exp $
 bin/cmus
 bin/cmus-remote
 ${PLIST.faad}lib/cmus/ip/aac.so
@@ -39,6 +39,7 @@ share/cmus/night.theme
 share/cmus/rc
 share/cmus/solarized-dark.theme
 share/cmus/solarized-light.theme
+share/cmus/spotify.theme
 share/cmus/xterm-white.theme
 share/cmus/zenburn.theme
 share/doc/cmus/examples/cmus-status-display

Index: pkgsrc/audio/cmus/distinfo
diff -u pkgsrc/audio/cmus/distinfo:1.27 pkgsrc/audio/cmus/distinfo:1.28
--- pkgsrc/audio/cmus/distinfo:1.27     Tue Oct 26 09:58:50 2021
+++ pkgsrc/audio/cmus/distinfo  Fri Sep 30 13:07:09 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 09:58:50 nia Exp $
+$NetBSD: distinfo,v 1.28 2022/09/30 13:07:09 triaxx Exp $
 
-BLAKE2s (cmus-2.9.1.tar.gz) = e58edef1d34ac031335a78941ca0d2e1b73c5f7368ba5ef752f6193ca2cff8e4
-SHA512 (cmus-2.9.1.tar.gz) = b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-Size (cmus-2.9.1.tar.gz) = 321004 bytes
+BLAKE2s (cmus-2.10.0.tar.gz) = 7524960bc1671eaaa3f675d05aed80137575dabbc44b84b6202d11928b2cafe8
+SHA512 (cmus-2.10.0.tar.gz) = c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
+Size (cmus-2.10.0.tar.gz) = 324121 bytes
 SHA1 (patch-op_alsa.c) = 3a50d91fb0ec04dcb67c926fb3ed80abd4baacd3
-SHA1 (patch-op_mixer__sun.c) = 13cb31e8b4aeab487b10af2aceeff9e248eb4b58
+SHA1 (patch-op_mixer__sun.c) = 2400a15fc543b845e2de2ca2cbc41218f795b180
 SHA1 (patch-op_sun.c) = 30c402c44617ec0163e5885aa40a024e9a0deeac

Index: pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c
diff -u pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c:1.1 pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c:1.2
--- pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c:1.1 Mon Feb 11 10:07:37 2019
+++ pkgsrc/audio/cmus/patches/patch-op_mixer__sun.c     Fri Sep 30 13:07:09 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-op_mixer__sun.c,v 1.1 2019/02/11 10:07:37 nia Exp $
+$NetBSD: patch-op_mixer__sun.c,v 1.2 2022/09/30 13:07:09 triaxx 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
+@@ -52,6 +52,7 @@ static int sun_mixer_get_option(int, cha
  
  static int mixer_open(const char *dev)
  {
@@ -12,7 +12,7 @@ Fix build on SunOS.
        struct mixer_devinfo minf;
        int output_class;
  
-@@ -100,6 +101,7 @@ static int mixer_open(const char *dev)
+@@ -97,6 +98,7 @@ static int mixer_open(const char *dev)
  
        if (sun_mixer_volume_delta == 0)
                sun_mixer_volume_delta = 1;
@@ -20,7 +20,7 @@ Fix build on SunOS.
  
        return 0;
  
-@@ -192,6 +194,7 @@ static int sun_mixer_close(void)
+@@ -189,6 +191,7 @@ static int sun_mixer_close(void)
  
  static int sun_mixer_set_volume(int l, int r)
  {
@@ -28,7 +28,7 @@ Fix build on SunOS.
        struct mixer_ctrl minf;
        int ovall, ovalr;
  
-@@ -215,12 +218,14 @@ static int sun_mixer_set_volume(int l, i
+@@ -212,12 +215,14 @@ static int sun_mixer_set_volume(int l, i
  
        if (ioctl(mixer_fd, AUDIO_MIXER_WRITE, &minf) == -1)
                return -1;
@@ -43,7 +43,7 @@ Fix build on SunOS.
        struct mixer_ctrl minf;
  
        minf.dev = sun_mixer_device_id;
-@@ -237,6 +242,7 @@ static int sun_mixer_get_volume(int *l, 
+@@ -234,6 +239,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];
        }