CVS commit: pkgsrc/audio/wmmixer

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 13 13:01:51 UTC 2021

Modified Files:
        pkgsrc/audio/wmmixer: Makefile distinfo
Added Files:
        pkgsrc/audio/wmmixer/patches: patch-mixctl.cc

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/wmmixer/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/wmmixer/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/wmmixer/patches/patch-mixctl.cc

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

Modified files:

Index: pkgsrc/audio/wmmixer/Makefile
diff -u pkgsrc/audio/wmmixer/Makefile:1.21 pkgsrc/audio/wmmixer/Makefile:1.22
--- pkgsrc/audio/wmmixer/Makefile:1.21  Tue Nov 24 11:28:29 2020
+++ pkgsrc/audio/wmmixer/Makefile       Fri Aug 13 13:01:51 2021
@@ -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/
 

Index: pkgsrc/audio/wmmixer/distinfo
diff -u pkgsrc/audio/wmmixer/distinfo:1.9 pkgsrc/audio/wmmixer/distinfo:1.10
--- pkgsrc/audio/wmmixer/distinfo:1.9   Tue Nov 24 11:28:29 2020
+++ pkgsrc/audio/wmmixer/distinfo       Fri Aug 13 13:01:51 2021
@@ -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

Added files:

Index: pkgsrc/audio/wmmixer/patches/patch-mixctl.cc
diff -u /dev/null pkgsrc/audio/wmmixer/patches/patch-mixctl.cc:1.1
--- /dev/null   Fri Aug 13 13:01:51 2021
+++ pkgsrc/audio/wmmixer/patches/patch-mixctl.cc        Fri Aug 13 13:01:51 2021
@@ -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;
+ }