CVS commit: pkgsrc/audio/xmmix

["Chuck Cranor" <chuck%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   chuck
Date:           Fri Oct  9 18:17:24 UTC 2026

Modified Files:
        pkgsrc/audio/xmmix: distinfo
        pkgsrc/audio/xmmix/patches: patch-ab

Log Message:
xmmix: fix ioctl cmd type error in do_ioctl() wrapper

xmmix's do_ioctl() ioctl wrapper function typed the second arg
of ioctl ("unsigned long request") as "int cmd" instead.  this
type conversion mangled the request value being passed to the
ioctl syscall and resulted in an "Invalid argument" error for
a FIOASYNC request on /dev/mixer.   resolve by changing do_ioctl()
from "int cmd" to "unsigned int cmd" to match ioctl() man page.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/xmmix/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/xmmix/patches/patch-ab

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

Modified files:

Index: pkgsrc/audio/xmmix/distinfo
diff -u pkgsrc/audio/xmmix/distinfo:1.10 pkgsrc/audio/xmmix/distinfo:1.11
--- pkgsrc/audio/xmmix/distinfo:1.10    Tue Oct 26 09:59:37 2021
+++ pkgsrc/audio/xmmix/distinfo Fri Oct  9 18:17:24 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 09:59:37 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/10/09 18:17:24 chuck Exp $
 
 BLAKE2s (xmmix-1.2.tar.gz) = 8d00c3e0c6bd703f2011f07b09432340f0073553d545b33113d81ef40b0d4fa8
 SHA512 (xmmix-1.2.tar.gz) = 82704081ff866bb3b73319a7931af6662cc9a1724b8cb9bc44331392c4ccf408314f56d6b6ae72bf4b77475dc084d95f656d4772358b729d11c922c446bf7d3b
 Size (xmmix-1.2.tar.gz) = 33496 bytes
 SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33
-SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129
+SHA1 (patch-ab) = 9d82256971de2691ae6048372b390f68a18ed82d
 SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb
 SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028
 SHA1 (patch-bb) = 1c01aa80d4c24ba7caecb1a4ef97ac36d8e242ba

Index: pkgsrc/audio/xmmix/patches/patch-ab
diff -u pkgsrc/audio/xmmix/patches/patch-ab:1.2 pkgsrc/audio/xmmix/patches/patch-ab:1.3
--- pkgsrc/audio/xmmix/patches/patch-ab:1.2     Tue Oct  8 12:30:57 2002
+++ pkgsrc/audio/xmmix/patches/patch-ab Fri Oct  9 18:17:24 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2002/10/08 12:30:57 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2026/10/09 18:17:24 chuck Exp $
 
---- mixer.c.orig       Thu Nov  7 08:00:26 1996
+--- mixer.c.orig       1996-11-07 16:00:26.000000000 +0000
 +++ mixer.c
 @@ -104,6 +104,14 @@ STATIC ctlinfo_t  ctlsav;         /* Saved state
   ***********************/
@@ -17,6 +17,15 @@ $NetBSD: patch-ab,v 1.2 2002/10/08 12:30
  /*
   * do_ioctl
   *    Perform ioctl command.  If file is not yet open or if we
+@@ -124,7 +132,7 @@ STATIC ctlinfo_t   ctlsav;         /* Saved state
+  *    Nothing
+  */
+ STATIC void
+-do_ioctl(int cmd, int *arg, char *name, int dir)
++do_ioctl(unsigned long cmd, int *arg, char *name, int dir)
+ {
+       int     ret;
+       char    errmsg[STR_BUF_SZ];
 @@ -201,12 +209,18 @@ mx_queryhw(widgets_t *m)
                        ctlinfo.slinfo[i].right = ((level >> 8) & 0xff);
  
@@ -91,18 +100,10 @@ $NetBSD: patch-ab,v 1.2 2002/10/08 12:30
        /* Update screen controls to match current status */
        mx_updctl(m);
  }
-@@ -1531,6 +1563,22 @@ mx_focuschg(Widget w, XtPointer client_d
-       if (p->reason != XmCR_FOCUS || form == (Widget) NULL)
-               return;
+@@ -1539,5 +1571,21 @@ mx_focuschg(Widget w, XtPointer client_d
+ }
+ 
  
-+      /* Query hardware mixer settings */
-+      mx_queryhw(&widgets);
-+
-+      /* Update screen controls */
-+      mx_updctl(&widgets);
-+}
-+
-+
 +/*
 + * mx_change
 + *    Mixer device has changed
@@ -111,6 +112,13 @@ $NetBSD: patch-ab,v 1.2 2002/10/08 12:30
 +void
 +mx_change(XtPointer client_data)
 +{
-       /* Query hardware mixer settings */
-       mx_queryhw(&widgets);
++      /* Query hardware mixer settings */
++      mx_queryhw(&widgets);
++
++      /* Update screen controls */
++      mx_updctl(&widgets);
++}
++
++
+ /**************** ^^ Callback routines ^^ ****************/