CVS commit: pkgsrc/devel/SDL

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul  9 09:56:29 UTC 2025

Modified Files:
        pkgsrc/devel/SDL: distinfo
Added Files:
        pkgsrc/devel/SDL/patches: patch-src_stdlib_SDL__iconv.c

Log Message:
SDL: Default to non-const iconv.

This is not ideal, it really needs to be a proper configure test, but for now
go with what the vast majority of systems will use and fix the build with GCC
14.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/SDL/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/SDL/patches/patch-src_stdlib_SDL__iconv.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/SDL/distinfo
diff -u pkgsrc/devel/SDL/distinfo:1.88 pkgsrc/devel/SDL/distinfo:1.89
--- pkgsrc/devel/SDL/distinfo:1.88      Thu Feb 27 10:58:28 2025
+++ pkgsrc/devel/SDL/distinfo   Wed Jul  9 09:56:28 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2025/02/27 10:58:28 nia Exp $
+$NetBSD: distinfo,v 1.89 2025/07/09 09:56:28 jperkin Exp $
 
 BLAKE2s (SDL-1.2.15.tar.gz) = 4c189e4973635d37bbc9a4d87512bbbeb950d49c4862bc59f1bf2c37b9c54cc7
 SHA512 (SDL-1.2.15.tar.gz) = ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
@@ -10,6 +10,7 @@ SHA1 (patch-src_audio_SDL__wave.c) = ff4
 SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 7f5fbf4d839e52fce028810dc807b404fcd51442
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = a20608d6a4cc8f2c8f5fb2d77a572f373178151b
+SHA1 (patch-src_stdlib_SDL__iconv.c) = 4206d16ba548d81e024c720c66d4864e5ddbdf0c
 SHA1 (patch-src_video_SDL__bmp.c) = 89252aa0de90a80cb7fa1c0bf6a7e0e73973ff83
 SHA1 (patch-src_video_SDL__pixels.c) = e4c1feeda33cdd5e891ff203c573c5f578d17368
 SHA1 (patch-src_video_nanox_SDL__nxvideo.c) = 653ff4358d62f7093f646fba5ddae2921876144c

Added files:

Index: pkgsrc/devel/SDL/patches/patch-src_stdlib_SDL__iconv.c
diff -u /dev/null pkgsrc/devel/SDL/patches/patch-src_stdlib_SDL__iconv.c:1.1
--- /dev/null   Wed Jul  9 09:56:29 2025
+++ pkgsrc/devel/SDL/patches/patch-src_stdlib_SDL__iconv.c      Wed Jul  9 09:56:28 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_stdlib_SDL__iconv.c,v 1.1 2025/07/09 09:56:28 jperkin Exp $
+
+Default to non-const iconv() to fix the majority of systems with GCC 14.
+
+--- src/stdlib/SDL_iconv.c.orig        2012-01-19 06:30:06.000000000 +0000
++++ src/stdlib/SDL_iconv.c
+@@ -31,11 +31,12 @@
+ /* Depending on which standard the iconv() was implemented with,
+    iconv() may or may not use const char ** for the inbuf param.
+    If we get this wrong, it's just a warning, so no big deal.
++
++   This is no longer true with GCC 14, which turns this into an
++   error.  In lieu of a proper configure test we simply go with
++   non const by default as that is what the vast majority use.
+ */
+-#if defined(_XGP6) || \
+-    defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+ #define ICONV_INBUF_NONCONST
+-#endif
+ 
+ #include <errno.h>
+