[pkgsrc/trunk]: pkgsrc/audio/wmmixer wmmixer: fix display behaviour on netbsd...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4595d6005c87
branches:  trunk
changeset: 456988:4595d6005c87
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 13 13:01:51 2021 +0000

description:
wmmixer: fix display behaviour on netbsd, reported by snow flurry

diffstat:

 audio/wmmixer/Makefile                |   3 ++-
 audio/wmmixer/distinfo                |   3 ++-
 audio/wmmixer/patches/patch-mixctl.cc |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r b840f82a8da6 -r 4595d6005c87 audio/wmmixer/Makefile
--- a/audio/wmmixer/Makefile    Fri Aug 13 12:46:21 2021 +0000
+++ b/audio/wmmixer/Makefile    Fri Aug 13 13:01:51 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2020/11/24 11:28:29 nia Exp $
+# $NetBSD: Makefile,v 1.22 2021/08/13 13:01:51 nia Exp $
 
 DISTNAME=      wmmixer-1.8
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  https://www.dockapps.net/download/
 
diff -r b840f82a8da6 -r 4595d6005c87 audio/wmmixer/distinfo
--- a/audio/wmmixer/distinfo    Fri Aug 13 12:46:21 2021 +0000
+++ b/audio/wmmixer/distinfo    Fri Aug 13 13:01:51 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2020/11/24 11:28:29 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/08/13 13:01:51 nia Exp $
 
 SHA1 (wmmixer-1.8.tar.gz) = d93af3581e6c39a33b890259850567a6fd904847
 RMD160 (wmmixer-1.8.tar.gz) = a0089a8a9c4d98295578035b035f1a88506072da
 SHA512 (wmmixer-1.8.tar.gz) = 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276
 Size (wmmixer-1.8.tar.gz) = 102723 bytes
+SHA1 (patch-mixctl.cc) = 6301b07ea04d213c1c1ff6677afcf273d85328ce
diff -r b840f82a8da6 -r 4595d6005c87 audio/wmmixer/patches/patch-mixctl.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/wmmixer/patches/patch-mixctl.cc     Fri Aug 13 13:01:51 2021 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-mixctl.cc,v 1.1 2021/08/13 13:01:51 nia Exp $
+
+Workaround:
+modify_counter is not incremented by NetBSD's libossaudio.
+
+--- mixctl.cc.orig     2017-08-27 20:35:35.000000000 +0000
++++ mixctl.cc
+@@ -243,16 +243,11 @@ char* MixCtl::getLabel(int dev)
+ //----------------------------------------------------------------------
+ bool MixCtl::hasChanged()
+ {
+-  struct mixer_info mixer_info1;
+-  ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info1);
+-
+-  if (mixer_info1.modify_counter == modify_counter)
++  for(int i=0;i<SOUND_MIXER_NRDEVICES;i++)
+     {
+-      return false;
+-    }
+-  else
+-    {
+-      modify_counter = mixer_info1.modify_counter;
+-      return true;
++      int val = mixer_devices_[i].value;
++      if(val!=readVol(i, true))
++        return true;
+     }
++  return false;
+ }