[Scummvm-git-logs] scummvm master -> a88970021c35fcb8e255f6da773405eaaee6593c

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
a88970021c CONFIGURE: Added --prefer-sdl3 flag


Commit: a88970021c35fcb8e255f6da773405eaaee6593c
    https://github.com/scummvm/scummvm/commit/a88970021c35fcb8e255f6da773405eaaee6593c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-09T13:01:11+02:00

Commit Message:
CONFIGURE: Added --prefer-sdl3 flag

We still were running in SDL2 -> SDL3 -> SDL1 autodetection schema,
making SDL2 our preference.

Recently, Homebrew for Mac dropped sdl2 and switched over sdl2-compat,
and for couple of weeks this misfeature has runtime broken with
ASAN enabled.

This flag allows skipping SDL2 in the detection and go straight to SDL3

Changed paths:
    configure


diff --git a/configure b/configure
index dc7aec30e11..ce9496e8310 100755
--- a/configure
+++ b/configure
@@ -270,6 +270,7 @@ _xcodetoolspath=
 _sparklepath=
 _pkgconfig=pkg-config
 _sdlconfig=sdl2-config
+_prefer_sdl3=no
 _libcurlconfig=curl-config
 _libmikmodconfig=libmikmod-config
 _freetypeconfig=freetype-config
@@ -1192,6 +1193,8 @@ Optional Libraries:
                            then you should pass:
                            '--with-sdl-prefix=/opt/mxe/usr/i686-w64-mingw32.static'
 
+  --prefer-sdl3               prefer SDL3 over SDL2 if both are available [no]
+
   --with-freetype2-prefix=DIR prefix where the freetype-config script is
                               installed (optional)
   --disable-freetype2         disable freetype2 TTF library usage [autodetect]
@@ -1439,6 +1442,7 @@ for ac_option in $@; do
 	--disable-ext-avx2)          _ext_avx2=no            ;;
 	--enable-ext-neon)           _ext_neon=yes           ;;
 	--disable-ext-neon)          _ext_neon=no            ;;
+	--prefer-sdl3)               _prefer_sdl3=yes        ;;
 	--with-fluidsynth-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		FLUIDSYNTH_CFLAGS="-I$arg/include"
@@ -4482,7 +4486,7 @@ fi
 # Setup SDL specifics for SDL based backends
 #
 if test "$_sdl" = auto ; then
-	if test "$_pkg_config" = "yes" && ($_pkgconfig --exists sdl || $_pkgconfig --exists sdl2); then
+	if test "$_pkg_config" = "yes" && test "$_prefer_sdl3" = "no" && ($_pkgconfig --exists sdl || $_pkgconfig --exists sdl2); then
 		find_sdlconfig
 		_sdlversion=`$_sdlconfig --version`
 		cat > $TMPC << EOF
@@ -5638,7 +5642,7 @@ if test "$_nfm" = auto ; then
 sOplInterface gOplIf;
 
 int main(void)
-{ 
+{
 	nfInit(NULL, NULL);
 
 	sOplInterfaceConfiguration ifCfg;
@@ -5652,7 +5656,7 @@ int main(void)
 	params.uParam.outputPort = OPT_INTERNAL;
     params.uParam.param = 0;
 
-    gOplIf = nfCreateInterface(ifCfg); 
+    gOplIf = nfCreateInterface(ifCfg);
 
     const int32_t retval = nfInitialiseInterface(&gOplIf, &params);
 
@@ -5660,7 +5664,7 @@ int main(void)
     {
 	 (void)nfDestroyInterface(&gOplIf);
      return 0;
-    }	
+    }
 
   return -1;
 }