CVS commit: pkgsrc/audio/mpg321

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Oct  7 03:56:02 UTC 2025

Modified Files:
        pkgsrc/audio/mpg321: distinfo
        pkgsrc/audio/mpg321/patches: patch-mpg321.c
Added Files:
        pkgsrc/audio/mpg321/patches: patch-mpg321.h patch-options.c

Log Message:
Fix build with GCC 14: add missing types mostly.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/mpg321/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/mpg321/patches/patch-mpg321.c
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mpg321/patches/patch-mpg321.h \
    pkgsrc/audio/mpg321/patches/patch-options.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/mpg321/distinfo
diff -u pkgsrc/audio/mpg321/distinfo:1.12 pkgsrc/audio/mpg321/distinfo:1.13
--- pkgsrc/audio/mpg321/distinfo:1.12   Tue Oct 26 09:59:16 2021
+++ pkgsrc/audio/mpg321/distinfo        Tue Oct  7 03:56:02 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 09:59:16 nia Exp $
+$NetBSD: distinfo,v 1.13 2025/10/07 03:56:02 mrg Exp $
 
 BLAKE2s (mpg321_0.3.2.orig.tar.gz) = ab12efcdd1c285492338d1dfb78b88564cd1e4d847cb3e3eb2262aa8b24ee8d8
 SHA512 (mpg321_0.3.2.orig.tar.gz) = f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
 Size (mpg321_0.3.2.orig.tar.gz) = 151139 bytes
 SHA1 (patch-ao.c) = cb404acdfb032c5a823c717965d14319db0d4466
-SHA1 (patch-mpg321.c) = 74ee0501db20e2d427c79a4a4f1f418ab05d8fd6
+SHA1 (patch-mpg321.c) = 3d3939a83404bae20a397f8bbc6f2584169ad466
+SHA1 (patch-mpg321.h) = 79f991a1a18b09b851a42a1e44c24eac33f5a0ad
+SHA1 (patch-options.c) = 316b1428ed5453ec3633b47cd3e398680b5b9255

Index: pkgsrc/audio/mpg321/patches/patch-mpg321.c
diff -u pkgsrc/audio/mpg321/patches/patch-mpg321.c:1.3 pkgsrc/audio/mpg321/patches/patch-mpg321.c:1.4
--- pkgsrc/audio/mpg321/patches/patch-mpg321.c:1.3      Sun Jul  8 13:42:13 2018
+++ pkgsrc/audio/mpg321/patches/patch-mpg321.c  Tue Oct  7 03:56:02 2025
@@ -1,11 +1,21 @@
-$NetBSD: patch-mpg321.c,v 1.3 2018/07/08 13:42:13 leot Exp $
+$NetBSD: patch-mpg321.c,v 1.4 2025/10/07 03:56:02 mrg Exp $
 
 - Ensure structs are zero'd before use.
 - Do not unlock uninitialized main_lock
+- Add missing type for http_file_length
 
---- mpg321.c.orig      2012-03-25 12:27:49.000000000 +0000
-+++ mpg321.c
-@@ -525,6 +525,7 @@ int main(int argc, char *argv[])
+--- mpg321.c.orig      2012-03-25 05:27:49.000000000 -0700
++++ mpg321.c   2025-09-29 14:02:15.346443620 -0700
+@@ -99,7 +99,7 @@
+ /* PID of frame buffer process */
+ pid_t output_pid;
+ /* Not used for the moment. It only works for CBR http/ftp retrieved files */
+-extern http_file_length;
++extern int http_file_length;
+ #ifdef HAVE_ALSA
+ /* ALSA Volume Range */
+ extern long volume_min,volume_max;
+@@ -525,6 +525,7 @@
      
      old_dir[0] = '\0';
  
@@ -13,7 +23,7 @@ $NetBSD: patch-mpg321.c,v 1.3 2018/07/08
      playbuf.pl = pl = new_playlist();
  
      if (!pl)
-@@ -728,12 +729,13 @@ int main(int argc, char *argv[])
+@@ -728,12 +729,13 @@
  //        options.volume = mad_f_tofixed((long)100.0/100.0);
      }
  

Added files:

Index: pkgsrc/audio/mpg321/patches/patch-mpg321.h
diff -u /dev/null pkgsrc/audio/mpg321/patches/patch-mpg321.h:1.1
--- /dev/null   Tue Oct  7 03:56:02 2025
+++ pkgsrc/audio/mpg321/patches/patch-mpg321.h  Tue Oct  7 03:56:02 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-mpg321.h,v 1.1 2025/10/07 03:56:02 mrg Exp $
+
+Add / uncomment missing prototypes for GCC 14.
+
+
+--- mpg321.h.orig      2012-03-25 05:27:49.000000000 -0700
++++ mpg321.h   2025-09-29 14:04:56.946748517 -0700
+@@ -242,7 +242,7 @@
+ } fft_state;
+ 
+ typedef short int sound_sample;
+-//void fft_perform(const sound_sample *input, double *output, fft_state *state);
++void fft_perform(const sound_sample *input, double *output, fft_state *state);
+ 
+ fft_state *fft_init(void);
+ 
+@@ -303,4 +303,9 @@
+ /* Get the next encoding/decoding place in the frame buffer */
+ int getnext_place(int position);
+ 
++int calc_http_length(buffer *buf);
++void do_basicauth(void);
++ao_device *open_ao_playdevice_buffer(struct mad_header const *header);
++int check_default_play_device_buffer(void);
++
+ #endif /* _MPG321_H_ */
Index: pkgsrc/audio/mpg321/patches/patch-options.c
diff -u /dev/null pkgsrc/audio/mpg321/patches/patch-options.c:1.1
--- /dev/null   Tue Oct  7 03:56:02 2025
+++ pkgsrc/audio/mpg321/patches/patch-options.c Tue Oct  7 03:56:02 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-options.c,v 1.1 2025/10/07 03:56:02 mrg Exp $
+
+Add missing type for remote_restart.
+
+
+--- options.c.orig     2012-03-25 05:27:49.000000000 -0700
++++ options.c  2025-09-29 14:04:02.339936322 -0700
+@@ -44,7 +44,7 @@
+ extern char *proxy_server;
+ extern int auth_enable;
+ extern int auth_enable_var;
+-extern remote_restart;
++extern int remote_restart;
+ /*Basic Authentication Arguments*/
+ char *basic_auth = NULL;
+