[Scummvm-git-logs] scummvm master -> 821dcd0a991939f57a7e5869d49454c1b4d15904

[lephilousophe]

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

Summary:
7803535c97 CONFIGURE: Try -lsonivox-static fallback when there's no pkg-config too
49cf84337d CONFIGURE: Link an actual libsonivox function when testing its availability
821dcd0a99 BUILD: MACOSX: Add sonivox library support to macOS bundles


Commit: 7803535c97d2e8df4247cd29bf090722ffaae0cd
    https://github.com/scummvm/scummvm/commit/7803535c97d2e8df4247cd29bf090722ffaae0cd
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-06-21T08:23:26+02:00

Commit Message:
CONFIGURE: Try -lsonivox-static fallback when there's no pkg-config too

Upstream creates a libsonivox-static.a lib by default, and not all ports
have pkg-config set up.

Changed paths:
    configure


diff --git a/configure b/configure
index 58db936f07a..7fc549bcf90 100755
--- a/configure
+++ b/configure
@@ -6011,9 +6011,16 @@ EOF
 		SONIVOX_LIBS="`$_pkgconfig --static --libs sonivox`"
 		cc_check_no_clean $SONIVOX_CFLAGS $SONIVOX_LIBS && _sonivox=yes
 	fi
-	if test "$_sonivox" != yes && test "$_pkg_config" = "yes" && $_pkgconfig --exists sonivox-static; then
-		SONIVOX_LIBS="`$_pkgconfig --static --libs sonivox-static`"
-		cc_check_no_clean $SONIVOX_CFLAGS $SONIVOX_LIBS && _sonivox=yes
+	if test "$_sonivox" != yes ; then
+		if test "$_pkg_config" = "yes" && $_pkgconfig --exists sonivox-static; then
+			SONIVOX_LIBS="`$_pkgconfig --static --libs sonivox-static`"
+			cc_check_no_clean $SONIVOX_CFLAGS $SONIVOX_LIBS && _sonivox=yes
+		fi
+
+		if test "$_sonivox" != yes ; then
+			SONIVOX_LIBS="-lsonivox-static"
+			cc_check_no_clean $SONIVOX_CFLAGS $SONIVOX_LIBS && _sonivox=yes
+		fi
 	fi
 	cc_check_clean
 fi


Commit: 49cf84337d567b806d0efa7677c62050579e17e1
    https://github.com/scummvm/scummvm/commit/49cf84337d567b806d0efa7677c62050579e17e1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-06-21T08:23:26+02:00

Commit Message:
CONFIGURE: Link an actual libsonivox function when testing its availability

That's what we do for most other libraries, and this helps triggering the
cases when libsonivox has been built with GCC < 5.0, which currently fails
because of its unchecked usage of GCC builtins.  It's better to fail at
this point, instead of launching a full ScummVM that will fail linking
because of that.

Changed paths:
    configure


diff --git a/configure b/configure
index 7fc549bcf90..6ac5641300a 100755
--- a/configure
+++ b/configure
@@ -6003,8 +6003,15 @@ append_var SONIVOX_LIBS "-lsonivox"
 if test "$_sonivox" = auto; then
 	_sonivox=no
 	cat > $TMPC << EOF
+#include <stddef.h>
 #include <sonivox/eas.h>
-int main(void) { /* delete_fluid_settings(new_fluid_settings()); */ return 0; }
+
+EAS_DATA_HANDLE mEASDataHandle = NULL;
+
+int main(void) {
+	EAS_Init(&mEASDataHandle);
+	return 0;
+}
 EOF
 	cc_check_no_clean $SONIVOX_CFLAGS $SONIVOX_LIBS && _sonivox=yes
 	if test "$_sonivox" != yes && test "$_pkg_config" = "yes" && $_pkgconfig --exists sonivox; then


Commit: 821dcd0a991939f57a7e5869d49454c1b4d15904
    https://github.com/scummvm/scummvm/commit/821dcd0a991939f57a7e5869d49454c1b4d15904
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-06-21T08:23:26+02:00

Commit Message:
BUILD: MACOSX: Add sonivox library support to macOS bundles

libsonivox-static.a is what upstream uses by default.

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index f2ad6e26815..5a2046bac15 100644
--- a/ports.mk
+++ b/ports.mk
@@ -556,6 +556,10 @@ ifdef USE_RETROWAVE
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libRetroWave.a
 endif
 
+ifdef USE_SONIVOX
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libsonivox-static.a
+endif
+
 ifdef USE_SPARKLE
 ifdef MACOSX
 ifneq ($(SPARKLEPATH),)