[Scummvm-git-logs] scummvm master -> 7134f5e2c2f9f3052950382dbd7b8e7c074d2432

[sev-]

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:
36d160a49a CONFIGURE: Teach configure about serenity
36f387e3d7 CONFIGURE: Take downstream patch from Redox
7134f5e2c2 CONFIGURE: Switch vorbis and flac detection to pkg-config


Commit: 36d160a49aa23df16faf4aa2f664246c7e135d70
    https://github.com/scummvm/scummvm/commit/36d160a49aa23df16faf4aa2f664246c7e135d70
Author: Jelle Raaijmakers (jelle at gmta.nl)
Date: 2024-01-17T22:38:13+01:00

Commit Message:
CONFIGURE: Teach configure about serenity

https://github.com/SerenityOS/serenity/blob/master/Ports/scummvm/patches/0001-Teach-configure-about-serenity.patch

Changed paths:
    configure


diff --git a/configure b/configure
index 6d05dd7f013..83c19bccebe 100755
--- a/configure
+++ b/configure
@@ -6383,6 +6383,9 @@ EOF
 			mingw*)
 				OPENGL_LIBS="-lopengl32"
 				;;
+			serenity*)
+				OPENGL_LIBS="-lgl"
+				;;
 			*)
 				OPENGL_LIBS="-lGL"
 				;;


Commit: 36f387e3d703ff4ae530b997b18a4f50fc487c49
    https://github.com/scummvm/scummvm/commit/36f387e3d703ff4ae530b997b18a4f50fc487c49
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-17T22:38:31+01:00

Commit Message:
CONFIGURE: Take downstream patch from Redox

https://gitlab.redox-os.org/redox-os/cookbook/-/blob/master/recipes/emulators/scummvm/01_redox.patch

Changed paths:
    configure


diff --git a/configure b/configure
index 83c19bccebe..3affb8bc35d 100755
--- a/configure
+++ b/configure
@@ -4605,7 +4605,7 @@ case $_host_os in
 	amigaos* | dreamcast | ds | gamecube | kolibrios | mingw* | morphos | n64 | ps3 | psp2 | psp | riscos | wii)
 		_posix=no
 		;;
-	3ds | android | beos* | bsd* | cygwin* | darwin* | dragonfly* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphoneos | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | serenity* | solaris* | sunos* | switch | uclinux*)
+	3ds | android | beos* | bsd* | cygwin* | darwin* | dragonfly* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphoneos | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | redox* | serenity* | solaris* | sunos* | switch | uclinux*)
 		_posix=yes
 		;;
 	os2-emx*)


Commit: 7134f5e2c2f9f3052950382dbd7b8e7c074d2432
    https://github.com/scummvm/scummvm/commit/7134f5e2c2f9f3052950382dbd7b8e7c074d2432
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-17T22:41:59+01:00

Commit Message:
CONFIGURE: Switch vorbis and flac detection to pkg-config

Downstream patch from OpenBSD:
https://github.com/openbsd/ports/blob/master/games/scummvm/patches/patch-configure

Changed paths:
    configure


diff --git a/configure b/configure
index 3affb8bc35d..0cd20a3b677 100755
--- a/configure
+++ b/configure
@@ -5157,16 +5157,14 @@ if test "$_vorbis" = auto ; then
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
 	if test "$_ogg" = yes ; then
-		cc_check $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
-			-lvorbisfile -lvorbis -logg && _vorbis=yes
+		cc_check `pkg-config --cflags --libs ogg vorbis vorbisfile` && _vorbis=yes
 	else
-		cc_check $VORBIS_CFLAGS $VORBIS_LIBS \
-			-lvorbisfile -lvorbis && _vorbis=yes
+		cc_check `pkg-config --cflags --libs vorbis vorbisfile` && _vorbis=yes
 	fi
 fi
 if test "$_vorbis" = yes ; then
-	append_var LIBS "$VORBIS_LIBS -lvorbisfile -lvorbis"
-	append_var INCLUDES "$VORBIS_CFLAGS"
+	append_var LIBS "`pkg-config --libs vorbis vorbisfile`"
+	append_var LIBS "`pkg-config --cflags vorbis vorbisfile`"
 fi
 define_in_config_if_yes "$_vorbis" 'USE_VORBIS'
 echo "$_vorbis"
@@ -5270,16 +5268,14 @@ int main(void) {
 }
 EOF
 	if test "$_ogg" = yes ; then
-		cc_check $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
-			-lFLAC -logg && _flac=yes
+		cc_check `pkg-config --cflags --libs flac ogg` && _flac=yes
 	else
-		cc_check $FLAC_CFLAGS $FLAC_LIBS \
-			-lFLAC && _flac=yes
+		cc_check `pkg-config --cflags --libs flac` && _flac=yes
 	fi
 fi
 if test "$_flac" = yes ; then
-	append_var LIBS "$FLAC_LIBS -lFLAC"
-	append_var INCLUDES "$FLAC_CFLAGS"
+	append_var LIBS "`pkg-config --libs flac`"
+	append_var INCLUDES "`pkg-config --cflags flac`"
 fi
 define_in_config_if_yes "$_flac" 'USE_FLAC'
 echo "$_flac"