[Scummvm-git-logs] scummvm master -> c57b0eb1f36c4f3cf2bed478d2c243a98e29c39b
bluegr
noreply at scummvm.org
Sun Oct 26 21:44:13 UTC 2025
This automated email contains information about 20 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
c340369a66 CONFIGURE: Start ShellCheck compliance by ignoring some noise
b386fac1a9 CONFIGURE: Ignore SC2153 about the PS3DEV/PSPDEV names being very close
aace4eaa06 CONFIGURE: Ignore ShellCheck warnings about `configure.engine` and `engines.awk.out`
73acbeb8b1 CONFIGURE: Silence SC2154 ShellCheck warning
b11a2e4cc4 CONFIGURE: Protect all command name variables with quotes
8cef9ee26d CONFIGURE: Silence ShellCheck warning about `_host_cpu=sh`
ccf976d462 CONFIGURE: Use `command -v` instead of `which`
706a23f472 CONFIGURE: Fix typos, indentation, syntax, unnecessary stuff
e7718b4253 CONFIGURE: Simplify the endianness test a bit
362c077bb1 CONFIGURE: Use `grep -q` instead of /dev/null redirects
5fde184c07 CONFIGURE: Silence SC2004 ShellCheck warning
badc69cc69 CONFIGURE: Drop unnecessary `return` use that triggers SC2317
ee219fe4b9 CONFIGURE: Fix CFLAGS use for the A52 lib
3088381146 CONFIGURE: Fix libunity check relying on non-existing `$_unix`
c462b39f42 CONFIGURE: Drop check on `$_unix` variable for GTK dialogs
676bd55136 CONFIGURE: Silence ShellCheck warning about SDL1/SDL2/SDL3 variable names
a6c6bb6c27 CONFIGURE: Drop unnecessary parentheses to avoid subshell overhead
de73ea62c5 CONFIGURE: Avoid executing the (empty) output in the `dwp` check
62a3a881e2 CONFIGURE: Don't use a sub-shell to look for characters in strings
c57b0eb1f3 CONFIGURE: Don't use sub-shells for the SSE2/AVX2/NEON tests
Commit: c340369a665873ee354a7f20dfd096607b2e42fc
https://github.com/scummvm/scummvm/commit/c340369a665873ee354a7f20dfd096607b2e42fc
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Start ShellCheck compliance by ignoring some noise
ShellCheck warnings SC2006, SC2016, SC2046, SC2086, SC2268 are possibly
relevant, and may reveal real issues, but for now they just produce too
much noise. Silence them to make it easier to focus on the other
warnings.
Changed paths:
configure
diff --git a/configure b/configure
index 942907c1d33..796598a7f2c 100755
--- a/configure
+++ b/configure
@@ -20,6 +20,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+# shellcheck disable=SC2006,SC2016,SC2046,SC2086,SC2268 # possibly relevant, but too noisy for now
+
set -a
# NLS nuisances.
Commit: b386fac1a99a7e3224d44acada7bcf3fce106f77
https://github.com/scummvm/scummvm/commit/b386fac1a99a7e3224d44acada7bcf3fce106f77
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Ignore SC2153 about the PS3DEV/PSPDEV names being very close
ShellCheck thinks that one may be a typo for the other one, but that's
not the case.
Changed paths:
configure
diff --git a/configure b/configure
index 796598a7f2c..3838a1730e3 100755
--- a/configure
+++ b/configure
@@ -2101,6 +2101,7 @@ n64)
fi
;;
ps3)
+ # shellcheck disable=SC2153 # ignore warning about PS3DEV/PSPDEV variable names being so close
if test -z "$PS3DEV"; then
echo "Please set PS3DEV in your environment. export PS3DEV=<path to ps3 toolchain>"
exit 1
@@ -2117,6 +2118,7 @@ psp2)
fi
;;
psp)
+ # shellcheck disable=SC2153 # ignore warning about PS3DEV/PSPDEV variable names being so close
if test -z "$PSPDEV"; then
PSPDEV=`psp-config --pspdev-path`
fi
Commit: aace4eaa066313eb3dc8a248cfecaba67404129c
https://github.com/scummvm/scummvm/commit/aace4eaa066313eb3dc8a248cfecaba67404129c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Ignore ShellCheck warnings about `configure.engine` and `engines.awk.out`
The former relies on shell expansion to include all the required files,
and it seems like ShellCheck can't follow this pattern (yet?).
The latter can't be analysed by ShellCheck at run time, because the
file is created on the fly.
Changed paths:
configure
diff --git a/configure b/configure
index 3838a1730e3..196ebcb5983 100755
--- a/configure
+++ b/configure
@@ -138,6 +138,7 @@ _srcdir=`dirname $0`
# Read list of engines
for i in $_srcdir/engines/*/configure.engine; do
+ # shellcheck disable=SC1090 # 'source=./engines/*/configure.engine' not accepted yet?
. "$i"
done
@@ -4307,6 +4308,7 @@ append_var MODULES "backends/platform/$_backend"
echo "Checking for unused components..."
awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
+# shellcheck disable=SC1091 # created on the fly
. ./engines.awk.out
for f in $_features_disabled; do
Commit: 73acbeb8b1cf2c3c7595090a641f20da144c9cd9
https://github.com/scummvm/scummvm/commit/73acbeb8b1cf2c3c7595090a641f20da144c9cd9
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Silence SC2154 ShellCheck warning
ShellCheck complains that the values are "referenced but not
assigned". Just give them an initial empty value, so that it stops
complaining.
Changed paths:
configure
diff --git a/configure b/configure
index 196ebcb5983..5bdccc50f3d 100755
--- a/configure
+++ b/configure
@@ -137,6 +137,7 @@ add_component() {
_srcdir=`dirname $0`
# Read list of engines
+_wip_engines=
for i in $_srcdir/engines/*/configure.engine; do
# shellcheck disable=SC1090 # 'source=./engines/*/configure.engine' not accepted yet?
. "$i"
@@ -4305,6 +4306,8 @@ append_var MODULES "backends/platform/$_backend"
#
# Check if specific components are not used by enabled engines and disable them
#
+_features_disabled=
+
echo "Checking for unused components..."
awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
Commit: b11a2e4cc46e4998c96b8f0606b7a7472db5561a
https://github.com/scummvm/scummvm/commit/b11a2e4cc46e4998c96b8f0606b7a7472db5561a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Protect all command name variables with quotes
So that ShellCheck doesn't complain about mixing strings with common
shell commands. We were already using quotes for some of them, anyway.
Changed paths:
configure
diff --git a/configure b/configure
index 5bdccc50f3d..f367f1daef2 100755
--- a/configure
+++ b/configure
@@ -247,13 +247,13 @@ _ext_sse2=auto
_ext_avx2=auto
_ext_neon=auto
# Default commands
-_ranlib=ranlib
-_strip=strip
+_ranlib="ranlib"
+_strip="strip"
_ar="ar cr"
_as="as"
-_dwp=dwp
-_windres=windres
-_ldd=ldd
+_dwp="dwp"
+_windres="windres"
+_ldd="ldd"
_stagingpath="staging"
_amigaospath="install"
_morphospath="PROGDIR:"
@@ -2735,14 +2735,14 @@ if test "$_release_build" != yes && test "$_werror_build" != no; then
fi
if test -n "$STRINGS"; then
- _strings=$STRINGS
+ _strings="$STRINGS"
else
echo_n "Checking for $_host_alias-strings... " >> "$TMPLOG"
if `which $_host_alias-strings >/dev/null 2>&1`; then
- _strings=$_host_alias-strings
+ _strings="$_host_alias-strings"
echo yes >> "$TMPLOG"
else
- _strings=strings
+ _strings="strings"
echo no >> "$TMPLOG"
fi
fi
Commit: 8cef9ee26dcd64917f27531f70afefe70b858179
https://github.com/scummvm/scummvm/commit/8cef9ee26dcd64917f27531f70afefe70b858179
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Silence ShellCheck warning about `_host_cpu=sh`
Here, 'sh' is the CPU architecture (SH-4), not the Bourne shell `sh`
command.
Changed paths:
configure
diff --git a/configure b/configure
index f367f1daef2..891f2017363 100755
--- a/configure
+++ b/configure
@@ -1790,6 +1790,7 @@ opendingux-*)
;;
dreamcast)
_host_os=dreamcast
+ # shellcheck disable=SC2209 # mistakes 'sh' architecture for 'sh' shell
_host_cpu=sh
_host_alias=sh-elf
append_var CXXFLAGS "-ml -m4-single-only"
Commit: ccf976d4629d86eb90d64e4633e2b0dfe6587455
https://github.com/scummvm/scummvm/commit/ccf976d4629d86eb90d64e4633e2b0dfe6587455
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Use `command -v` instead of `which`
It's more portable, and then there is no need to execute the *output*
of that command.
Changed paths:
configure
diff --git a/configure b/configure
index 891f2017363..4e25b8f1346 100755
--- a/configure
+++ b/configure
@@ -2151,12 +2151,12 @@ riscos)
if test -e "$GCCSDK_INSTALL_ENV/bin/tokenize"; then
add_line_to_config_mk "TOKENIZE := $GCCSDK_INSTALL_ENV/bin/tokenize"
- elif `which tokenize >/dev/null 2>&1`; then
+ elif command -v tokenize >/dev/null 2>&1; then
add_line_to_config_mk "TOKENIZE := tokenize"
fi
if test -e "$GCCSDK_INSTALL_ENV/bin/makerun"; then
add_line_to_config_mk "MAKERUN := $GCCSDK_INSTALL_ENV/bin/makerun"
- elif `which makerun >/dev/null 2>&1`; then
+ elif command -v makerun >/dev/null 2>&1; then
add_line_to_config_mk "MAKERUN := makerun"
fi
;;
@@ -2619,7 +2619,7 @@ if test "$_debug_build" != no; then
# isn't implemented, and there's no fix in sight. So we force
# DWARF version 4 and hope that works for, well... "most targets".
- if `which $_dwp >/dev/null 2>&1` && cc_check_no_clean $debug_mode -gsplit-dwarf -gdwarf-4 && `$_dwp -e $TMPO -o /dev/null >/dev/null 2>&1`; then
+ if command -v $_dwp >/dev/null 2>&1 && cc_check_no_clean $debug_mode -gsplit-dwarf -gdwarf-4 && `$_dwp -e $TMPO -o /dev/null >/dev/null 2>&1`; then
append_var CXXFLAGS "-gsplit-dwarf -gdwarf-4"
add_line_to_config_mk "SPLIT_DWARF = 1"
echo_n -- " + split DWARF"
@@ -2739,7 +2739,7 @@ if test -n "$STRINGS"; then
_strings="$STRINGS"
else
echo_n "Checking for $_host_alias-strings... " >> "$TMPLOG"
- if `which $_host_alias-strings >/dev/null 2>&1`; then
+ if command -v $_host_alias-strings >/dev/null 2>&1; then
_strings="$_host_alias-strings"
echo yes >> "$TMPLOG"
else
@@ -3881,9 +3881,9 @@ if test -n "$_host"; then
_ar="$_host-ar cr"
_ranlib=$_host-ranlib
_strip=$_host-strip
- if `which $_host-peldd >/dev/null 2>&1`; then
+ if command -v $_host-peldd >/dev/null 2>&1; then
_ldd="$_host-peldd -t --ignore-errors"
- elif `which peldd >/dev/null 2>&1`; then
+ elif command -v peldd >/dev/null 2>&1; then
_ldd="peldd -t --ignore-errors"
fi
;;
Commit: 706a23f47274ccb1ce8e00b54f3e3fdb239d13de
https://github.com/scummvm/scummvm/commit/706a23f47274ccb1ce8e00b54f3e3fdb239d13de
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Fix typos, indentation, syntax, unnecessary stuff
Changed paths:
configure
diff --git a/configure b/configure
index 4e25b8f1346..73e2aa155f3 100755
--- a/configure
+++ b/configure
@@ -2496,7 +2496,7 @@ if test "$have_gcc" = yes ; then
;;
riscos)
# -Wformat complains about '%z' and so on. Don't know if it's related to
- # the older compiler not being completely C+11-aware, or something else.
+ # the older compiler not being completely C++11-aware, or something else.
if test "$have_gcc" = yes && test $_cxx_major -eq 4 && test $_cxx_minor -le 7; then
std_variant=gnu++
pedantic=no
@@ -2860,7 +2860,7 @@ case $_host_cpu in
openpandora)
define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
;;
- maemo )
+ maemo)
define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM'
define_in_config_if_yes yes 'USE_ARM_GFX_ASM'
@@ -3382,7 +3382,7 @@ EOF
else
_zlib=no
fi
- ;;
+ ;;
freebsd* | dragonfly*)
append_var LDFLAGS "-L/usr/local/lib"
append_var CXXFLAGS "-I/usr/local/include"
@@ -3406,7 +3406,7 @@ EOF
append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib"
append_var LDFLAGS "-logc"
if test "$_dynamic_modules" = "yes" ; then
- # retarded toolchain patch forces --gc-sections, overwrite it
+ # some defective toolchain patch forces --gc-sections; overwrite it
append_var LDFLAGS "-Wl,--no-gc-sections"
fi
;;
@@ -3607,7 +3607,7 @@ EOF
append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib"
append_var LDFLAGS "-logc"
if test "$_dynamic_modules" = "yes" ; then
- # retarded toolchain patch forces --gc-sections, overwrite it
+ # some defective toolchain patch forces --gc-sections; overwrite it
append_var LDFLAGS "-Wl,--no-gc-sections"
fi
;;
@@ -6595,7 +6595,7 @@ if test "$_opengl_mode" != none ; then
_opengl_mode=gl
;;
*)
- # As SDL2 supports everything, let the user choose if he wants to
+ # As SDL2 supports everything, let users choose
test "$_opengl_mode" = "auto" && _opengl_mode=any
;;
esac
@@ -6615,7 +6615,7 @@ if test "$_opengl_mode" != none ; then
test "$_opengl_mode" = "auto" && _opengl_mode=none
# We only support OpenGL on SDL based backends and Android (already handled)
test "$_sdl" = "no" && _opengl_mode=none
- # If it's a SDL based backend and OpenGL is really enabled, use GLAD
+ # If it's an SDL based backend and OpenGL is really enabled, use GLAD
test "$_opengl_mode" != "none" && test "$_sdl" != "no" && _opengl_glad=yes
;;
esac
Commit: e7718b425398d3e8e3e7d891ebd5f4454e1493bd
https://github.com/scummvm/scummvm/commit/e7718b425398d3e8e3e7d891ebd5f4454e1493bd
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Simplify the endianness test a bit
Checking for EBCDIC is worthless; the whole codebase probably assumes
ASCII almost everywhere anyway.
Changed paths:
configure
diff --git a/configure b/configure
index 73e2aa155f3..4796a95b82d 100755
--- a/configure
+++ b/configure
@@ -2756,18 +2756,16 @@ cat > tmp_endianness_check.cpp << EOF
#ifndef __GNUC__
#define __attribute__(x)
#endif
+/* values are similar to the AC_C_BIGENDIAN autoconf test */
__attribute__ ((used)) unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
__attribute__ ((used)) unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
const char * _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; return s; }
-__attribute__ ((used)) unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-__attribute__ ((used)) unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-const char * _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; return s; }
-int main() { _ascii (); _ebcdic (); return 0; }
+int main() { _ascii (); return 0; }
EOF
# Make sure that this particular object always has regular machine code content,
# so that the checks below can be done, even with LTO on.
-test "$have_gcc" = yes && no_lto_regular_machine_code_removal=-ffat-lto-objects
-$CXX $LDFLAGS $CXXFLAGS $no_lto_regular_machine_code_removal -o $TMPO$HOSTEXEEXT tmp_endianness_check.cpp >> "$TMPLOG" 2>&1
+test "$have_gcc" = yes && lto_keep_machine_code_flag=-ffat-lto-objects
+$CXX $LDFLAGS $CXXFLAGS $lto_keep_machine_code_flag -o $TMPO$HOSTEXEEXT tmp_endianness_check.cpp >> "$TMPLOG" 2>&1
# The flag may not exist in some older Clang releases (e.g. "Apple LLVM
# version 6.0 (based on LLVM 3.5svn)")
if test "$?" -ne 0 && test "$have_gcc" = yes; then
Commit: 362c077bb178cad10312c02fe34a392ae4813ff6
https://github.com/scummvm/scummvm/commit/362c077bb178cad10312c02fe34a392ae4813ff6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Use `grep -q` instead of /dev/null redirects
I guess we used to do this, because base grep(1) from SunOS/Solaris
didn't support the `-q` option. But it's in POSIX, and available on
anything that's not ancient (and you need a C++11 compiler anyway).
And we've already been using `grep -q` in other places for a while,
anyway.
Changed paths:
configure
diff --git a/configure b/configure
index 4796a95b82d..5af6cefafb1 100755
--- a/configure
+++ b/configure
@@ -2771,9 +2771,9 @@ $CXX $LDFLAGS $CXXFLAGS $lto_keep_machine_code_flag -o $TMPO$HOSTEXEEXT tmp_endi
if test "$?" -ne 0 && test "$have_gcc" = yes; then
$CXX $LDFLAGS $CXXFLAGS -o $TMPO$HOSTEXEEXT tmp_endianness_check.cpp >> "$TMPLOG" 2>&1
fi
-if $_strings $TMPO$HOSTEXEEXT 2>> "$TMPLOG"| grep BIGenDianSyS >/dev/null; then
+if $_strings $TMPO$HOSTEXEEXT 2>> "$TMPLOG"| grep -q BIGenDianSyS; then
_endian=big
-elif $_strings $TMPO$HOSTEXEEXT 2>> "$TMPLOG" | grep LiTTleEnDian >/dev/null; then
+elif $_strings $TMPO$HOSTEXEEXT 2>> "$TMPLOG" | grep -q LiTTleEnDian; then
_endian=little
fi
echo $_endian
@@ -3159,7 +3159,7 @@ const char *_version() { char *s = (char *)version; return s; }
int main(int argc, char *argv[]) { _version(); return 0; }
EOF
cc_check_no_clean
- if $_strings $TMPO$HOSTEXEEXT | grep Version: >/dev/null; then
+ if $_strings $TMPO$HOSTEXEEXT | grep -q Version:; then
_macos_min_version=`$_strings $TMPO$HOSTEXEEXT | grep Version:`
_macos_min_version="${_macos_min_version#Version:}"
fi
@@ -6488,7 +6488,7 @@ find_freetype() {
freetypeprefix="$_freetypepath"
if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
teststring=VeryImplausibleSysrootX1Y2Z3
- if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
+ if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep -q $teststring ); then
echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
freetypeprefix="${freetypeprefix##$SYSROOT}"
fi
Commit: 5fde184c07583291130a2344adef4c9df41467ab
https://github.com/scummvm/scummvm/commit/5fde184c07583291130a2344adef4c9df41467ab
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Silence SC2004 ShellCheck warning
As the warning says, "$/${} is unnecessary on arithmetic variables".
Changed paths:
configure
diff --git a/configure b/configure
index 5af6cefafb1..1a383c45352 100755
--- a/configure
+++ b/configure
@@ -3169,12 +3169,12 @@ EOF
_macos_min_version_dot=undefined
if test -n "$_macos_min_version" ; then
if test "$_macos_min_version" -lt 101000; then
- _macos_min_ver_major=$((${_macos_min_version}/100))
- _macos_min_ver_minor=$((${_macos_min_version}/10 - 10*${_macos_min_ver_major}))
+ _macos_min_ver_major=$((_macos_min_version/100))
+ _macos_min_ver_minor=$((_macos_min_version/10 - 10*_macos_min_ver_major))
_macos_min_version_dot=${_macos_min_ver_major}.${_macos_min_ver_minor}
else
- _macos_min_ver_major=$((${_macos_min_version}/10000))
- _macos_min_ver_minor=$((${_macos_min_version}/100 - 100*${_macos_min_ver_major}))
+ _macos_min_ver_major=$((_macos_min_version/10000))
+ _macos_min_ver_minor=$((_macos_min_version/100 - 100*_macos_min_ver_major))
_macos_min_version_dot=${_macos_min_ver_major}.${_macos_min_ver_minor}
fi
fi
Commit: badc69cc69af7a4de103780446e4a9c80454ea77
https://github.com/scummvm/scummvm/commit/badc69cc69af7a4de103780446e4a9c80454ea77
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Drop unnecessary `return` use that triggers SC2317
We're calling `_error` functions that will always exit after erroring
out, so there's no need to `return`.
Changed paths:
configure
diff --git a/configure b/configure
index 1a383c45352..5ea40e4df75 100755
--- a/configure
+++ b/configure
@@ -804,7 +804,6 @@ engine_enable() {
if check_is_subengine ${engine} ; then
if test "$opt" != "yes" ; then
subengine_option_error ${engine}
- return
fi
parent=`get_subengine_parent ${engine}`
if test `get_engine_build ${parent}` = "no" ; then
@@ -814,7 +813,6 @@ engine_enable() {
if test "$opt" != "static" -a "$opt" != "dynamic" -a "$opt" != "yes" ; then
option_error
- return
fi
subengines=
@@ -823,13 +821,11 @@ engine_enable() {
subengines=$(get_engine_subengines ${engine})
if test "$subengines" = "" ; then
engine_option_error "${engine}*"
- return
fi
fi
if test "`get_engine_name ${engine}`" = "" ; then
engine_option_error ${engine}
- return
fi
set_var _engine_${engine}_build "$opt"
@@ -843,7 +839,6 @@ engine_disable() {
# Filter malformed options
if ( echo $1 | grep '=' ) 2> /dev/null > /dev/null ; then
option_error
- return
fi
engine=`echo $1 | sed 's/-/_/g'`
Commit: ee219fe4b99fc998a3ec589c2d8ca04ffe7fbb21
https://github.com/scummvm/scummvm/commit/ee219fe4b99fc998a3ec589c2d8ca04ffe7fbb21
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Fix CFLAGS use for the A52 lib
Typo found by ShellCheck SC2153.
Changed paths:
configure
diff --git a/configure b/configure
index 5ea40e4df75..fa65b94ee1f 100755
--- a/configure
+++ b/configure
@@ -5834,7 +5834,7 @@ EOF
fi
fi
if test "$_a52" = yes ; then
- INCLUDES="$INCLUDES $A52_FLAGS"
+ INCLUDES="$INCLUDES $A52_CFLAGS"
LIBS="$LIBS $A52_LIBS -la52"
fi
define_in_config_if_yes "$_a52" 'USE_A52'
Commit: 3088381146716b654c7b0101f9cb581eea5975f8
https://github.com/scummvm/scummvm/commit/3088381146716b654c7b0101f9cb581eea5975f8
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Fix libunity check relying on non-existing `$_unix`
The `$_unix` variable is an old leftover. I guess using `$_posix`
better matches the original intent, although I can't say for which
systems libunity is meant to be available.
Changed paths:
configure
diff --git a/configure b/configure
index fa65b94ee1f..a7945d4360a 100755
--- a/configure
+++ b/configure
@@ -6382,7 +6382,7 @@ define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'
# Check for Unity if taskbar integration is enabled
#
echocheck "libunity"
-if test "$_unix" = no || test "$_taskbar" = no || test "$_pkg_config" = no; then
+if test "$_posix" = no || test "$_taskbar" = no || test "$_pkg_config" = no; then
_libunity=no
else
if test "$_libunity" = auto ; then
Commit: c462b39f427e02be89fbdcd995cc4bee850a1f7f
https://github.com/scummvm/scummvm/commit/c462b39f427e02be89fbdcd995cc4bee850a1f7f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Drop check on `$_unix` variable for GTK dialogs
This variable is long gone. This time, I don't think it's meant to be
replaced by `$_posix`, as GTK _is_ available on non-POSIX systems.
Changed paths:
configure
diff --git a/configure b/configure
index a7945d4360a..0ed6785b4d6 100755
--- a/configure
+++ b/configure
@@ -6423,7 +6423,7 @@ echo "$_libunity"
# Check for GTK if system dialogs are enabled
#
echocheck "gtk"
-if test "$_unix" = no || test "$_dialogs" = no || test "$_pkg_config" = no; then
+if test "$_dialogs" = no || test "$_pkg_config" = no; then
_gtk=no
else
if test "$_gtk" = auto ; then
Commit: 676bd551363d0603fb52530afbf0f1da5d7729b6
https://github.com/scummvm/scummvm/commit/676bd551363d0603fb52530afbf0f1da5d7729b6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Silence ShellCheck warning about SDL1/SDL2/SDL3 variable names
They're this way on purpose.
Changed paths:
configure
diff --git a/configure b/configure
index 0ed6785b4d6..98ca3164200 100755
--- a/configure
+++ b/configure
@@ -4468,6 +4468,7 @@ if test "$_sdlnet" = auto ; then
#include "SDL_net.h"
int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
EOF
+ # shellcheck disable=SC2153 # variable names are close
cc_check $SDL2_NET_LIBS $LIBS $INCLUDES $SDL2_NET_CFLAGS && _sdlnet=yes
if test "$_sdlnet" = yes ; then
set_var SDL_NET_LIBS "$SDL2_NET_LIBS"
@@ -4478,6 +4479,7 @@ EOF
#include "SDL_net.h"
int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
EOF
+ # shellcheck disable=SC2153 # variable names are close
cc_check $SDL1_NET_LIBS $LIBS $INCLUDES $SDL1_NET_CFLAGS && _sdlnet=yes
if test "$_sdlnet" = yes ; then
set_var SDL_NET_LIBS "$SDL1_NET_LIBS"
@@ -4488,6 +4490,7 @@ EOF
#include "SDL3/SDL_net.h"
int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
EOF
+ # shellcheck disable=SC2153 # variable names are close
cc_check $SDL3_NET_LIBS $LIBS $INCLUDES $SDL3_NET_CFLAGS && _sdlnet=yes
if test "$_sdlnet" = yes ; then
set_var SDL_NET_LIBS "$SDL2_NET_LIBS"
Commit: a6c6bb6c27792e4067099ea43bfa745771081637
https://github.com/scummvm/scummvm/commit/a6c6bb6c27792e4067099ea43bfa745771081637
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Drop unnecessary parentheses to avoid subshell overhead
ShellCheck SC2233 warning.
Changed paths:
configure
diff --git a/configure b/configure
index 98ca3164200..dfc61484445 100755
--- a/configure
+++ b/configure
@@ -7201,7 +7201,7 @@ fi
echo "$_tinygl"
echo_n "Building any 3D game... "
-if (test "$_tinygl" = yes || test "$_opengl_game_classic" = yes || test "$_opengl_game_shaders" = yes); then
+if test "$_tinygl" = yes || test "$_opengl_game_classic" = yes || test "$_opengl_game_shaders" = yes; then
_3d=yes
else
_3d=no
Commit: de73ea62c5ac34153c5ab2d23521d8521e6657cb
https://github.com/scummvm/scummvm/commit/de73ea62c5ac34153c5ab2d23521d8521e6657cb
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Avoid executing the (empty) output in the `dwp` check
ShellCheck SC2092 warning.
Changed paths:
configure
diff --git a/configure b/configure
index dfc61484445..36ccab1bb67 100755
--- a/configure
+++ b/configure
@@ -2614,7 +2614,7 @@ if test "$_debug_build" != no; then
# isn't implemented, and there's no fix in sight. So we force
# DWARF version 4 and hope that works for, well... "most targets".
- if command -v $_dwp >/dev/null 2>&1 && cc_check_no_clean $debug_mode -gsplit-dwarf -gdwarf-4 && `$_dwp -e $TMPO -o /dev/null >/dev/null 2>&1`; then
+ if command -v $_dwp >/dev/null 2>&1 && cc_check_no_clean $debug_mode -gsplit-dwarf -gdwarf-4 && $_dwp -e $TMPO -o /dev/null >/dev/null 2>&1; then
append_var CXXFLAGS "-gsplit-dwarf -gdwarf-4"
add_line_to_config_mk "SPLIT_DWARF = 1"
echo_n -- " + split DWARF"
Commit: 62a3a881e2f9b5f3249cdc96dd7d352800a21be0
https://github.com/scummvm/scummvm/commit/62a3a881e2f9b5f3249cdc96dd7d352800a21be0
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Don't use a sub-shell to look for characters in strings
There is no need for the overhead of using a sub-shell for this.
Changed paths:
configure
diff --git a/configure b/configure
index 36ccab1bb67..927e35cc5f7 100755
--- a/configure
+++ b/configure
@@ -791,13 +791,16 @@ engine_disable_all_unstable() {
# Enable the given engine
engine_enable() {
# Get the parameter
- if ( echo $1 | grep ':' ) 2> /dev/null > /dev/null ; then
+ case "$1" in
+ *:*)
eng=`echo $1 | cut -d ':' -f 1`
opt=`echo $1 | cut -d ':' -f 2`
- else
+ ;;
+ *)
eng=$1
opt=yes
- fi
+ ;;
+ esac
engine=`echo $eng | sed 's/-/_/g'`
# Filter the parameter for the subengines
@@ -837,9 +840,11 @@ engine_enable() {
# Disable the given engine
engine_disable() {
# Filter malformed options
- if ( echo $1 | grep '=' ) 2> /dev/null > /dev/null ; then
+ case "$1" in
+ *=*)
option_error
- fi
+ ;;
+ esac
engine=`echo $1 | sed 's/-/_/g'`
if test "`get_engine_name ${engine}`" != "" ; then
Commit: c57b0eb1f36c4f3cf2bed478d2c243a98e29c39b
https://github.com/scummvm/scummvm/commit/c57b0eb1f36c4f3cf2bed478d2c243a98e29c39b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-26T23:44:01+02:00
Commit Message:
CONFIGURE: Don't use sub-shells for the SSE2/AVX2/NEON tests
Changed paths:
configure
diff --git a/configure b/configure
index 927e35cc5f7..fdb35b4c9ce 100755
--- a/configure
+++ b/configure
@@ -7362,8 +7362,8 @@ case $_host_cpu in
fi
_ext_neon=no
# SSE2 is always available on x86_64
- if ! (test "$have_clang" = yes && (test $_clang_major -gt 5 || (test $_clang_major -eq 5 && test $_clang_minor -ge 0))) &&
- ! (test "$have_gcc" = yes && (test $_cxx_major -gt 4 || (test $_cxx_major -eq 4 && test $_cxx_minor -ge 9))); then
+ if ! { test "$have_clang" = yes && { test $_clang_major -gt 5 || { test $_clang_major -eq 5 && test $_clang_minor -ge 0; }; }; } &&
+ ! { test "$have_gcc" = yes && { test $_cxx_major -gt 4 || { test $_cxx_major -eq 4 && test $_cxx_minor -ge 9; }; }; }; then
# Need GCC 4.9+ or Clang 5.0+ for target pragma
_ext_avx2=no
fi
@@ -7376,8 +7376,8 @@ case $_host_cpu in
_ext_avx2=no
fi
_ext_neon=no
- if ! (test "$have_clang" = yes && (test $_clang_major -gt 5 || (test $_clang_major -eq 5 && test $_clang_minor -ge 0))) &&
- ! (test "$have_gcc" = yes && (test $_cxx_major -gt 4 || (test $_cxx_major -eq 4 && test $_cxx_minor -ge 9))); then
+ if ! { test "$have_clang" = yes && { test $_clang_major -gt 5 || { test $_clang_major -eq 5 && test $_clang_minor -ge 0; }; }; } &&
+ ! { test "$have_gcc" = yes && { test $_cxx_major -gt 4 || { test $_cxx_major -eq 4 && test $_cxx_minor -ge 9; }; }; }; then
# Need GCC 4.9+ or Clang 5.0+ for target pragma
_ext_sse2=no
_ext_avx2=no
@@ -7398,10 +7398,10 @@ case $_host_cpu in
_ext_sse2=no
_ext_avx2=no
- if ! (test "$_ext_neon" = no) &&
- ! (cc_check_define __ARM_NEON) &&
- ! (test "$have_clang" = yes && (test $_clang_major -gt 19 || (test $_clang_major -eq 19 && test $_clang_minor -ge 1))) &&
- ! (test "$have_gcc" = yes && (test $_cxx_major -gt 6 || (test $_cxx_major -eq 6 && test $_cxx_minor -ge 1))); then
+ if ! { test "$_ext_neon" = no; } &&
+ ! cc_check_define __ARM_NEON &&
+ ! { test "$have_clang" = yes && { test $_clang_major -gt 19 || { test $_clang_major -eq 19 && test $_clang_minor -ge 1; }; }; } &&
+ ! { test "$have_gcc" = yes && { test $_cxx_major -gt 6 || { test $_cxx_major -eq 6 && test $_cxx_minor -ge 1; }; }; }; then
# Need GCC 6.1+ or Clang 19.1+ for target pragma
# Don't disable if NEON is already enabled in the compiler
_ext_neon=no
More information about the Scummvm-git-logs
mailing list