CVS commit: pkgsrc/audio/sox

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Oct 12 04:06:27 UTC 2025

Modified Files:
        pkgsrc/audio/sox: distinfo
        pkgsrc/audio/sox/patches: patch-src_sox.c
Added Files:
        pkgsrc/audio/sox/patches: patch-src_sox_sample_test.h

Log Message:
include <math.h> and <sys/ioctl.h> for function prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/audio/sox/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/sox/patches/patch-src_sox.c
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/sox/patches/patch-src_sox_sample_test.h

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

Modified files:

Index: pkgsrc/audio/sox/distinfo
diff -u pkgsrc/audio/sox/distinfo:1.31 pkgsrc/audio/sox/distinfo:1.32
--- pkgsrc/audio/sox/distinfo:1.31      Sun Apr 24 09:39:46 2022
+++ pkgsrc/audio/sox/distinfo   Sun Oct 12 04:06:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2022/04/24 09:39:46 nia Exp $
+$NetBSD: distinfo,v 1.32 2025/10/12 04:06:27 mrg Exp $
 
 BLAKE2s (sox-14.4.2.tar.gz) = a995d9682dad17ae557248bc008e16309537b49e3229390478e432882445b6d2
 SHA512 (sox-14.4.2.tar.gz) = b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
@@ -6,5 +6,6 @@ Size (sox-14.4.2.tar.gz) = 1134299 bytes
 SHA1 (patch-ak) = 28675f56a0e2969d0facd98282667c53eb10c0ed
 SHA1 (patch-src_coreaudio.c) = baee5596ec5efdc12f99ea9dab9e9c691a17b08d
 SHA1 (patch-src_oss.c) = dca4dcf55d4bfa1da80b789cbddb48a9302e694b
-SHA1 (patch-src_sox.c) = 2ac1ec7157a1cd9581d07fea5093f49df2dd7b7f
+SHA1 (patch-src_sox.c) = c282b97b1a9e8b7d7bb7ecd1db663e69709156bc
+SHA1 (patch-src_sox_sample_test.h) = e2434980c42832cf875bb6c97bb11b2461c0bee6
 SHA1 (patch-src_sunaudio.c) = 9f6a67b09c46cbc8298c226d972c43e86aeaae26

Index: pkgsrc/audio/sox/patches/patch-src_sox.c
diff -u pkgsrc/audio/sox/patches/patch-src_sox.c:1.1 pkgsrc/audio/sox/patches/patch-src_sox.c:1.2
--- pkgsrc/audio/sox/patches/patch-src_sox.c:1.1        Sun Apr 24 09:39:46 2022
+++ pkgsrc/audio/sox/patches/patch-src_sox.c    Sun Oct 12 04:06:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_sox.c,v 1.1 2022/04/24 09:39:46 nia Exp $
+$NetBSD: patch-src_sox.c,v 1.2 2025/10/12 04:06:27 mrg Exp $
 
 PR pkg/56800 hitting v or V during sox's play command causes a
 segfault
@@ -10,10 +10,15 @@ fileno under the assumption that stdio w
 
 output_muted is not defined on NetBSD.
 
---- src/sox.c.orig     2014-10-06 02:02:30.000000000 +0000
-+++ src/sox.c
-@@ -1313,7 +1313,8 @@ static void adjust_volume(int delta)
+include <sys/ioctl.h> to get ioctl() prototype.
+
+--- src/sox.c.orig     2014-10-05 19:02:30.000000000 -0700
++++ src/sox.c  2025-10-11 20:54:02.019395172 -0700
+@@ -1311,9 +1311,11 @@ static void adjust_volume(int delta)
+     putc('\a', stderr);
+ }
  #elif defined(HAVE_AUDIOIO_H)
++#include <sys/ioctl.h>
  static void adjust_volume(int delta)
  {
 -  int vol1 = 0, vol2 = 0, fd = fileno((FILE*)ofile->ft->fp);
@@ -22,7 +27,7 @@ output_muted is not defined on NetBSD.
    if (fd >= 0) {
      audio_info_t audio_info;
      if (ioctl(fd, AUDIO_GETINFO, &audio_info) >= 0) {
-@@ -1321,7 +1322,9 @@ static void adjust_volume(int delta)
+@@ -1321,7 +1323,9 @@ static void adjust_volume(int delta)
        vol2 = range_limit(vol1 + delta, 0, 100);
        AUDIO_INITINFO(&audio_info);
        audio_info.play.gain = (vol2 * AUDIO_MAX_GAIN + 50) / 100;

Added files:

Index: pkgsrc/audio/sox/patches/patch-src_sox_sample_test.h
diff -u /dev/null pkgsrc/audio/sox/patches/patch-src_sox_sample_test.h:1.1
--- /dev/null   Sun Oct 12 04:06:27 2025
+++ pkgsrc/audio/sox/patches/patch-src_sox_sample_test.h        Sun Oct 12 04:06:27 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_sox_sample_test.h,v 1.1 2025/10/12 04:06:27 mrg Exp $
+
+Include <math.h> for fabs(3) usage.
+
+--- src/sox_sample_test.h.orig 2012-01-23 14:27:33.000000000 -0800
++++ src/sox_sample_test.h      2025-10-11 20:55:31.269901766 -0700
+@@ -19,6 +19,7 @@
+ #undef NDEBUG /* Must undef above assert.h or other that might include it. */
+ #endif
+ #include <assert.h>
++#include <math.h>
+ #include "sox.h"
+ 
+ #define TEST_UINT(bits) \