[Scummvm-cvs-logs] scummvm branch-1-8 -> 51180926a9660e048267dfa70c576aa0dd6a0a45

Thu Feb 25 09:46:12 CET 2016

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

Summary:
d50c2c9b5a CONFIGURE: Remove trailing spaces
4541855ddd CONFIGURE: Fix for latest gcw0 toolchain
d69f1066b4 GCW0: Include free soundfont into release package
448d0ac8e0 GCW0: Made fluidsynth default sound device
bfe4881371 GCW0: Add release build script
3fe8a67056 GCW0: Disabling more features on GCW0
6c42e3fc88 GCW0: Made packager reenterable
51180926a9 GCW0: Trigger keyboard only on button down, not on up, otherwise it required holding


Commit: d50c2c9b5ab253885d34bd186b96a82accda3eb3
    https://github.com/scummvm/scummvm/commit/d50c2c9b5ab253885d34bd186b96a82accda3eb3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:07+01:00

Commit Message:
CONFIGURE: Remove trailing spaces

Changed paths:
    configure

diff --git a/configure b/configure
index 9254c83..222d76f 100755
--- a/configure
+++ b/configure
@@ -593,7 +593,7 @@ engine_enable() {
 		parent=`get_subengine_parent ${engine}`
 		if test `get_engine_build ${parent}` = "no" ; then
 			set_var _engine_${parent}_build "yes"
-		fi		
+		fi
 	fi
 
 	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
@@ -903,7 +903,7 @@ Game engines:
   --disable-all-engines    disable all engines
   --enable-engine=<engine name>[,<engine name>...] enable engine(s) listed
   --disable-engine=<engine name>[,<engine name>...] disable engine(s) listed
-  --enable-engine-static=<engine name>[,<engine name>...] 
+  --enable-engine-static=<engine name>[,<engine name>...]
       enable engine(s) listed as static builtin (when plugins are enabled)
   --enable-engine-dynamic=<engine name>[,<engine name>...]
       enable engine(s) listed as dynamic plugin (when plugins are enabled)
@@ -2283,7 +2283,7 @@ case $_host_os in
 
 			LDFLAGS="-L${macport_prefix}/lib $LDFLAGS"
 			CXXFLAGS="-I${macport_prefix}/include $CXXFLAGS"
-			
+
 			if test -z "$_staticlibpath"; then
 				_staticlibpath=${macport_prefix}
 				echo "Set staticlib-prefix to ${_staticlibpath}"
@@ -2604,7 +2604,7 @@ if test -n "$_host"; then
 			_mt32emu=no
 			_optimization_level=-O3
 			# Disable alsa midi to get the port build on OpenDingux toolchain
-			_alsa=no 
+			_alsa=no
 			_vkeybd=yes
 			_build_hq_scalers=no
 			_keymapper=no
@@ -2631,7 +2631,7 @@ if test -n "$_host"; then
 			_eventrec=no
 			_build_scalers=no
 			_build_hq_scalers=no
-			# We prefer SDL2 on the Raspberry Pi: acceleration now depends on it 
+			# We prefer SDL2 on the Raspberry Pi: acceleration now depends on it
 			# since SDL2 manages dispmanx/GLES2 very well internally.
 			# SDL1 is bit-rotten on this platform.
 			_sdlconfig=sdl2-config
@@ -2696,7 +2696,7 @@ if test -n "$_host"; then
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
-               gcw0)
+		gcw0)
 			append_var DEFINES "-DDINGUX -DGCW0"
 			append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 			append_var CXXFLAGS "-mips32"
@@ -2771,7 +2771,7 @@ if test -n "$_host"; then
 			append_var INCLUDES "-I/usr/X11R6/include"
 			append_var LIBS "-lX11"
 			append_var LIBS "-L/usr/lib"
-			
+
 			_backend="maemo"
 			_vkeybd=yes
 			_keymapper=yes
@@ -3899,7 +3899,7 @@ fi
 echo "$_sparkle"
 
 #
-# Check for FluidSynth 
+# Check for FluidSynth
 #
 echocheck "FluidSynth"
 


Commit: 4541855dddf6f1a9d5583b98f3e52ee5a7b83ea3
    https://github.com/scummvm/scummvm/commit/4541855dddf6f1a9d5583b98f3e52ee5a7b83ea3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:07+01:00

Commit Message:
CONFIGURE: Fix for latest gcw0 toolchain

Changed paths:
    configure



diff --git a/configure b/configure
index 222d76f..6bc0e85 100755
--- a/configure
+++ b/configure
@@ -2697,6 +2697,8 @@ if test -n "$_host"; then
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
 		gcw0)
+			_sysroot=`$CXX --print-sysroot`
+			_sdlpath=$_sysroot/usr/bin
 			append_var DEFINES "-DDINGUX -DGCW0"
 			append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 			append_var CXXFLAGS "-mips32"


Commit: d69f1066b43a1a38ff02bd48ff723d208f2b28c0
    https://github.com/scummvm/scummvm/commit/d69f1066b43a1a38ff02bd48ff723d208f2b28c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:07+01:00

Commit Message:
GCW0: Include free soundfont into release package

Changed paths:
    backends/platform/dingux/dingux.mk



diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 1333e89..fce0f1d 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -33,7 +33,7 @@ endif
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
 
 # Special target for generationg GCW-Zero OPK bundle
