[Scummvm-git-logs] scummvm master -> 96f79a27f93f78e55ee3f30277051c23e235d657

[mgerhardy]

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:
ea49b39d66 CONFIGURE: fixed copy and paste error for gif support
a8280b299e CONFIGURE: added missing --with-gif-prefix support
96f79a27f9 TWINE: mark floppy disk version as unsupported when gif support is not compiled in


Commit: ea49b39d66ca133c109845640f1f6bc05dd80d03
    https://github.com/scummvm/scummvm/commit/ea49b39d66ca133c109845640f1f6bc05dd80d03
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-04-10T18:51:58+02:00

Commit Message:
CONFIGURE: fixed copy and paste error for gif support

Changed paths:
    configure


diff --git a/configure b/configure
index 8bc644ad08..8cb3c36540 100755
--- a/configure
+++ b/configure
@@ -273,7 +273,7 @@ add_feature jpeg "JPEG" "_jpeg"
 add_feature mpeg2 "mpeg2" "_mpeg2"
 add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
 add_feature png "PNG" "_png"
-add_feature png "GIF" "_gif"
+add_feature gif "GIF" "_gif"
 add_feature theoradec "libtheoradec" "_theoradec"
 add_feature tinygl "TinyGL" "_tinygl"
 add_feature vorbis "Vorbis file support" "_vorbis _tremor"


Commit: a8280b299e53edd08bc8ed0d5330a2bc75206ab3
    https://github.com/scummvm/scummvm/commit/a8280b299e53edd08bc8ed0d5330a2bc75206ab3
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-04-10T18:51:58+02:00

Commit Message:
CONFIGURE: added missing --with-gif-prefix support

Changed paths:
    configure


diff --git a/configure b/configure
index 8cb3c36540..d707a23f73 100755
--- a/configure
+++ b/configure
@@ -948,6 +948,9 @@ Optional Libraries:
   --with-png-prefix=DIR    prefix where libpng is installed (optional)
   --disable-png            disable PNG decoder [autodetect]
 
+  --with-gif-prefix=DIR    prefix where giflib is installed (optional)
+  --disable-gif            disable GIF decoder [autodetect]
+
   --with-theoradec-prefix=DIR  prefix where libtheoradec is installed (optional)
   --disable-theoradec      disable Theora decoder [autodetect]
 
@@ -1244,6 +1247,11 @@ for ac_option in $@; do
 		PNG_CFLAGS="-I$arg/include"
 		PNG_LIBS="-L$arg/lib"
 		;;
+	--with-gif-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		GIF_CFLAGS="-I$arg/include"
+		GIF_LIBS="-L$arg/lib"
+		;;
 	--with-theoradec-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		THEORADEC_CFLAGS="-I$arg/include"


Commit: 96f79a27f93f78e55ee3f30277051c23e235d657
    https://github.com/scummvm/scummvm/commit/96f79a27f93f78e55ee3f30277051c23e235d657
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-04-10T18:51:58+02:00

Commit Message:
TWINE: mark floppy disk version as unsupported when gif support is not compiled in

Changed paths:
    engines/twine/POTFILES
    engines/twine/detection.cpp


diff --git a/engines/twine/POTFILES b/engines/twine/POTFILES
index 0e7d0a726d..3c4322b991 100644
--- a/engines/twine/POTFILES
+++ b/engines/twine/POTFILES
@@ -1,2 +1,3 @@
+engines/twine/detection.cpp
 engines/twine/metaengine.cpp
 engines/twine/parser/text.cpp
diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 872f90e77f..3dd53dafa3 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -22,6 +22,7 @@
 
 #include "common/config-manager.h"
 #include "common/language.h"
+#include "common/translation.h"
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
 #include "twine/detection.h"
@@ -207,11 +208,19 @@ static const ADGameDescription twineGameDescriptions[] = {
 	// 11 August 1995 at 23:28
 	{
 		"lba",
+#ifdef USE_GIF
 		"Floppy Disk Version",
 		AD_ENTRY1s("FLA_GIF.HQR", "3f7383f65afa212e3eec430627828b64", 1784466),
 		Common::EN_ANY,
 		Common::kPlatformDOS,
 		ADGF_TESTING | TwinE::TF_USE_GIF,
+#else
+		_s("This version requires Giflib which was not compiled into ScummVM"),
+		AD_ENTRY1s("FLA_GIF.HQR", "3f7383f65afa212e3eec430627828b64", 1784466),
+		Common::EN_ANY,
+		Common::kPlatformDOS,
+		ADGF_UNSUPPORTED,
+#endif
 		GUIO1(GUIO_NONE)
 	},