CVS commit: pkgsrc/audio/libsndfile

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr 28 16:26:05 UTC 2025

Modified Files:
        pkgsrc/audio/libsndfile: distinfo
Added Files:
        pkgsrc/audio/libsndfile/patches: patch-src_ALAC_alac__decoder.c
            patch-src_ALAC_alac__encoder.c

Log Message:
libsndfile: add upstream fix for GCC 15


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/audio/libsndfile/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__decoder.c \
    pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__encoder.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/libsndfile/distinfo
diff -u pkgsrc/audio/libsndfile/distinfo:1.56 pkgsrc/audio/libsndfile/distinfo:1.57
--- pkgsrc/audio/libsndfile/distinfo:1.56       Wed Aug 23 15:37:39 2023
+++ pkgsrc/audio/libsndfile/distinfo    Mon Apr 28 16:26:05 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.56 2023/08/23 15:37:39 adam Exp $
+$NetBSD: distinfo,v 1.57 2025/04/28 16:26:05 tnn Exp $
 
 BLAKE2s (libsndfile-1.2.2.tar.xz) = c8008ba1286ccbc30bdef26ab0776c7382ffdbbdf0c6866d95648a46e3483179
 SHA512 (libsndfile-1.2.2.tar.xz) = a6e3ea3ac5d91befaa99f6a31a3fac44e7b7c11f1de4698167317a461d5a19a2651d47486a920b34400f18367b4f6173bf0c1c9ba80eb682cece1b5beee352a0
 Size (libsndfile-1.2.2.tar.xz) = 730760 bytes
+SHA1 (patch-src_ALAC_alac__decoder.c) = a90a21bc3f4a50343a9e4f9e4cabedeb1db4f438
+SHA1 (patch-src_ALAC_alac__encoder.c) = e3a956c06f7e6ebd4b743bb4a8a8ea4b998681d7

Added files:

Index: pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__decoder.c
diff -u /dev/null pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__decoder.c:1.1
--- /dev/null   Mon Apr 28 16:26:05 2025
+++ pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__decoder.c      Mon Apr 28 16:26:05 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_ALAC_alac__decoder.c,v 1.1 2025/04/28 16:26:05 tnn Exp $
+
+GCC 15 build fix:
+https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch
+
+--- src/ALAC/alac_decoder.c.orig       2021-05-17 09:12:28.000000000 +0000
++++ src/ALAC/alac_decoder.c
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <stdbool.h>
+ #include <string.h>
+ 
+ #include "alac_codec.h"
+@@ -38,11 +39,6 @@
+ #include "ALACBitUtilities.h"
+ #include "EndianPortable.h"
+ 
+-typedef enum
+-{     false = 0,
+-      true = 1
+-} bool ;
+-
+ // constants/data
+ const uint32_t kMaxBitDepth = 32 ;                    // max allowed bit depth is 32
+ 
Index: pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__encoder.c
diff -u /dev/null pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__encoder.c:1.1
--- /dev/null   Mon Apr 28 16:26:05 2025
+++ pkgsrc/audio/libsndfile/patches/patch-src_ALAC_alac__encoder.c      Mon Apr 28 16:26:05 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_ALAC_alac__encoder.c,v 1.1 2025/04/28 16:26:05 tnn Exp $
+
+GCC 15 build fix:
+https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch
+
+--- src/ALAC/alac_encoder.c.orig       2021-05-17 09:12:28.000000000 +0000
++++ src/ALAC/alac_encoder.c
+@@ -30,6 +30,7 @@
+ // headers
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ 
+ #include "sfendian.h"
+@@ -44,12 +45,6 @@
+ #include "ALACAudioTypes.h"
+ #include "EndianPortable.h"
+ 
+-typedef enum
+-{
+-      false = 0,
+-      true = 1
+-} bool ;
+-
+ static void   GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ;
+ 
+ static int32_t        EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ;