[Scummvm-git-logs] scummvm master -> 8f8b7f93a4e123005cd62b0d9e8cc12c42bdc4ae

[sev-]

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

Summary:
8a7c30a73d CONFIGURE: Better logic aroung OpenMPT/MikMod exclusivity
8f8b7f93a4 NEWS: Mention libopenmpt dependency


Commit: 8a7c30a73d4f554cc9b2840742c1c216c9a6d339
    https://github.com/scummvm/scummvm/commit/8a7c30a73d4f554cc9b2840742c1c216c9a6d339
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-02-21T19:04:37+01:00

Commit Message:
CONFIGURE: Better logic aroung OpenMPT/MikMod exclusivity

Changed paths:
    configure


diff --git a/configure b/configure
index a6e8e025211..5e520161a5c 100755
--- a/configure
+++ b/configure
@@ -5823,9 +5823,9 @@ define_in_config_if_yes "$_libcurl" "USE_LIBCURL"
 #
 # Check for libopenmpt to be present
 #
-if test "$_libopenmpt" != "no"; then
-	echocheck "libopenmpt"
+echocheck "libopenmpt"
 
+if test "$_libopenmpt" != "no"; then
 	if test "$_pkg_config" = "yes" && $_pkgconfig --exists libopenmpt; then
 		append_var LIBOPENMPT_LIBS "`$_pkgconfig --libs libopenmpt`"
 		append_var LIBOPENMPT_CFLAGS "`$_pkgconfig --cflags libopenmpt`"
@@ -5855,20 +5855,16 @@ EOF
 	if test "$_libopenmpt" = "yes"; then
 		append_var LIBS "$LIBOPENMPT_LIBS"
 		append_var INCLUDES "$LIBOPENMPT_CFLAGS"
-
-		# Skip mikmod detection if openmpt is detected
-		_libmikmod=no
 	fi
-
-	define_in_config_if_yes "$_libopenmpt" "USE_OPENMPT"
-	echo "$_libopenmpt"
 fi
 
+define_in_config_if_yes "$_libopenmpt" "USE_OPENMPT"
+echo "$_libopenmpt"
+
 #
 # Check for libmikmod to be present
 #
-if test "$_libmikmod" != "no"; then
-
+if test "$_libmikmod" != no && test "$_libopenmpt" = no; then
 	# Look for the mikmod-config script
 	find_libmikmodconfig
 
@@ -5899,9 +5895,14 @@ EOF
 			append_var INCLUDES "$LIBMIKMOD_CFLAGS"
 		fi
 	fi
-	echo "$_libmikmod"
+else
+	echocheck "libmikmod"
+
+	# Skip mikmod detection if openmpt is detected
+	_libmikmod="no (OpenMPT/MikMod support is mutually exclusive)"
 fi
 
+echo "$_libmikmod"
 define_in_config_if_yes "$_libmikmod" "USE_MIKMOD"
 
 #


Commit: 8f8b7f93a4e123005cd62b0d9e8cc12c42bdc4ae
    https://github.com/scummvm/scummvm/commit/8f8b7f93a4e123005cd62b0d9e8cc12c42bdc4ae
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-02-21T19:05:55+01:00

Commit Message:
NEWS: Mention libopenmpt dependency

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 85f08b50972..86b8d1d7aed 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -7,7 +7,8 @@ For a more comprehensive changelog of the latest experimental code, see:
   - Added support for Orion Burger.
 
  General:
-  - Fixed GLSL version parsing on some OpenGL ES2 platforms
+  - Fixed GLSL version parsing on some OpenGL ES2 platforms.
+  - Added optional dependency for libopenmpt for sound.
 
  MM:
    - Added MT32/LAPC-1 support for Xeen engine.