[Scummvm-git-logs] scummvm master -> 6f9583a3b692e8e4af3e8938099f49d92dd62e63

[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:
2d39f75b7d GPH: Attempt to fix OSD
6f9583a3b6 DINGUX: Disable sdl_net and cloud due to the outdated toolchain


Commit: 2d39f75b7de67f19e3086ec4c4376ac154b54f07
    https://github.com/scummvm/scummvm/commit/2d39f75b7de67f19e3086ec4c4376ac154b54f07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-02T23:57:13+02:00

Commit Message:
GPH: Attempt to fix OSD

Changed paths:
    backends/graphics/gph/gph-graphics.cpp



diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 65cb3d1..e698db8 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -278,23 +278,35 @@ void GPHGraphicsManager::internUpdateScreen() {
 	}
 
 #ifdef USE_OSD
-	// OSD visible (i.e. non-transparent)?
-	if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
-		// Updated alpha value
-		const int diff = SDL_GetTicks() - _osdFadeStartTime;
-		if (diff > 0) {
-			if (diff >= kOSDFadeOutDuration) {
-				// Back to full transparency
-				_osdAlpha = SDL_ALPHA_TRANSPARENT;
-			} else {
-				// Do a linear fade out...
-				const int startAlpha = SDL_ALPHA_TRANSPARENT + kOSDInitialAlpha * (SDL_ALPHA_OPAQUE - SDL_ALPHA_TRANSPARENT) / 100;
-				_osdAlpha = startAlpha + diff * (SDL_ALPHA_TRANSPARENT - startAlpha) / kOSDFadeOutDuration;
-			}
-			SDL_SetAlpha(_osdSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, _osdAlpha);
-			_forceFull = true;
+// OSD visible (i.e. non-transparent)?
+if (_osdMessageAlpha != SDL_ALPHA_TRANSPARENT) {
+	// Updated alpha value
+	const int diff = SDL_GetTicks() - _osdMessageFadeStartTime;
+	if (diff > 0) {
+		if (diff >= kOSDFadeOutDuration) {
+			// Back to full transparency
+			_osdMessageAlpha = SDL_ALPHA_TRANSPARENT;
+		} else {
+			// Do a linear fade out...
+			const int startAlpha = SDL_ALPHA_TRANSPARENT + kOSDInitialAlpha * (SDL_ALPHA_OPAQUE - SDL_ALPHA_TRANSPARENT) / 100;
+			_osdMessageAlpha = startAlpha + diff * (SDL_ALPHA_TRANSPARENT - startAlpha) / kOSDFadeOutDuration;
+		}
+		_forceFull = true;
+	}
+
+	if (_osdMessageAlpha == SDL_ALPHA_TRANSPARENT) {
+		removeOSDMessage();
+	} else {
+		if (_osdMessageSurface && _osdSurface) {
+			SDL_Rect dstRect;
+			dstRect.x = (_osdSurface->w - _osdMessageSurface->w) / 2;
+			dstRect.y = (_osdSurface->h - _osdMessageSurface->h) / 2;
+			dstRect.w = _osdMessageSurface->w;
+			dstRect.h = _osdMessageSurface->h;
+			blitOSDMessage(dstRect);
 		}
 	}
+}
 #endif
 
 	if (!_overlayVisible) {
@@ -428,9 +440,7 @@ void GPHGraphicsManager::internUpdateScreen() {
 		drawMouse();
 
 #ifdef USE_OSD
-		if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
-			SDL_BlitSurface(_osdSurface, 0, _hwscreen, 0);
-		}
+		SDL_BlitSurface(_osdSurface, 0, _hwscreen, 0);
 #endif
 		// Finally, blit all our changes to the screen
 		SDL_UpdateRects(_hwscreen, _numDirtyRects, _dirtyRectList);
@@ -459,7 +469,7 @@ void GPHGraphicsManager::hideOverlay() {
 
 bool GPHGraphicsManager::loadGFXMode() {
 
-	// We don't offer anything other than fullscreen on GPH devices so let’s not even pretend.
+	// We don't offer anything other than fullscreen on GPH devices so let's not even pretend.
 	_videoMode.fullscreen = true;
 
 	// Set the hardware stats to match the LCD.


Commit: 6f9583a3b692e8e4af3e8938099f49d92dd62e63
    https://github.com/scummvm/scummvm/commit/6f9583a3b692e8e4af3e8938099f49d92dd62e63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-03T00:12:43+02:00

Commit Message:
DINGUX: Disable sdl_net and cloud due to the outdated toolchain

Changed paths:
    configure



diff --git a/configure b/configure
index e74b748..051c164 100755
--- a/configure
+++ b/configure
@@ -2763,6 +2763,10 @@ if test -n "$_host"; then
 			_optimization_level=-O3
 			# Disable alsa midi to get the port build on OpenDingux toolchain
 			_alsa=no
+			# Disable cloud and SDL_Net due to outdated toolchain
+			_cloud=no
+			_sdlnet=no
+			_libcurl=no
 			_vkeybd=yes
 			_build_hq_scalers=no
 			_keymapper=no