CVS commit: pkgsrc/audio/alsa-lib

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug  5 11:55:10 UTC 2024

Modified Files:
        pkgsrc/audio/alsa-lib: distinfo
        pkgsrc/audio/alsa-lib/patches: patch-src_ucm_main.c

Log Message:
alsa-lib: fix pkgsrc patch; don't override fstat64 on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/audio/alsa-lib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.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/alsa-lib/distinfo
diff -u pkgsrc/audio/alsa-lib/distinfo:1.42 pkgsrc/audio/alsa-lib/distinfo:1.43
--- pkgsrc/audio/alsa-lib/distinfo:1.42 Sun Jun 30 06:02:15 2024
+++ pkgsrc/audio/alsa-lib/distinfo      Mon Aug  5 11:55:10 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2024/06/30 06:02:15 wiz Exp $
+$NetBSD: distinfo,v 1.43 2024/08/05 11:55:10 tnn Exp $
 
 BLAKE2s (alsa-lib-1.2.12.tar.bz2) = a17197166a41c51d8a5d01343e48e1651bc21b83c22d9ad3740a8580c7fe74bf
 SHA512 (alsa-lib-1.2.12.tar.bz2) = 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
@@ -21,6 +21,6 @@ SHA1 (patch-src_control_control__hw.c) =
 SHA1 (patch-src_pcm_pcm__mmap.c) = bf5b59af96110bf8f51269b86bcf60ec0e23a06e
 SHA1 (patch-src_seq_seq__midi__event.c) = c5a673a14c23aeefc512f04ac550b906fa4f7d30
 SHA1 (patch-src_shmarea.c) = 1a3b508fafe3ef7fda76620ed1c06035f32e9096
-SHA1 (patch-src_ucm_main.c) = 1e12f2d8734a98aecd7bbea2d9d80d27d45c1173
+SHA1 (patch-src_ucm_main.c) = 965bde91f225bfa685eb7ddadad9c01a04f42b20
 SHA1 (patch-src_ucm_parser.c) = cf53012d24ff7df16800be4b0e6287ae0c3b0799
 SHA1 (patch-src_ucm_ucm__exec.c) = 93380f00497c0f645d4bc5375b66f9f05b4934f1

Index: pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.c
diff -u pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.c:1.1 pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.c:1.2
--- pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.c:1.1      Fri Jul 15 21:17:25 2022
+++ pkgsrc/audio/alsa-lib/patches/patch-src_ucm_main.c  Mon Aug  5 11:55:10 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_ucm_main.c,v 1.1 2022/07/15 21:17:25 wiz Exp $
+$NetBSD: patch-src_ucm_main.c,v 1.2 2024/08/05 11:55:10 tnn Exp $
 
 fstat64 does not exist everywhere, fall back to fstat
 
---- src/ucm/main.c.orig        2022-06-17 09:42:05.000000000 +0000
+--- src/ucm/main.c.orig        2024-06-10 09:18:34.000000000 +0000
 +++ src/ucm/main.c
 @@ -176,6 +176,9 @@ static int read_tlv_file(unsigned int **
                err = -errno;
                return err;
        }
-+#ifndef fstat64
++#if !defined(fstat64) && !defined(__linux__)
 +#define fstat64 fstat
 +#endif
        if (fstat64(fd, &st) == -1) {