CVS commit: pkgsrc/audio/liba52

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 15 07:29:39 UTC 2026

Modified Files:
        pkgsrc/audio/liba52: Makefile distinfo
        pkgsrc/audio/liba52/patches: patch-ab

Log Message:
liba52: Build fixes for GCC 15.

Update configure test for return type of signal(2).

Restrict to C99. Uses "old-style function definitions", but also
restrict keyword.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/liba52/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/liba52/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/liba52/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/liba52/Makefile
diff -u pkgsrc/audio/liba52/Makefile:1.25 pkgsrc/audio/liba52/Makefile:1.26
--- pkgsrc/audio/liba52/Makefile:1.25   Mon Nov 17 11:00:18 2025
+++ pkgsrc/audio/liba52/Makefile        Mon Jun 15 07:29:39 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2025/11/17 11:00:18 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2026/06/15 07:29:39 nia Exp $
 #
 
 DISTNAME=      a52dec-0.7.4
@@ -15,6 +15,9 @@ LICENSE=      gnu-gpl-v2
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 
+# Uses "old-style function definitions", but also restrict keyword.
+FORCE_C_STD=           gnu99
+
 CONFIGURE_ARGS+=       --disable-oss
 CONFIGURE_ARGS+=       --disable-mlib
 CONFIGURE_ARGS+=       --enable-shared

Index: pkgsrc/audio/liba52/distinfo
diff -u pkgsrc/audio/liba52/distinfo:1.11 pkgsrc/audio/liba52/distinfo:1.12
--- pkgsrc/audio/liba52/distinfo:1.11   Tue Oct 26 09:59:04 2021
+++ pkgsrc/audio/liba52/distinfo        Mon Jun 15 07:29:39 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 09:59:04 nia Exp $
+$NetBSD: distinfo,v 1.12 2026/06/15 07:29:39 nia Exp $
 
 BLAKE2s (a52dec-0.7.4.tar.gz) = f85b5024dcac8d460680c6de538b81d85bf2a3b15906a12a58687495d1025e61
 SHA512 (a52dec-0.7.4.tar.gz) = 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
 Size (a52dec-0.7.4.tar.gz) = 241507 bytes
 SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9
-SHA1 (patch-ab) = 79341f97816b93731bdb5999957e36f36b30e63a
+SHA1 (patch-ab) = 786d1e96b6ba9217cc70fd5abed1e6793e4dbfea
 SHA1 (patch-ac) = d226b58ae1314deaa8c938d39669139bd513be18
 SHA1 (patch-ad) = 680e399e79211fb3f788111d5221c5f8227f23b6
 SHA1 (patch-include_config.h.in) = d76affe2af958f43be0843df11e560cc9a4a401c

Index: pkgsrc/audio/liba52/patches/patch-ab
diff -u pkgsrc/audio/liba52/patches/patch-ab:1.4 pkgsrc/audio/liba52/patches/patch-ab:1.5
--- pkgsrc/audio/liba52/patches/patch-ab:1.4    Fri Jul 29 00:41:51 2005
+++ pkgsrc/audio/liba52/patches/patch-ab        Mon Jun 15 07:29:39 2026
@@ -1,27 +1,64 @@
-$NetBSD: patch-ab,v 1.4 2005/07/29 00:41:51 grant Exp $
+$NetBSD: patch-ab,v 1.5 2026/06/15 07:29:39 nia Exp $
 
---- configure.orig     2002-07-28 13:50:42.000000000 +1000
+--- configure.orig     2002-07-28 03:50:42.000000000 +0000
 +++ configure
-@@ -9639,8 +9639,8 @@ _ACEOF
+@@ -9585,14 +9585,6 @@ else
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+-#ifdef signal
+-# undef signal
+-#endif
+-#ifdef __cplusplus
+-extern "C" void (*signal (int, void (*)(int)))(int);
+-#else
+-void (*signal ()) ();
+-#endif
+ 
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+@@ -9600,10 +9592,19 @@ void (*signal ()) ();
+ #  endif
+    int F77_DUMMY_MAIN() { return 1; }
+ #endif
++
++void handler(int signo)
++{
++      (void)signo;
++}
++
+ int
+-main ()
++main (int argc, char **argv)
+ {
+ int i;
++(void)argc;
++(void)argv;
++signal(SIGBUS, handler);
+   ;
+   return 0;
+ }
+@@ -9639,9 +9640,9 @@ _ACEOF
  
  
  
--
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
 +# we set LIBA52_CFLAGS in CONFIGURE_ENV
 +# LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
  
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+-
  # Check whether --enable-double or --disable-double was given.
  if test "${enable_double+set}" = set; then
-@@ -9743,6 +9743,11 @@ if test $ac_cv_lib_ossaudio__oss_ioctl =
+   enableval="$enable_double"
+@@ -9742,6 +9743,11 @@ fi
+ if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
    LIBAO_LIBS="$LIBAO_LIBS -lossaudio"
  fi
- ;;
++;;
 +    *-netbsd*)
 +cat >> confdefs.h <<\EOF
 +#define LIBAO_SOLARIS 
 +EOF
-+;;
+ ;;
      esac
  fi
-