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

[dwatteau]

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

Summary:
4c0b87ab28 MACOS: The PkgInfo file in macOS bundles should have no line terminators
e0e6ba6b61 AUDIO: Prevent Sonivox v4 (EAS) from being too noisy


Commit: 4c0b87ab287eef9430ce6057a2b0b95d3ca303a4
    https://github.com/scummvm/scummvm/commit/4c0b87ab287eef9430ce6057a2b0b95d3ca303a4
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-03-25T18:38:15+01:00

Commit Message:
MACOS: The PkgInfo file in macOS bundles should have no line terminators

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index b50dbc88ae8..7378eff6a7f 100644
--- a/ports.mk
+++ b/ports.mk
@@ -139,7 +139,7 @@ bundle_name = ScummVM.app
 bundle-pack:
 	mkdir -p $(bundle_name)/Contents/MacOS
 	mkdir -p $(bundle_name)/Contents/Resources
-	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
+	printf "APPL????" > $(bundle_name)/Contents/PkgInfo
 	sed -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.app/' $(srcdir)/dists/macosx/Info.plist >$(bundle_name)/Contents/Info.plist
 ifdef USE_SPARKLE
 	mkdir -p $(bundle_name)/Contents/Frameworks


Commit: e0e6ba6b611be81b10f1ce79a0f732303603abe6
    https://github.com/scummvm/scummvm/commit/e0e6ba6b611be81b10f1ce79a0f732303603abe6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-03-25T18:38:15+01:00

Commit Message:
AUDIO: Prevent Sonivox v4 (EAS) from being too noisy

The new v4 Sonivox releases now output way more warnings and info
stuff by default; it's easy to have the logs getting pretty big with
some soundfonts or such.  Previous v3.16.x releases we'rent as noisy.

Fortunately, EAS_SetDebugLevel() is now public in the v4.x releases,
so we can use it to lower the debug priorities.

(Except for a few funky header things in their releases.)

Changed paths:
    audio/softsynth/eas.cpp


diff --git a/audio/softsynth/eas.cpp b/audio/softsynth/eas.cpp
index d40097108bf..25f477daaff 100644
--- a/audio/softsynth/eas.cpp
+++ b/audio/softsynth/eas.cpp
@@ -19,6 +19,11 @@
  *
  */
 
+// Same as for backends/platform/android/android.cpp: Sonivox headers
+// are using `__attribute__((format(printf, ...))` and this clashes
+// with our printf override hack.
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include "common/scummsys.h"
 
 #if defined(USE_SONIVOX)
@@ -26,6 +31,14 @@
 #include <sonivox/eas.h>
 #include <sonivox/eas_reverb.h>
 
+// Sonivox's LIB_VERSION is currently unreliable, because the preprocessor
+// can't do comparisons against it, as it embeds its own typedef'd casts.
+// Fortunately, EAS_REF_VOLUME was introduced after the eas_report.h
+// header was made public. We only need this header in this case.
+#ifdef EAS_REF_VOLUME
+#include <sonivox/eas_report.h>
+#endif
+
 #include "common/debug.h"
 #include "common/endian.h"
 #include "common/textconsole.h"
@@ -158,6 +171,13 @@ int MidiDriver_EAS::open() {
 		return -1;
 	}
 
+#ifdef _EAS_SEVERITY_ERROR
+	// In releases where eas_report.h is available, the following function
+	// was made public, after Sonivox started giving way more debug output.
+	// Use it to avoid very noisy warnings and such.
+	EAS_SetDebugLevel(_EAS_SEVERITY_ERROR);
+#endif
+
 	EAS_RESULT res = EAS_Init(&_EASHandle);
 	if (res) {
 		close();