[Scummvm-git-logs] scummvm master -> 4233156505a73a2990aa4245cf2a3b356c88dc17

wjp wjp at usecode.org
Sun Oct 29 00:07:54 CEST 2017 

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

Summary:
bef5629519 CONFIGURE: Improve configure help formatting consistency
0bcaf623aa CONFIGURE: Add missing --with-libcurl-prefix option
a416c98980 CONFIGURE: Handle freetype-config SYSROOT duplication in prefix
4233156505 TESTBED: Only build cloud tests if libcurl is available too


Commit: bef5629519617d64f2fb1f71406a4cfc75b63154
    https://github.com/scummvm/scummvm/commit/bef5629519617d64f2fb1f71406a4cfc75b63154
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-10-29T00:05:51+02:00

Commit Message:
CONFIGURE: Improve configure help formatting consistency

Changed paths:
    configure


diff --git a/configure b/configure
index a6ef3d7..49c0282 100755
--- a/configure
+++ b/configure
@@ -996,72 +996,74 @@ Optional Features:
                            you are doing!
 
 Optional Libraries:
-  --with-alsa-prefix=DIR   Prefix where alsa is installed (optional)
+  --with-alsa-prefix=DIR   prefix where alsa is installed (optional)
   --disable-alsa           disable ALSA midi sound support [autodetect]
 
-  --with-ogg-prefix=DIR    Prefix where libogg is installed (optional)
-  --disable-ogg      	   disable Ogg support [autodetect]
+  --with-ogg-prefix=DIR    prefix where libogg is installed (optional)
+  --disable-ogg            disable Ogg support [autodetect]
 
-  --with-vorbis-prefix=DIR Prefix where libvorbis is installed (optional)
+  --with-vorbis-prefix=DIR prefix where libvorbis is installed (optional)
   --disable-vorbis         disable Vorbis support [autodetect]
 
-  --with-tremor-prefix=DIR Prefix where tremor is installed (optional)
+  --with-tremor-prefix=DIR prefix where tremor is installed (optional)
   --disable-tremor         disable tremor support [autodetect]
 
-  --with-mad-prefix=DIR    Prefix where libmad is installed (optional)
+  --with-mad-prefix=DIR    prefix where libmad is installed (optional)
   --disable-mad            disable libmad (MP3) support [autodetect]
 
-  --with-flac-prefix=DIR   Prefix where libFLAC is installed (optional)
+  --with-flac-prefix=DIR   prefix where libFLAC is installed (optional)
   --disable-flac           disable FLAC support [autodetect]
 
-  --with-zlib-prefix=DIR   Prefix where zlib is installed (optional)
+  --with-zlib-prefix=DIR   prefix where zlib is installed (optional)
   --disable-zlib           disable zlib (compression) support [autodetect]
 
-  --with-mpeg2-prefix=DIR  Prefix where libmpeg2 is installed (optional)
+  --with-mpeg2-prefix=DIR  prefix where libmpeg2 is installed (optional)
   --enable-mpeg2           enable mpeg2 codec for cutscenes [autodetect]
 
-  --with-jpeg-prefix=DIR   Prefix where libjpeg is installed (optional)
+  --with-jpeg-prefix=DIR   prefix where libjpeg is installed (optional)
   --disable-jpeg           disable JPEG decoder [autodetect]
 
-  --with-png-prefix=DIR    Prefix where libpng is installed (optional)
+  --with-png-prefix=DIR    prefix where libpng is installed (optional)
   --disable-png            disable PNG decoder [autodetect]
 
-  --with-theoradec-prefix=DIR Prefix where libtheoradec is installed (optional)
+  --with-theoradec-prefix=DIR  prefix where libtheoradec is installed (optional)
   --disable-theoradec      disable Theora decoder [autodetect]
 
-  --with-faad-prefix=DIR   Prefix where libfaad is installed (optional)
+  --with-faad-prefix=DIR   prefix where libfaad is installed (optional)
   --disable-faad           disable AAC decoder [autodetect]
 
-  --with-fluidsynth-prefix=DIR  Prefix where libfluidsynth is
+  --with-fluidsynth-prefix=DIR prefix where libfluidsynth is
                            installed (optional)
   --disable-fluidsynth     disable fluidsynth MIDI driver [autodetect]
 
-  --with-sparkle-prefix=DIR   Prefix where sparkle is installed (OS X/Windows only - optional)
-  --disable-sparkle        disable sparkle automatic update support [OS X/Windows only - autodetect]
+  --with-sparkle-prefix=DIR    prefix where sparkle is installed
+                           (OS X/Windows only - optional)
+  --disable-sparkle        disable sparkle automatic update support
+                           [OS X/Windows only - autodetect]
 
-  --disable-osx-dock-plugin disable the NSDockTilePlugin support [Mac OS X only - autodetect]
+  --disable-osx-dock-plugin    disable the NSDockTilePlugin support
+                               [Mac OS X only - autodetect]
 
-  --with-sdl-prefix=DIR    Prefix where the sdl-config script is
+  --with-sdl-prefix=DIR    prefix where the sdl-config script is
                            installed (optional)
 
-  --with-freetype2-prefix=DIR Prefix where the freetype-config script is
-                           installed (optional)
-  --disable-freetype2     disable freetype2 TTF library usage [autodetect]
+  --with-freetype2-prefix=DIR  prefix where the freetype-config script is
+                               installed (optional)
+  --disable-freetype2      disable freetype2 TTF library usage [autodetect]
 
