CVS commit: [pkgsrc-2025Q3] pkgsrc/devel/SDL2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct 21 02:25:03 UTC 2025

Modified Files:
        pkgsrc/devel/SDL2 [pkgsrc-2025Q3]: Makefile distinfo
Added Files:
        pkgsrc/devel/SDL2/patches [pkgsrc-2025Q3]:
            patch-src_audio_alsa_SDL__alsa__audio.c

Log Message:
Pullup ticket #7015 - requested by bsiegert
devel/SDL2: build fix

Revisions pulled up:
- devel/SDL2/Makefile                                           1.110
- devel/SDL2/distinfo                                           1.86
- devel/SDL2/patches/patch-src_audio_alsa_SDL__alsa__audio.c    1.1

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Tue Oct  7 15:46:59 UTC 2025

   Modified Files:
            pkgsrc/devel/SDL2: Makefile distinfo
   Added Files:
            pkgsrc/devel/SDL2/patches: patch-src_audio_alsa_SDL__alsa__audio.c

   Log Message:
   devel/SDL2: Fix build with GCC 14 when alsa option is enabled


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.109.2.1 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.85 -r1.85.2.1 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/devel/SDL2/patches/patch-src_audio_alsa_SDL__alsa__audio.c

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

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.109 pkgsrc/devel/SDL2/Makefile:1.109.2.1
--- pkgsrc/devel/SDL2/Makefile:1.109    Tue Sep  2 05:19:09 2025
+++ pkgsrc/devel/SDL2/Makefile  Tue Oct 21 02:25:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2025/09/02 05:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.109.2.1 2025/10/21 02:25:02 maya Exp $
 
 DISTNAME=      SDL2-2.32.10
 CATEGORIES=    devel
@@ -11,6 +11,10 @@ HOMEPAGE=    https://www.libsdl.org/
 COMMENT=       Simple DirectMedia Layer - cross-platform multimedia library
 LICENSE=       zlib
 
+# For GNU sort. This package requires -V option of GNU sort.
+TOOL_DEPENDS+=         coreutils-[0-9]*:../../sysutils/coreutils
+TOOLS_PLATFORM.sort=   # empty
+
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.85 pkgsrc/devel/SDL2/distinfo:1.85.2.1
--- pkgsrc/devel/SDL2/distinfo:1.85     Tue Sep  2 05:19:09 2025
+++ pkgsrc/devel/SDL2/distinfo  Tue Oct 21 02:25:02 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.85 2025/09/02 05:19:09 adam Exp $
+$NetBSD: distinfo,v 1.85.2.1 2025/10/21 02:25:02 maya Exp $
 
 BLAKE2s (SDL2-2.32.10.tar.gz) = 7815147745deb41a62fbc33361fde19fd4f6cf386d1fa6f01f343b62b317c200
 SHA512 (SDL2-2.32.10.tar.gz) = b67ebdb46bc3b41c974113937e15445e47a6e115692761e2812c3965e85b9ca4d804633de6369fa3dd36cc77f5d08655570c1707245b2c46f88114aa3238fd1b
 Size (SDL2-2.32.10.tar.gz) = 7630262 bytes
 SHA1 (patch-sdl2-config.in) = 963486e3cf6cb437f43197885e9f519ace4497c1
+SHA1 (patch-src_audio_alsa_SDL__alsa__audio.c) = c1426efb8df16328f9546aa7578edd7bbdcf8bad

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-src_audio_alsa_SDL__alsa__audio.c
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_audio_alsa_SDL__alsa__audio.c:1.1.2.2
--- /dev/null   Tue Oct 21 02:25:03 2025
+++ pkgsrc/devel/SDL2/patches/patch-src_audio_alsa_SDL__alsa__audio.c   Tue Oct 21 02:25:03 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_audio_alsa_SDL__alsa__audio.c,v 1.1.2.2 2025/10/21 02:25:03 maya Exp $
+
+* Make compatible with alsa-lib-1.2.14 to fix alsa option build with GCC 14.
+
+--- src/audio/alsa/SDL_alsa_audio.c.orig       2025-10-07 15:41:55.292495535 +0000
++++ src/audio/alsa/SDL_alsa_audio.c
+@@ -88,7 +88,7 @@ static const char *(*ALSA_snd_pcm_info_g
+ static int (*ALSA_snd_pcm_info_get_card)(const snd_pcm_info_t *);
+ static int (*ALSA_snd_card_get_name)(int, char **);
+ static int (*ALSA_snd_pcm_info_malloc)(snd_pcm_info_t **);
+-static int (*ALSA_snd_pcm_info_free)(snd_pcm_info_t *);
++static void (*ALSA_snd_pcm_info_free)(snd_pcm_info_t *);
+ #ifdef SND_CHMAP_API_VERSION
+ static snd_pcm_chmap_t *(*ALSA_snd_pcm_get_chmap)(snd_pcm_t *);
+ static int (*ALSA_snd_pcm_chmap_print)(const snd_pcm_chmap_t *map, size_t maxlen, char *buf);