-$(gcw0_bundle): all
+$(gcw0_bundle): all GeneralUser\ GS\ FluidSynth\ v1.44.sf2
 	$(MKDIR) $(gcw0_bundle)
 	$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
 	$(MKDIR) $(gcw0_bundle)/themes
@@ -56,6 +56,8 @@ endif
 	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
 	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
 
+	$(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
+
 gcw0-opk-unstripped: $(gcw0_bundle)
 	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
 	$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
@@ -65,3 +67,12 @@ gcw-opk: $(gcw0_bundle)
 	$(STRIP) $(gcw0_bundle)/plugins/*
 	$(STRIP) $(gcw0_bundle)/scummvm
 	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+
+GeneralUser_GS_1.44-FluidSynth.zip:
+	curl -s http://www.scummvm.org/frs/extras/SoundFont/GeneralUser_GS_1.44-FluidSynth.zip -o GeneralUser_GS_1.44-FluidSynth.zip
+
+GeneralUser\ GS\ FluidSynth\ v1.44.sf2: GeneralUser_GS_1.44-FluidSynth.zip
+	unzip GeneralUser_GS_1.44-FluidSynth.zip
+	mv "GeneralUser GS 1.44 FluidSynth/GeneralUser GS FluidSynth v1.44.sf2" .
+	mv "GeneralUser GS 1.44 FluidSynth/README.txt" README.soundfont
+	mv "GeneralUser GS 1.44 FluidSynth/LICENSE.txt" LICENSE.soundfont


Commit: 448d0ac8e0a64d459b9dacb4b7b30e737b6061c1
    https://github.com/scummvm/scummvm/commit/448d0ac8e0a64d459b9dacb4b7b30e737b6061c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:07+01:00

Commit Message:
GCW0: Made fluidsynth default sound device

Changed paths:
    dists/gcw0/scummvmrc



diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index c2087c2..f75a56f 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -7,3 +7,7 @@ browser_lastpath=/media
 extrapath=./engine-data
 pluginspath=./plugins
 joystick_num=0
+soundfont=./GeneralUser GS FluidSynth v1.44.sf2
+mt32_device=fluidsynth
+music_driver=fluidsynth
+gm_device=fluidsynth


Commit: bfe4881371e5877eacc412c1b5f7604c1780ed78
    https://github.com/scummvm/scummvm/commit/bfe4881371e5877eacc412c1b5f7604c1780ed78
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:07+01:00

Commit Message:
GCW0: Add release build script

Changed paths:
  A backends/platform/dingux/build.gcw0.sh



diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
new file mode 100755
index 0000000..fbdd559
--- /dev/null
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
+
+# Disable high resolution engines since we have 320x240 hardware
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-engine=mohawk,neverhood,sword25,toltecs,wintermute,zvision && make -j6 gcw-opk && ls -l scummvm.opk


Commit: 3fe8a67056053a5a094ae64f9927ad1fb8307103
    https://github.com/scummvm/scummvm/commit/3fe8a67056053a5a094ae64f9927ad1fb8307103
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:41+01:00

Commit Message:
GCW0: Disabling more features on GCW0

Changed paths:
    backends/platform/dingux/build.gcw0.sh



diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index fbdd559..62e084f 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
 export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
 
 # Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-engine=mohawk,neverhood,sword25,toltecs,wintermute,zvision && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-engine=mohawk,neverhood,sword25,toltecs,wintermute,zvision --disable-mt32emu --disable-scalers && make -j6 gcw-opk && ls -l scummvm.opk


Commit: 6c42e3fc88a3f8d644997b09d9d22637c9d5414c
    https://github.com/scummvm/scummvm/commit/6c42e3fc88a3f8d644997b09d9d22637c9d5414c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:41+01:00

Commit Message:
GCW0: Made packager reenterable

Changed paths:
    backends/platform/dingux/dingux.mk



diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index fce0f1d..f357e0b 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -72,7 +72,7 @@ GeneralUser_GS_1.44-FluidSynth.zip:
 	curl -s http://www.scummvm.org/frs/extras/SoundFont/GeneralUser_GS_1.44-FluidSynth.zip -o GeneralUser_GS_1.44-FluidSynth.zip
 
 GeneralUser\ GS\ FluidSynth\ v1.44.sf2: GeneralUser_GS_1.44-FluidSynth.zip
-	unzip GeneralUser_GS_1.44-FluidSynth.zip
+	unzip -n GeneralUser_GS_1.44-FluidSynth.zip
 	mv "GeneralUser GS 1.44 FluidSynth/GeneralUser GS FluidSynth v1.44.sf2" .
 	mv "GeneralUser GS 1.44 FluidSynth/README.txt" README.soundfont
 	mv "GeneralUser GS 1.44 FluidSynth/LICENSE.txt" LICENSE.soundfont


Commit: 51180926a9660e048267dfa70c576aa0dd6a0a45
    https://github.com/scummvm/scummvm/commit/51180926a9660e048267dfa70c576aa0dd6a0a45
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-25T09:45:41+01:00

Commit Message:
GCW0: Trigger keyboard only on button down, not on up, otherwise it required holding

Changed paths:
    backends/events/dinguxsdl/dinguxsdl-events.cpp



diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
index cb71304..0492c56 100644
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp
@@ -175,7 +175,9 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 		return true;
 	} else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
 #ifdef ENABLE_VKEYBD
-		event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+		if (ev.type == SDL_KEYDOWN)
+			event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+
 		return true;
 #endif
 	} else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games




