From 7ac3ae108a69587693e0820cde43a63c34a186ec Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 16:23:15 +0200
Subject: BACKEND: Prefer Surface::create taking a PixelFormat over the one
 taking a byte depth.

---
 backends/platform/ds/arm9/source/osystem_ds.cpp | 2 +-
 backends/platform/ps2/Gs2dScreen.cpp            | 2 +-
 backends/platform/ps2/systemps2.cpp             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 576b70dd2a..92f9eb5e9e 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -243,7 +243,7 @@ void OSystem_DS::setCursorPalette(const byte *colors, uint start, uint num) {
 }
 
 bool OSystem_DS::grabRawScreen(Graphics::Surface *surf) {
-	surf->create(DS::getGameWidth(), DS::getGameHeight(), 1);
+	surf->create(DS::getGameWidth(), DS::getGameHeight(), Graphics::PixelFormat::createFormatCLUT8());
 
 	// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
 
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index a460b919fd..1c670764f9 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -441,7 +441,7 @@ void Gs2dScreen::grabPalette(uint8 *pal, uint8 start, uint16 num) {
 void Gs2dScreen::grabScreen(Graphics::Surface *surf) {
 	assert(surf);
 	WaitSema(g_DmacSema);
-	surf->create(_width, _height, 1);
+	surf->create(_width, _height, Graphics::PixelFormat::createFormatCLUT8());
 	memcpy(surf->pixels, _screenBuf, _width * _height);
 	SignalSema(g_DmacSema);
 }
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 77de74eb5b..e95a026d01 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -727,7 +727,7 @@ void OSystem_PS2::msgPrintf(int millis, const char *format, ...) {
 	int maxWidth = 0;
 
 	Graphics::Surface surf;
-	surf.create(300, 200, 1);
+	surf.create(300, 200, Graphics::PixelFormat::createFormatCLUT8());
 
 	char *lnSta = resStr;
 	while (*lnSta && (posY < 180)) {
-- 
cgit v1.2.3


From 877004dbdd967d2f57d494b1aaa1cb55aae0fd52 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 21:14:19 +0200
Subject: BACKENDS: Adapt various backends code to set up Surface::format
 correctly.

Note that this change is not tested at all (not even compile wise!).
---
 backends/platform/android/gfx.cpp                |  4 ++--
 backends/platform/android/texture.cpp            | 14 ++++++++------
 backends/platform/ds/arm9/source/osystem_ds.cpp  |  2 ++
 backends/platform/iphone/osys_video.cpp          |  1 +
 backends/platform/n64/osys_n64_base.cpp          |  1 +
 backends/platform/ps2/Gs2dScreen.cpp             |  1 +
 backends/platform/psp/default_display_client.cpp |  1 +
 backends/platform/wii/osystem_gfx.cpp            |  2 ++
 8 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 86232030ff..fae428d29f 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -628,13 +628,13 @@ void OSystem_Android::grabOverlay(OverlayColor *buf, int pitch) {
 	GLTHREADCHECK;
 
 	const Graphics::Surface *surface = _overlay_texture->surface_const();
-	assert(surface->bytesPerPixel == sizeof(buf[0]));
+	assert(surface->format.bytesPerPixel == sizeof(buf[0]));
 
 	const byte *src = (const byte *)surface->pixels;
 	uint h = surface->h;
 
 	do {
-		memcpy(buf, src, surface->w * surface->bytesPerPixel);
+		memcpy(buf, src, surface->w * surface->format.bytesPerPixel);
 		src += surface->pitch;
 		// This 'pitch' is pixels not bytes
 		buf += pitch;
diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp
index a6b28ca485..5931902906 100644
--- a/backends/platform/android/texture.cpp
+++ b/backends/platform/android/texture.cpp
@@ -148,6 +148,7 @@ void GLESBaseTexture::allocBuffer(GLuint w, GLuint h) {
 	_surface.w = w;
 	_surface.h = h;
 	_surface.bytesPerPixel = _pixelFormat.bytesPerPixel;
+	_surface.format = _pixelFormat;
 
 	if (w == _texture_width && h == _texture_height)
 		return;
@@ -241,14 +242,14 @@ void GLESTexture::allocBuffer(GLuint w, GLuint h) {
 	delete[] _buf;
 	delete[] _pixels;
 
-	_pixels = new byte[w * h * _surface.bytesPerPixel];
+	_pixels = new byte[w * h * _surface.format.bytesPerPixel];
 	assert(_pixels);
 
 	_surface.pixels = _pixels;
 
 	fillBuffer(0);
 
-	_buf = new byte[w * h * _surface.bytesPerPixel];
+	_buf = new byte[w * h * _surface.format.bytesPerPixel];
 	assert(_buf);
 }
 
@@ -257,10 +258,10 @@ void GLESTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h,
 	setDirtyRect(Common::Rect(x, y, x + w, y + h));
 
 	const byte *src = (const byte *)buf;
-	byte *dst = _pixels + y * _surface.pitch + x * _surface.bytesPerPixel;
+	byte *dst = _pixels + y * _surface.pitch + x * _surface.format.bytesPerPixel;
 
 	do {
-		memcpy(dst, src, w * _surface.bytesPerPixel);
+		memcpy(dst, src, w * _surface.format.bytesPerPixel);
 		dst += _surface.pitch;
 		src += pitch_buf;
 	} while (--h);
@@ -301,10 +302,10 @@ void GLESTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) {
 			_tex = _buf;
 
 			byte *src = _pixels + _dirty_rect.top * _surface.pitch +
-						_dirty_rect.left * _surface.bytesPerPixel;
+						_dirty_rect.left * _surface.format.bytesPerPixel;
 			byte *dst = _buf;
 
-			uint16 l = dwidth * _surface.bytesPerPixel;
+			uint16 l = dwidth * _surface.format.bytesPerPixel;
 
 			for (uint16 i = 0; i < dheight; ++i) {
 				memcpy(dst, src, l);
@@ -374,6 +375,7 @@ void GLESFakePaletteTexture::allocBuffer(GLuint w, GLuint h) {
 	GLESBaseTexture::allocBuffer(w, h);
 
 	_surface.bytesPerPixel = 1;
+	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
 	_surface.pitch = w;
 
 	if (_surface.w == oldw && _surface.h == oldh) {
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 92f9eb5e9e..b22bc437b0 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -757,6 +757,7 @@ Graphics::Surface *OSystem_DS::createTempFrameBuffer() {
 		_framebuffer.h = DS::getGameHeight();
 		_framebuffer.pitch = DS::getGameWidth();
 		_framebuffer.bytesPerPixel = 1;
+		_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	} else {
 
@@ -782,6 +783,7 @@ Graphics::Surface *OSystem_DS::createTempFrameBuffer() {
 		_framebuffer.h = height;
 		_framebuffer.pitch = width;
 		_framebuffer.bytesPerPixel = 1;
+		_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	}
 
diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp
index c5e7ab8413..6f5b0e1e19 100644
--- a/backends/platform/iphone/osys_video.cpp
+++ b/backends/platform/iphone/osys_video.cpp
@@ -335,6 +335,7 @@ Graphics::Surface *OSystem_IPHONE::lockScreen() {
 	_framebuffer.h = _screenHeight;
 	_framebuffer.pitch = _screenWidth;
 	_framebuffer.bytesPerPixel = 1;
+	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
 }
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 54eab0fd52..5a6a7ef9c0 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -611,6 +611,7 @@ Graphics::Surface *OSystem_N64::lockScreen() {
 	_framebuffer.h = _gameHeight;
 	_framebuffer.pitch = _screenWidth;
 	_framebuffer.bytesPerPixel = 1;
+	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
 }
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index 1c670764f9..22dae94527 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -399,6 +399,7 @@ Graphics::Surface *Gs2dScreen::lockScreen() {
 	_framebuffer.h = _height;
 	_framebuffer.pitch = _width; // -not- _pitch; ! It's EE mem, not Tex
 	_framebuffer.bytesPerPixel = 1;
+	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
 }
diff --git a/backends/platform/psp/default_display_client.cpp b/backends/platform/psp/default_display_client.cpp
index bb42406c3e..cab9c15926 100644
--- a/backends/platform/psp/default_display_client.cpp
+++ b/backends/platform/psp/default_display_client.cpp
@@ -200,6 +200,7 @@ Graphics::Surface *Screen::lockAndGetForEditing() {
 	_frameBuffer.h = _buffer.getSourceHeight();
 	_frameBuffer.pitch = _buffer.getBytesPerPixel() * _buffer.getWidth();
 	_frameBuffer.bytesPerPixel = _buffer.getBytesPerPixel();
+	_frameBuffer.format = _pixelFormat;
 	// We'll set to dirty once we unlock the screen
 
 	return &_frameBuffer;
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index cb9a8c72e9..05952591a6 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -538,9 +538,11 @@ Graphics::Surface *OSystem_Wii::lockScreen() {
 #ifdef USE_RGB_COLOR
 	_surface.pitch = _gameWidth * _pfGame.bytesPerPixel;
 	_surface.bytesPerPixel = _pfGame.bytesPerPixel;
+	_surface.format = _pfGame;
 #else
 	_surface.pitch = _gameWidth;
 	_surface.bytesPerPixel = 1;
+	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
 #endif
 
 	return &_surface;
-- 
cgit v1.2.3


From da734a4af024a72ee155bc25d6e45f994de6b060 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 21:27:34 +0200
Subject: ALL/GRAPHICS: Remove Surface::bytesPerPixel.

---
 backends/platform/android/texture.cpp            | 2 --
 backends/platform/dc/display.cpp                 | 2 +-
 backends/platform/ds/arm9/source/osystem_ds.cpp  | 2 --
 backends/platform/iphone/osys_video.cpp          | 1 -
 backends/platform/n64/osys_n64_base.cpp          | 1 -
 backends/platform/ps2/Gs2dScreen.cpp             | 1 -
 backends/platform/psp/default_display_client.cpp | 1 -
 backends/platform/wii/osystem_gfx.cpp            | 2 --
 8 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp
index 5931902906..2d73783309 100644
--- a/backends/platform/android/texture.cpp
+++ b/backends/platform/android/texture.cpp
@@ -147,7 +147,6 @@ void GLESBaseTexture::setLinearFilter(bool value) {
 void GLESBaseTexture::allocBuffer(GLuint w, GLuint h) {
 	_surface.w = w;
 	_surface.h = h;
-	_surface.bytesPerPixel = _pixelFormat.bytesPerPixel;
 	_surface.format = _pixelFormat;
 
 	if (w == _texture_width && h == _texture_height)
@@ -374,7 +373,6 @@ void GLESFakePaletteTexture::allocBuffer(GLuint w, GLuint h) {
 
 	GLESBaseTexture::allocBuffer(w, h);
 
-	_surface.bytesPerPixel = 1;
 	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
 	_surface.pitch = w;
 
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index b297022775..78fa2182dc 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -720,7 +720,7 @@ Graphics::Surface *OSystem_Dreamcast::lockScreen()
   _framebuffer.w = _screen_w;
   _framebuffer.h = _screen_h;
   _framebuffer.pitch = SCREEN_W*2;
-  _framebuffer.bytesPerPixel = (_screenFormat == 0? 1 : 2);
+  _framebuffer.format = screenFormats[_screenFormat];
 
   return &_framebuffer;
 }
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index b22bc437b0..49818a0034 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -756,7 +756,6 @@ Graphics::Surface *OSystem_DS::createTempFrameBuffer() {
 		_framebuffer.w = DS::getGameWidth();
 		_framebuffer.h = DS::getGameHeight();
 		_framebuffer.pitch = DS::getGameWidth();
-		_framebuffer.bytesPerPixel = 1;
 		_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	} else {
@@ -782,7 +781,6 @@ Graphics::Surface *OSystem_DS::createTempFrameBuffer() {
 		_framebuffer.w = width;
 		_framebuffer.h = height;
 		_framebuffer.pitch = width;
-		_framebuffer.bytesPerPixel = 1;
 		_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	}
diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp
index 6f5b0e1e19..a10efeff40 100644
--- a/backends/platform/iphone/osys_video.cpp
+++ b/backends/platform/iphone/osys_video.cpp
@@ -334,7 +334,6 @@ Graphics::Surface *OSystem_IPHONE::lockScreen() {
 	_framebuffer.w = _screenWidth;
 	_framebuffer.h = _screenHeight;
 	_framebuffer.pitch = _screenWidth;
-	_framebuffer.bytesPerPixel = 1;
 	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 5a6a7ef9c0..232037899b 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -610,7 +610,6 @@ Graphics::Surface *OSystem_N64::lockScreen() {
 	_framebuffer.w = _gameWidth;
 	_framebuffer.h = _gameHeight;
 	_framebuffer.pitch = _screenWidth;
-	_framebuffer.bytesPerPixel = 1;
 	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index 22dae94527..e43ea0f376 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -398,7 +398,6 @@ Graphics::Surface *Gs2dScreen::lockScreen() {
 	_framebuffer.w = _width;
 	_framebuffer.h = _height;
 	_framebuffer.pitch = _width; // -not- _pitch; ! It's EE mem, not Tex
-	_framebuffer.bytesPerPixel = 1;
 	_framebuffer.format = Graphics::PixelFormat::createFormatCLUT8();
 
 	return &_framebuffer;
diff --git a/backends/platform/psp/default_display_client.cpp b/backends/platform/psp/default_display_client.cpp
index cab9c15926..34b1a70711 100644
--- a/backends/platform/psp/default_display_client.cpp
+++ b/backends/platform/psp/default_display_client.cpp
@@ -199,7 +199,6 @@ Graphics::Surface *Screen::lockAndGetForEditing() {
 	_frameBuffer.w = _buffer.getSourceWidth();
 	_frameBuffer.h = _buffer.getSourceHeight();
 	_frameBuffer.pitch = _buffer.getBytesPerPixel() * _buffer.getWidth();
-	_frameBuffer.bytesPerPixel = _buffer.getBytesPerPixel();
 	_frameBuffer.format = _pixelFormat;
 	// We'll set to dirty once we unlock the screen
 
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 05952591a6..c2be608999 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -537,11 +537,9 @@ Graphics::Surface *OSystem_Wii::lockScreen() {
 	_surface.h = _gameHeight;
 #ifdef USE_RGB_COLOR
 	_surface.pitch = _gameWidth * _pfGame.bytesPerPixel;
-	_surface.bytesPerPixel = _pfGame.bytesPerPixel;
 	_surface.format = _pfGame;
 #else
 	_surface.pitch = _gameWidth;
-	_surface.bytesPerPixel = 1;
 	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
 #endif
 
-- 
cgit v1.2.3


From cd6ee0589d0556d3d9e81d835c8b900636083de5 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Mon, 25 Apr 2011 22:29:26 +0300
Subject: JANITORIAL: Format forward declarations to follow convention

---
 backends/platform/ps2/systemps2.h | 4 ++--
 backends/platform/psp/mp3.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 37575f399f..c13dcb0f07 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -47,11 +47,11 @@ struct Ps2Mutex {
 };
 
 namespace Common {
-	class TimerManager;
+class TimerManager;
 };
 
 namespace Audio {
-	class MixerImpl;
+class MixerImpl;
 };
 
 class OSystem_PS2 : public BaseBackend, public PaletteManager {
diff --git a/backends/platform/psp/mp3.h b/backends/platform/psp/mp3.h
index 1d2fe5ec2f..95491d5788 100644
--- a/backends/platform/psp/mp3.h
+++ b/backends/platform/psp/mp3.h
@@ -30,7 +30,7 @@
 #include "common/scummsys.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {
-- 
cgit v1.2.3


From 3e01d35281c2a279ed3ad6873c87cddddb926a36 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Mon, 25 Apr 2011 22:29:26 +0300
Subject: JANITORIAL: Format more forward declarations to follow convention

---
 backends/platform/ps2/Gs2dScreen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform')

diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h
index 358e717cbe..6e842b3f55 100644
--- a/backends/platform/ps2/Gs2dScreen.h
+++ b/backends/platform/ps2/Gs2dScreen.h
@@ -46,7 +46,7 @@ enum GsInterlace {
 
 
 namespace Graphics {
-	struct Surface;
+struct Surface;
 }
 
 class Gs2dScreen {
-- 
cgit v1.2.3


From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 backends/platform/sdl/sdl.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 2c0c45907f..4694a061a3 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -32,6 +32,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
 #include "common/EventRecorder.h"
+#include "common/textconsole.h"
 
 #include "backends/saves/default/default-saves.h"
 #include "backends/audiocd/sdl/sdl-audiocd.h"
-- 
cgit v1.2.3


From c6fa23a3d1af0256b43503439abe5c0083c03cfd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Apr 2011 22:32:12 +1000
Subject: JANITORIAL: Add in necessary include files to fix compilation in MSVC

---
 backends/platform/sdl/win32/win32.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 9459263ae2..fffc3a2a75 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -27,6 +27,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/scummsys.h"
+#include "common/error.h"
+#include "common/textconsole.h"
 
 #ifdef WIN32
 
-- 
cgit v1.2.3


From 3f7d45770ee985b9f1c7b1ff02ed0f498b3f0693 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 19:51:22 +0300
Subject: WII: Fix compilation

---
 backends/platform/wii/osystem.cpp | 1 +
 backends/platform/wii/osystem.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index 2aefe48f0c..54da27126c 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -26,6 +26,7 @@
 #include <ogc/lwp_watchdog.h>
 
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 
 #include "osystem.h"
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 3c992b8bdc..d1ea8e07ae 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -36,6 +36,7 @@
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 #include "graphics/surface.h"
 #include "audio/mixer_intern.h"
 
-- 
cgit v1.2.3


From ae1047257515aed03332bb3b2570120e7ded6627 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 19:54:45 +0300
Subject: GPH: Fix compilation

---
 backends/platform/gph/gph-backend.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index fddcd03d85..375ee37378 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -40,6 +40,7 @@
 #include "common/debug.h"
 #include "common/events.h"
 #include "common/file.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 #include "audio/mixer_intern.h"
-- 
cgit v1.2.3


From 1b681e85a8a0345d0ce848a7584a7654ad629f07 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 20:05:01 +0300
Subject: ANDROID: Fix compilation

---
 backends/platform/android/android.h         | 1 +
 backends/platform/android/asset-archive.cpp | 1 +
 backends/platform/android/jni.cpp           | 1 +
 3 files changed, 3 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 6eebdb97d9..109d252a99 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -31,6 +31,7 @@
 #include "common/fs.h"
 #include "common/archive.h"
 #include "audio/mixer_intern.h"
+#include "graphics/palette.h"
 #include "graphics/surface.h"
 #include "backends/base-backend.h"
 #include "backends/plugins/posix/posix-provider.h"
diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index 8e95029894..7c21b35281 100644
--- a/backends/platform/android/asset-archive.cpp
+++ b/backends/platform/android/asset-archive.cpp
@@ -35,6 +35,7 @@
 #include "common/util.h"
 #include "common/archive.h"
 #include "common/debug.h"
+#include "common/textconsole.h"
 
 #include "backends/platform/android/jni.h"
 #include "backends/platform/android/asset-archive.h"
diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index 08a1491998..7962fa7b4b 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -28,6 +28,7 @@
 #include "base/main.h"
 #include "base/version.h"
 #include "common/config-manager.h"
+#include "common/textconsole.h"
 #include "engines/engine.h"
 
 #include "backends/platform/android/android.h"
-- 
cgit v1.2.3


From 130d96e36017a78f3f5f413fccf97006f6819280 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 20:07:43 +0300
Subject: PSP: Fix compilation

---
 backends/platform/psp/osys_psp.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 051449d4a0..1e4aea70d3 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -29,6 +29,7 @@
 #include "common/scummsys.h"
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 #include "audio/mixer_intern.h"
 #include "backends/base-backend.h"
 #include "backends/fs/psp/psp-fs-factory.h"
-- 
cgit v1.2.3


From 52c0b2e28c85658d0ae2d2522e6e2d02c4db8796 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 20:53:01 +0300
Subject: ANDROID: Another attempt at compilation fix

---
 backends/platform/android/jni.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index 7962fa7b4b..f23d71b2a4 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -28,6 +28,7 @@
 #include "base/main.h"
 #include "base/version.h"
 #include "common/config-manager.h"
+#include "common/error.h"
 #include "common/textconsole.h"
 #include "engines/engine.h"
 
-- 
cgit v1.2.3


From 1a7e84f376bc44d9435bfb2930dcd421ea6172ca Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 20:55:00 +0300
Subject: DC: Fix compilation

---
 backends/platform/dc/dc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index f0c8c1f96c..060eff2b48 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -26,6 +26,7 @@
 #include "backends/base-backend.h"
 #include <graphics/surface.h>
 #include <graphics/colormasks.h>
+#include <graphics/palette.h>
 #include <ronin/soundcommon.h>
 #include "backends/timer/default/default-timer.h"
 #include "backends/audiocd/default/default-audiocd.h"
-- 
cgit v1.2.3


From 8feac89bc7329f002d3c4beba370d9c6ea05e798 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Thu, 28 Apr 2011 20:02:01 +0200
Subject: ANDROID: Fix compilation some more

---
 backends/platform/android/android.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index bbfdb06b8d..c7f62f523b 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -32,6 +32,7 @@
 #include <unistd.h>
 
 #include "common/util.h"
+#include "common/textconsole.h"
 #include "common/rect.h"
 #include "common/queue.h"
 #include "common/mutex.h"
-- 
cgit v1.2.3


From e52d54b55e0c79a83c0a47b139b3b588ce8dd0c4 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 22:19:35 +0300
Subject: NDS: Fix compilation

---
 backends/platform/ds/arm9/source/osystem_ds.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform')

diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 5e179d1337..b745b4dc6e 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -36,6 +36,7 @@
 #include "audio/mixer_intern.h"
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 
 class OSystem_DS : public BaseBackend, public PaletteManager {
 protected:
-- 
cgit v1.2.3


From 4d485fc7413544e51d7e00fd837e7b46b2e5962b Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 28 Apr 2011 23:11:26 +0300
Subject: BACKENDS: Fix compilation for various backends

Affects:
* PS2
* GPH
* ELF
* MOTO
* IPHONE
* N64
* DINGUX
* WINCE
* PSP
---
 backends/platform/iphone/osys_main.h  | 1 +
 backends/platform/n64/osys_n64.h      | 1 +
 backends/platform/ps2/ps2input.h      | 4 ++++
 backends/platform/ps2/systemps2.h     | 1 +
 backends/platform/psp/mp3.cpp         | 1 +
 backends/platform/wince/wince-sdl.cpp | 1 +
 6 files changed, 9 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 25c3c40cf9..79f596632f 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -30,6 +30,7 @@
 #include "audio/mixer_intern.h"
 #include "backends/fs/posix/posix-fs-factory.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 
 #include <AudioToolbox/AudioQueue.h>
 
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 2daa41a9f6..7a84de0449 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -37,6 +37,7 @@
 
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 #include "graphics/pixelformat.h"
 
 #include "audio/mixer_intern.h"
diff --git a/backends/platform/ps2/ps2input.h b/backends/platform/ps2/ps2input.h
index 266f408809..eca5950113 100644
--- a/backends/platform/ps2/ps2input.h
+++ b/backends/platform/ps2/ps2input.h
@@ -32,6 +32,10 @@
 class OSystem_PS2;
 class Ps2Pad;
 
+namespace Common {
+struct Event;
+}
+
 class Ps2Input {
 public:
 	Ps2Input(OSystem_PS2 *system, bool mouseLoaded, bool kbdLoaded);
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index c13dcb0f07..54e6f05798 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -28,6 +28,7 @@
 
 #include "common/system.h"
 #include "backends/base-backend.h"
+#include "graphics/palette.h"
 
 class DefaultTimerManager;
 class DefaultSaveFileManager;
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index 54476dabfd..0faeacb2f2 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -29,6 +29,7 @@
 #include "common/util.h"
 #include "common/singleton.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 
 #include "audio/audiostream.h"
 
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index b829686cb0..b54aebe6bd 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -33,6 +33,7 @@
 #include "common/debug.h"
 #include "common/events.h"
 #include "common/util.h"
+#include "common/textconsole.h"
 #include "common/timer.h"
 #include "common/translation.h"
 
-- 
cgit v1.2.3


From 22c74bf23ec24ed5d5b881f093eb732eb61c60e2 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Fri, 29 Apr 2011 22:22:58 +0200
Subject: DC: Aesthetical improvements to plugin loader

---
 backends/platform/dc/plugins.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/dc/plugins.cpp b/backends/platform/dc/plugins.cpp
index be329ab314..44b8960513 100644
--- a/backends/platform/dc/plugins.cpp
+++ b/backends/platform/dc/plugins.cpp
@@ -39,6 +39,7 @@ static void drawPluginProgress(const Common::String &filename)
 {
   ta_sync();
   void *mark = ta_txmark();
+  const char *fn = filename.c_str();
   Label lab1, lab2, lab3;
   char buf[32];
   unsigned memleft = 0x8cf00000-((unsigned)sbrk(0));
@@ -46,20 +47,21 @@ static void drawPluginProgress(const Common::String &filename)
   int fcol = (memleft < (1<<20)? 0xffff0000:
 	      (memleft < (4<<20)? 0xffffff00: 0xff00ff00));
   snprintf(buf, sizeof(buf), "%dK free memory", memleft>>10);
+  if (fn[0] == '/') fn++;
   lab1.create_texture("Loading plugins, please wait...");
-  lab2.create_texture(filename.c_str());
+  lab2.create_texture(fn);
   lab3.create_texture(buf);
   ta_begin_frame();
-  draw_solid_quad(80.0, 320.0, 560.0, 350.0,
+  draw_solid_quad(80.0, 270.0, 560.0, 300.0,
 		  0xff808080, 0xff808080, 0xff808080, 0xff808080);
-  draw_solid_quad(85.0, 325.0, 555.0, 345.0, 
+  draw_solid_quad(85.0, 275.0, 555.0, 295.0, 
 		  0xff202020, 0xff202020, 0xff202020, 0xff202020);
-  draw_solid_quad(85.0, 325.0, 85.0+470.0*ffree, 345.0,
+  draw_solid_quad(85.0, 275.0, 85.0+470.0*ffree, 295.0,
 		  fcol, fcol, fcol, fcol);
   ta_commit_end();
-  lab1.draw(100.0, 200.0, 0xffffffff);
-  lab2.draw(100.0, 240.0, 0xffffffff);
-  lab3.draw(100.0, 280.0, 0xffffffff);
+  lab1.draw(100.0, 150.0, 0xffffffff);
+  lab2.draw(100.0, 190.0, 0xffaaffaa);
+  lab3.draw(100.0, 230.0, 0xffffffff);
   ta_commit_frame();
   ta_sync();
   ta_txrelease(mark);
-- 
cgit v1.2.3


From c3463e77d2d7453e15c703a15df6e44745c7b6b4 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Fri, 29 Apr 2011 22:25:09 +0200
Subject: DC: Create a "dcdist" target for buildbot

The "dcdist" target creates the directory dcdist/scummvm and copies
relevant files from the nightly build into it.  This is is they do
not have to be enumerated in the buildbot configuration.
---
 backends/platform/dc/dreamcast.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index 8651a2936c..666e03eece 100644
--- a/backends/platform/dc/dreamcast.mk
+++ b/backends/platform/dc/dreamcast.mk
@@ -35,3 +35,7 @@ ip.txt : $(srcdir)/backends/platform/dc/ip.txt.in
 	  ver="V$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)"; fi; \
 	sed -e 's/[@]VERSION[@]/'"$$ver"/ -e 's/[@]DATE[@]/$(shell date '+%Y%m%d')/' < $< > $@
 
+
+dcdist : dist
+	mkdir -p dcdist/scummvm
+	cp scummvm.elf SCUMMVM.BIN IP.BIN *.PLG dcdist/scummvm/
-- 
cgit v1.2.3


From 204a9c2e51fa834f5f04776f3e53535d158c900c Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 1 May 2011 14:44:20 +0300
Subject: RELEASE: This is 1.4.0git

---
 backends/platform/psp/README.PSP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform')

diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index b520022033..dcfa30898c 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 1.3.0git README
+ScummVM-PSP 1.4.0git README
 ==============================================================================
 
 Installation
-- 
cgit v1.2.3


From c74fcf19d8e9059d23d9e3cae9cf373edd99071a Mon Sep 17 00:00:00 2001
From: Klaus Reimer
Date: Sun, 1 May 2011 23:42:23 +0200
Subject: WEBOS: Rewritten webos packaging again. No fancy settings needed
 anymore. Just "make package".

---
 backends/platform/webos/webos.mk | 107 +++++++++++++++++++++++----------------
 1 file changed, 64 insertions(+), 43 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk
index 22df5622ee..2b145b00c9 100644
--- a/backends/platform/webos/webos.mk
+++ b/backends/platform/webos/webos.mk
@@ -1,15 +1,27 @@
 # WebOS specific build targets
 # ============================================================================
 #
-# Run "make webosrelease" to create a release package to be uploaded to the
-# Palm app catalog.
+# Build instructions:
 #
-# Run "make webosbeta" to create a beta package to be uploaded to the Palm
-# Beta app catalog.
+# 1. Install the WebOS SDK and PDK and setup the environment variables
+#    WEBOS_SDK and WEBOS_PDK accordingly.
 #
-# Before calling these targets the ScummVM source must be configured for a
-# WebOS build.  See
-# http://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS for details.
+# 2. Cross-compile zlib, flac, mad and tremor and install it into the PDK.
+#
+# 3. Prepare the ScummVM source for a webOS build:
+#    $ ./configure --host=webos --enable-plugins --default-dynamic \
+#          --enable-release
+#
+# 4. Create the package:
+#    $ make package
+#
+# The package is now in the "portdist" folder.
+#
+# See http://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS for
+# more detailed build instructions.
+#
+#
+# Palm App catalog instructions:
 #
 # VER_PACKAGE must be set to a number which is higher than the currently
 # used package version in the app catalog.  So when creating an updated
@@ -25,46 +37,55 @@
 # to use a user-specific app name when submitting the created package to the
 # Palm app catalog.  Use "ScummVM (<username>)" instead of "ScummVM" and
 # "ScummVM Beta (<username>)" instead of "ScummVM Beta".
+#
+# The app id is automatically parsed from the installation prefix.  So add a
+# configure parameter like this to prepare a build of a package for the Palm
+# App Catalog:
+#
+#   --prefix=/media/cryptofs/apps/usr/palm/applications/com.github.kayahr.scummvm
+#
+# To build a package for the Palm Beta App Catalog add "-beta" to the prefix:
+#
+#   --prefix=/media/cryptofs/apps/usr/palm/applications/com.github.kayahr.scummvm-beta
+# ============================================================================
+
+# Increment this number when the packaging of the app has been changed while
+# ScummVM itself has the same version as before. The number can be reset to 
+# 1 when the ScummVM version is increased.
+VER_PACKAGE = 5
 
 PATH_DIST = $(srcdir)/dists/webos
 PATH_MOJO = $(PATH_DIST)/mojo
-BASE_APP_ID = org.scummvm
-APP_ID = $(BASE_APP_ID).scummvm
-BETA_APP_ID = $(APP_ID)-beta
+APP_ID = $(shell basename $(prefix))
 APP_VERSION = $(shell printf "%d.%d.%02d%02d" $(VER_MAJOR) $(VER_MINOR) $(VER_PATCH) $(VER_PACKAGE))
-STAGING_DIR=STAGING/$(APP_ID)
-
-webosprepare: all
-	$(QUIET)if [ "$(VER_PACKAGE)" = "" ]; \
-	then \
-	    echo "ERROR: VER_PACKAGE is not set"; \
-            echo "Example: export VER_PACKAGE=1"; \
-	    exit 1; \
-	fi
-	$(QUIET)$(RM_REC) $(STAGING_DIR)
-	$(QUIET)$(MKDIR) $(STAGING_DIR)
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/bin
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/lib
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) $(PATH_MOJO)/* $(STAGING_DIR)
-	$(QUIET)$(CP) gui/themes/translations.dat $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) gui/themes/scummmodern.zip $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) scummvm $(STAGING_DIR)/bin
-	$(QUIET)$(STRIP) $(STAGING_DIR)/bin/scummvm
-	$(QUIET)sed -i s/'APP_VERSION'/'$(APP_VERSION)'/ $(STAGING_DIR)/appinfo.json
+DESTDIR ?= portdist
 
-webosrelease: webosprepare
-	$(QUIET)$(RM) $(APP_ID)_*.ipk
-	$(QUIET)sed -i s/'APP_ID'/'$(APP_ID)'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format $(STAGING_DIR)
-	$(QUIET)$(RM_REC) STAGING
+install: all
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(prefix)"
+	$(QUIET)$(INSTALL) -m 0644 -t "$(DESTDIR)$(prefix)/" "$(PATH_MOJO)/"*
+	$(QUIET)$(INSTALL) -m 0755 "$(PATH_MOJO)/start" "$(DESTDIR)$(prefix)/"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(bindir)"
+	$(QUIET)$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+	$(QUIET)$(STRIP) "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(docdir)"
+	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(datadir)"
+	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+ifdef DYNAMIC_MODULES
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(libdir)/"
+	$(QUIET)$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/"
+	$(QUIET)$(STRIP) "$(DESTDIR)$(libdir)/"*
+endif
+	$(QUIET)sed -i s/'APP_VERSION'/'$(APP_VERSION)'/ "$(DESTDIR)$(prefix)/appinfo.json"
+	$(QUIET)sed -i s/'APP_ID'/'$(APP_ID)'/ "$(DESTDIR)$(prefix)/appinfo.json"
+ifneq (,$(findstring -beta,$(APP_ID)))
+	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM Beta'/ "$(DESTDIR)$(prefix)/appinfo.json"
+else
+	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM'/ "$(DESTDIR)$(prefix)/appinfo.json"
+endif
 
-webosbeta: webosprepare
-	$(QUIET)$(RM) $(BETA_APP_ID)_*.ipk
-	$(QUIET)sed -i s/'APP_ID'/'$(BETA_APP_ID)'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM Beta'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format $(STAGING_DIR)
-	$(QUIET)$(RM_REC) STAGING
+uninstall:
+	$(QUIET)$(RM_REC) "$(DESTDIR)$(prefix)"
 
-.PHONY: webosrelease webosbeta
+package: install
+	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(DESTDIR)"
-- 
cgit v1.2.3


From 185337f6a5afc72deec54e11d3ff70d76463d9bf Mon Sep 17 00:00:00 2001
From: Bluddy
Date: Mon, 2 May 2011 14:45:53 +0300
Subject: PSP: fixed cursor disappearance bug in 16-bit games

The 5650 16-bit format doesn't include alpha bits and is treated as having alpha by the PSP hardware. Other formats such as 5551 don't have their alpha bit set in the cursor buffer. Instead of adding it, we just turn on the 'reverse alpha' feature for these bits. The problem was not making an exception for 5650.
---
 backends/platform/psp/cursor.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/psp/cursor.cpp b/backends/platform/psp/cursor.cpp
index cf879e095a..420b0398c3 100644
--- a/backends/platform/psp/cursor.cpp
+++ b/backends/platform/psp/cursor.cpp
@@ -327,8 +327,20 @@ inline void Cursor::setRendererModePalettized(bool palettized) {
 		_renderer.setAlphaReverse(false);
 		_renderer.setColorTest(false);
 	} else {			// 16 bits, no palette
+		// Color test is an easy way for the hardware to make our keycolor 
+		// transparent.
+		_renderer.setColorTest(true);	
+		
+		// Alpha blending is not strictly required, but makes the cursor look
+		// much better
 		_renderer.setAlphaBlending(true);
-		_renderer.setAlphaReverse(true); // We can't change all alpha values, so just reverse
-		_renderer.setColorTest(true);	// Color test to make our key color transparent
+		
+		// Pixel formats without alpha (5650) are considered to have their alpha set.
+		// Since pixel formats with alpha don't have their alpha bits set, we reverse
+		// the alpha format for them so that 0 alpha is 1.
+		if (_buffer.getPixelFormat() != PSPPixelFormat::Type_5650) 
+			_renderer.setAlphaReverse(true);
+		else
+			_renderer.setAlphaReverse(false);
 	}
 }
-- 
cgit v1.2.3


From 59e77ed66779d33a14a5f4d2a5885a70b793f36f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 2 May 2011 14:42:08 +0200
Subject: ALL: Mark printf and various other symbols as forbidden

Right now, a few places in the frontend code still use printf and
consorts. We mark the affected files with a FIXME for now, and
add a dedicated exception for each. To be fixed!

Also tweak FORBIDDEN_SYMBOL_REPLACEMENT to hopefully really always
enforce a compiler error
---
 backends/platform/sdl/posix/posix.cpp | 3 +++
 backends/platform/sdl/sdl.cpp         | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 71a88265a0..889bc5cd5e 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
+
 #include "common/scummsys.h"
 
 #ifdef UNIX
@@ -34,6 +36,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+
 OSystem_POSIX::OSystem_POSIX(Common::String baseConfigName)
 	:
 	_baseConfigName(baseConfigName) {
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 4694a061a3..bc27f8e954 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -23,6 +23,9 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
+
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-- 
cgit v1.2.3


From ea547ca3fd09ccc2dcdc6af7026b24b0e1966859 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Mon, 2 May 2011 18:41:04 +0200
Subject: ANDROID: Style fix

---
 backends/platform/android/org/inodes/gus/scummvm/ScummVM.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform')

diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
index 8bf40ac553..c4de6d62f8 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
@@ -35,7 +35,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
 
 	private String[] _args;
 
-	final private native void create(AssetManager _asset_manager,
+	final private native void create(AssetManager asset_manager,
 										EGL10 egl, EGLDisplay egl_display,
 										AudioTrack audio_track,
 										int sample_rate, int buffer_size);
-- 
cgit v1.2.3