-  --with-nasm-prefix=DIR   Prefix where nasm executable is installed (optional)
+  --with-nasm-prefix=DIR   prefix where nasm executable is installed (optional)
   --disable-nasm           disable assembly language optimizations [autodetect]
 
-  --with-readline-prefix=DIR    Prefix where readline is installed (optional)
+  --with-readline-prefix=DIR   prefix where readline is installed (optional)
   --disable-readline       disable readline support in text console [autodetect]
 
-  --with-libunity-prefix=DIR   Prefix where libunity is installed (optional)
-  --disable-libunity           disable Unity launcher integration [autodetect]
+  --with-libunity-prefix=DIR   prefix where libunity is installed (optional)
+  --disable-libunity       disable Unity launcher integration [autodetect]
 
-  --with-sndio-prefix=DIR  Prefix where sndio is installed (optional)
+  --with-sndio-prefix=DIR  prefix where sndio is installed (optional)
   --disable-sndio          disable sndio MIDI driver [autodetect]
 
-  --with-sdlnet-prefix=DIR  Prefix where SDL_Net is
-                           installed (optional)
+  --with-sdlnet-prefix=DIR prefix where SDL_Net is installed (optional)
   --disable-sdlnet         disable SDL_Net networking library [autodetect]
   --disable-libcurl        disable libcurl networking library [autodetect]
 


Commit: 0bcaf623aa262d0524109b411106db114d327356
    https://github.com/scummvm/scummvm/commit/0bcaf623aa262d0524109b411106db114d327356
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-10-29T00:05:51+02:00

Commit Message:
CONFIGURE: Add missing --with-libcurl-prefix option

Changed paths:
    configure


diff --git a/configure b/configure
index 49c0282..08480b7 100755
--- a/configure
+++ b/configure
@@ -1065,6 +1065,8 @@ Optional Libraries:
 
   --with-sdlnet-prefix=DIR prefix where SDL_Net is installed (optional)
   --disable-sdlnet         disable SDL_Net networking library [autodetect]
+
+  --with-libcurl-prefix=DIR    prefix where libcurl is installed (optional)
   --disable-libcurl        disable libcurl networking library [autodetect]
 
 Some influential environment variables:
@@ -1315,6 +1317,10 @@ for ac_option in $@; do
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		_freetypepath="$arg:$arg/bin"
 		;;
+	--with-libcurl-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		_libcurlpath="$arg:$arg/bin"
+		;;
 	--with-nasm-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		_nasmpath="$arg:$arg/bin"


Commit: a416c989801cfc803f74dfb6f0e770bb6f4d87fc
    https://github.com/scummvm/scummvm/commit/a416c989801cfc803f74dfb6f0e770bb6f4d87fc
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-10-29T00:05:51+02:00

Commit Message:
CONFIGURE: Handle freetype-config SYSROOT duplication in prefix

Since version 2.3.12, freetype-config adds SYSROOT to all paths.
If we pass a --prefix that already includes SYSROOT, this will return
a duplicate SYSROOT. This patch detects that and adjusts prefix
accordingly.

Changed paths:
    configure


diff --git a/configure b/configure
index 08480b7..cd79adf 100755
--- a/configure
+++ b/configure
@@ -4615,8 +4615,19 @@ if test "$_freetype2" != "no"; then
 	if test -z "$_freetypeconfig"; then
 		_freetype2=no
 	else
-		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
-		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
+		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+		# This means we can't pass it a --prefix that includes $SYSROOT.
+		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
+				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
+				freetypeprefix="${freetypeprefix##$SYSROOT}"
+			fi
+		fi
+
+		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
+		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
 
 		if test "$_freetype2" = "auto"; then
 			_freetype2=no


Commit: 4233156505a73a2990aa4245cf2a3b356c88dc17
    https://github.com/scummvm/scummvm/commit/4233156505a73a2990aa4245cf2a3b356c88dc17
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-10-29T00:05:51+02:00

Commit Message:
TESTBED: Only build cloud tests if libcurl is available too

This matches the module.mk checks for backends/cloud

Changed paths:
    engines/testbed/module.mk
    engines/testbed/testbed.cpp


diff --git a/engines/testbed/module.mk b/engines/testbed/module.mk
index be733a5..5838751 100644
--- a/engines/testbed/module.mk
+++ b/engines/testbed/module.mk
@@ -15,9 +15,11 @@ MODULE_OBJS := \
 	testsuite.o
 
 ifdef USE_CLOUD
+ifdef USE_LIBCURL
 MODULE_OBJS += \
 	cloud.o
 endif
+endif
 
 ifdef USE_SDL_NET
 MODULE_OBJS += \
diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp
index 6e14fc0..f071ab3 100644
--- a/engines/testbed/testbed.cpp
+++ b/engines/testbed/testbed.cpp
@@ -140,7 +140,7 @@ TestbedEngine::TestbedEngine(OSystem *syst)
 	// Midi
 	ts = new MidiTestSuite();
 	_testsuiteList.push_back(ts);
-#ifdef USE_CLOUD
+#if defined(USE_CLOUD) && defined(USE_LIBCURL)
 	// Cloud
 	ts = new CloudTestSuite();
 	_testsuiteList.push_back(ts);

More information about the Scummvm-git-logs mailing list