From 40df14a7558728019e9755bce57ddd7fd0ab877e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 1 May 2011 14:43:36 +0300
Subject: RELEASE: Tag branch-1-3-0 and set version

---
 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..1146f2d3f3 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.3.0pre README
 ==============================================================================
 
 Installation
-- 
cgit v1.2.3


From e467468900144a2cd1c4df04e5b708a5d4f60172 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Sun, 1 May 2011 14:43:45 +0200
Subject: DC: Disable serial for release

---
 backends/platform/dc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index 11d9421a0a..9586572435 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -12,10 +12,10 @@ CC      = sh-elf-gcc -ml -m4-single-only
 CXX     = sh-elf-g++ -ml -m4-single-only
 LD      = $(CXX)
 CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
-DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR
+DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR -DNOSERIAL
 LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
 INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
-LIBS	= -L$(ronindir)/lib -lmad -lronin -lz -lm
+LIBS	= -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
 EXECUTABLE = scummvm.elf
 DEPDIR = .deps
 CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
-- 
cgit v1.2.3


From cf41ac0fec13c1191fd107bf25505713aa60afde Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sun, 1 May 2011 18:07:27 +0200
Subject: ANDROID: Disable the savegame parachute

Only on the stable branch, since this is unfinished and might wipe
savegames of the user.
---
 backends/platform/android/jni.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index f23d71b2a4..55c0ce6025 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -588,10 +588,12 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
 
 		g_engine->pauseEngine(value);
 
+#if 0
 		if (value &&
 				g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) &&
 				g_engine->canSaveGameStateCurrently())
 			g_engine->saveGameState(0, "Android parachute");
+#endif
 	}
 
 	pause = value;
-- 
cgit v1.2.3


From b2ed9a40f204e425863a03875f34e9e66bb9669a 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 7c840b0c5e69fa2ffb636afc26affb0f25d14cbb 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 16f0dcc00b96db001fad8c6a035576a72540d5dc Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 7 May 2011 20:08:29 +0200
Subject: ANDROID: Get rid of Fn->ALT metakey mapping

Thanks to Ge0rG for the analysis

Cherry-picked from bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
---
 backends/platform/android/events.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index 09466b4d2f..90f92790da 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -444,8 +444,12 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 
 		if (arg4 & JMETA_SHIFT)
 			e.kbd.flags |= Common::KBD_SHIFT;
-		if (arg4 & JMETA_ALT)
-			e.kbd.flags |= Common::KBD_ALT;
+		// JMETA_ALT is Fn on physical keyboards!
+		// when mapping this to ALT - as we know it from PC keyboards - all
+		// Fn combos will be broken (like Fn+q, which needs to end as 1 and
+		// not ALT+1). Do not want.
+		//if (arg4 & JMETA_ALT)
+		//	e.kbd.flags |= Common::KBD_ALT;
 		if (arg4 & (JMETA_SYM | JMETA_CTRL))
 			e.kbd.flags |= Common::KBD_CTRL;
 
-- 
cgit v1.2.3


From cfa4051e7aac14ef3465a4cfd6204412e002453a Mon Sep 17 00:00:00 2001
From: Klaus Reimer
Date: Sun, 8 May 2011 20:56:08 +0200
Subject: WEBOS: Splitted install directory from package directory.

---
 backends/platform/webos/webos.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk
index 2b145b00c9..37223ac56c 100644
--- a/backends/platform/webos/webos.mk
+++ b/backends/platform/webos/webos.mk
@@ -58,7 +58,8 @@ PATH_DIST = $(srcdir)/dists/webos
 PATH_MOJO = $(PATH_DIST)/mojo
 APP_ID = $(shell basename $(prefix))
 APP_VERSION = $(shell printf "%d.%d.%02d%02d" $(VER_MAJOR) $(VER_MINOR) $(VER_PATCH) $(VER_PACKAGE))
-DESTDIR ?= portdist
+DESTDIR ?= staging
+PORTDISTDIR ?= portdist
 
 install: all
 	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(prefix)"
@@ -87,5 +88,9 @@ endif
 uninstall:
 	$(QUIET)$(RM_REC) "$(DESTDIR)$(prefix)"
 
-package: install
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(DESTDIR)"
+package: uninstall install
+	$(QUIET)$(RM_REC) "$(PORTDISTDIR)"
+	$(QUIET)$(MKDIR) "$(PORTDISTDIR)"
+	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(PORTDISTDIR)"
+
+.PHONY: install uninstall package
-- 
cgit v1.2.3


From b23dfd72f123c7d98c5076d813e522834888588a Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Sat, 14 May 2011 23:01:08 -0400
Subject: IPHONE: Changed the iOS queued event handling to fix mouseclicks in
 Gob

We now delay the mouseup events for 50ms, rather than just delaying them for an additional couple of pollEvent (which doesn't work anymore due to changes in the eventhandling code elsewhere). This fixes #3018512.
---
 backends/platform/iphone/osys_events.cpp | 22 ++++++++--------------
 backends/platform/iphone/osys_main.cpp   |  6 +++---
 backends/platform/iphone/osys_main.h     |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index c30e34dd05..965334873e 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -31,6 +31,7 @@
 
 #include "osys_main.h"
 
+static const int kQueuedInputEventDelay = 50;
 
 bool OSystem_IPHONE::pollEvent(Common::Event &event) {
 	//printf("pollEvent()\n");
@@ -42,14 +43,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
 		_timerCallbackNext = curTime + _timerCallbackTimer;
 	}
 
-	if (_needEventRestPeriod) {
-		// Workaround: Some engines can't handle mouse-down and mouse-up events
-		// appearing right after each other, without a call returning no input in between.
-		_needEventRestPeriod = false;
-		return false;
-	}
-
-	if (_queuedInputEvent.type != (Common::EventType)0) {
+	if (_queuedInputEvent.type != (Common::EventType)0 && curTime >= _queuedEventTime) {
 		event = _queuedInputEvent;
 		_queuedInputEvent.type = (Common::EventType)0;
 		return true;
@@ -194,7 +188,7 @@ bool OSystem_IPHONE::handleEvent_mouseUp(Common::Event &event, int x, int y) {
 			_queuedInputEvent.mouse.x = _mouseX;
 			_queuedInputEvent.mouse.y = _mouseY;
 			_lastMouseTap = getMillis();
-			_needEventRestPeriod = true;
+			_queuedEventTime = _lastMouseTap + kQueuedInputEventDelay;
 		} else
 			return false;
 	}
@@ -235,7 +229,7 @@ bool OSystem_IPHONE::handleEvent_secondMouseUp(Common::Event &event, int x, int
 			event.kbd.flags = _queuedInputEvent.kbd.flags = 0;
 			event.kbd.keycode = _queuedInputEvent.kbd.keycode = Common::KEYCODE_ESCAPE;
 			event.kbd.ascii = _queuedInputEvent.kbd.ascii = Common::ASCII_ESCAPE;
-			_needEventRestPeriod = true;
+			_queuedEventTime = curTime + kQueuedInputEventDelay;
 			_lastSecondaryTap = 0;
 		} else if (!_mouseClickAndDragEnabled) {
 			//printf("Rightclick!\n");
@@ -246,7 +240,7 @@ bool OSystem_IPHONE::handleEvent_secondMouseUp(Common::Event &event, int x, int
 			_queuedInputEvent.mouse.x = _mouseX;
 			_queuedInputEvent.mouse.y = _mouseY;
 			_lastSecondaryTap = curTime;
-			_needEventRestPeriod = true;
+			_queuedEventTime = curTime + kQueuedInputEventDelay;
 		} else {
 			//printf("Right nothing!\n");
 			return false;
@@ -334,7 +328,7 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 			event.kbd.flags = _queuedInputEvent.kbd.flags = 0;
 			event.kbd.keycode = _queuedInputEvent.kbd.keycode = Common::KEYCODE_F5;
 			event.kbd.ascii = _queuedInputEvent.kbd.ascii = Common::ASCII_F5;
-			_needEventRestPeriod = true;
+			_queuedEventTime = getMillis() + kQueuedInputEventDelay;
 			return true;
 		}
 
@@ -463,7 +457,7 @@ void  OSystem_IPHONE::handleEvent_keyPressed(Common::Event &event, int keyPresse
 	event.kbd.flags = _queuedInputEvent.kbd.flags = 0;
 	event.kbd.keycode = _queuedInputEvent.kbd.keycode = (Common::KeyCode)keyPressed;
 	event.kbd.ascii = _queuedInputEvent.kbd.ascii = ascii;
-	_needEventRestPeriod = true;
+	_queuedEventTime = getMillis() + kQueuedInputEventDelay;
 }
 
 bool OSystem_IPHONE::handleEvent_swipe(Common::Event &event, int direction) {
@@ -530,7 +524,7 @@ bool OSystem_IPHONE::handleEvent_swipe(Common::Event &event, int direction) {
 	event.type = Common::EVENT_KEYDOWN;
 	_queuedInputEvent.type = Common::EVENT_KEYUP;
 	event.kbd.flags = _queuedInputEvent.kbd.flags = 0;
-	_needEventRestPeriod = true;
+	_queuedEventTime = getMillis() + kQueuedInputEventDelay;
 
 	return true;
 }
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 813adfbc43..d14d44caca 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -58,9 +58,9 @@ void *OSystem_IPHONE::s_soundParam = NULL;
 OSystem_IPHONE::OSystem_IPHONE() :
 	_savefile(NULL), _mixer(NULL), _timer(NULL), _offscreen(NULL),
 	_overlayVisible(false), _fullscreen(NULL),
-	_mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0),
-	_secondaryTapped(false), _lastSecondaryTap(0), _screenOrientation(kScreenOrientationFlippedLandscape),
-	_needEventRestPeriod(false), _mouseClickAndDragEnabled(false),
+	_mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0), _queuedEventTime(0),
+	_secondaryTapped(false), _lastSecondaryTap(0),
+	_screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false),
 	_gestureStartX(-1), _gestureStartY(-1), _fullScreenIsDirty(false), _fullScreenOverlayIsDirty(false),
 	_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0),
 	_overlayHeight(0), _overlayWidth(0), _overlayBuffer(0)
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 79f596632f..077cb51c1c 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -89,9 +89,9 @@ protected:
 	bool _mouseDirty;
 	long _lastMouseDown;
 	long _lastMouseTap;
+	long _queuedEventTime;
 	Common::Rect _lastDrawnMouseRect;
 	Common::Event _queuedInputEvent;
-	bool _needEventRestPeriod;
 	bool _secondaryTapped;
 	long _lastSecondaryDown;
 	long _lastSecondaryTap;
-- 
cgit v1.2.3


From a1f02c3f32fb0d6189bdc83aedfe597281afe9cd Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Sun, 15 May 2011 21:43:27 -0400
Subject: IPHONE: Fixed mouse position when the overlay is visible

---
 backends/platform/iphone/iphone_video.m | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m
index 821d3de634..4fdb820f70 100644
--- a/backends/platform/iphone/iphone_video.m
+++ b/backends/platform/iphone/iphone_video.m
@@ -178,13 +178,18 @@ const char* iPhone_getDocumentsDir() {
 }
 
 bool getLocalMouseCoords(CGPoint *point) {
-	if (point->x < _screenRect.origin.x || point->x >= _screenRect.origin.x + _screenRect.size.width ||
-		point->y < _screenRect.origin.y || point->y >= _screenRect.origin.y + _screenRect.size.height) {
-			return false;
-	}
+	if (_overlayIsEnabled) {
+		point->x = point->x / _overlayHeight;
+		point->y = point->y / _overlayWidth;
+	} else {
+		if (point->x < _screenRect.origin.x || point->x >= _screenRect.origin.x + _screenRect.size.width ||
+			point->y < _screenRect.origin.y || point->y >= _screenRect.origin.y + _screenRect.size.height) {
+				return false;
+		}
 
-	point->x = (point->x - _screenRect.origin.x) / _screenRect.size.width;
-	point->y = (point->y - _screenRect.origin.y) / _screenRect.size.height;
+		point->x = (point->x - _screenRect.origin.x) / _screenRect.size.width;
+		point->y = (point->y - _screenRect.origin.y) / _screenRect.size.height;
+	}
 
 	return true;
 }
-- 
cgit v1.2.3


From 6fdec4dfac164fd131c4e36a67a789b4b17878a7 Mon Sep 17 00:00:00 2001
From: agent-q
Date: Sat, 21 May 2011 15:51:13 +0100
Subject: DS: Various changes - Enable libmad - Remove forced include of
 scummsys.h, it caused problems in the forbidden symbols code.

---
 backends/platform/ds/arm9/makefile          | 6 +++---
 backends/platform/ds/arm9/source/dsmain.cpp | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 781738265c..62473bca6c 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -75,7 +75,7 @@ else
 			ifdef DS_BUILD_K
 
 			else
-		#		USE_MAD = 1
+				USE_MAD = 1
 			endif
 		endif
 	endif
@@ -245,7 +245,7 @@ ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
 
-DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU -DNDEBUG
 
 LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
 
@@ -259,7 +259,7 @@ BACKEND := ds
 INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \
 			-I$(portdir)/data -I$(portdir)/../commoninclude \
 			-I$(portdir)/source -I$(portdir)/source/mad \
-			-I$(libndsdir)/include -include $(srcdir)/common/scummsys.h
+			-I$(libndsdir)/include -include $(portdir)/source/portdefs.h
 
 
 LIBS	= -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 303e504873..b94b433373 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -579,7 +579,7 @@ void initGame() {
 		for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) {
 			if (!stricmp(gameName, gameList[r].gameId)) {
 				s_currentGame = &gameList[r];
-	//			consolePrintf("Game list num: %d\n", s_currentGame);
+	//			consolePrintf("Game list num: %d\n", r);
 			}
 		}
 	}
@@ -1672,8 +1672,7 @@ void addEventsToQueue() {
 
 
 		if (!keyboardEnable) {
-
-			if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
+			if ((!isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
 				// Controls specific to the control method
 
 				if (s_currentGame->control == CONT_SKY) {
-- 
cgit v1.2.3


From 96519ad939fab21d07727662aa28a059a3c1d510 Mon Sep 17 00:00:00 2001
From: Max Lingua
Date: Tue, 24 May 2011 11:44:59 -0400
Subject: PS2 backend: Modified and tidied up Makefiles for 1.3.0 release

---
 backends/platform/ps2/Makefile.gdb | 102 +++++++++++++++++++++----------------
 backends/platform/ps2/Makefile.ps2 |  62 +++++++++++++---------
 2 files changed, 95 insertions(+), 69 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/ps2/Makefile.gdb b/backends/platform/ps2/Makefile.gdb
index 48dcebc1d4..456fc5b744 100644
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@ -1,7 +1,7 @@
 # $Header: Exp $
  include $(PS2SDK)/Defs.make
 
-PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports
+PS2_EXTRA = /works/devel/ps2/sdk-extra
 PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 
@@ -9,31 +9,44 @@ ENABLED=STATIC_PLUGIN
 
 ENABLE_SCUMM = $(ENABLED)
 ENABLE_SCUMM_7_8 = $(ENABLED)
-#ENABLE_HE = $(ENABLED)
-#ENABLE_AGI = $(ENABLED)
-#ENABLE_AGOS = $(ENABLED)
-#ENABLE_CINE = $(ENABLED)
-#ENABLE_CRUISE = $(ENABLED)
-#ENABLE_DRASCULA = $(ENABLED)
-#ENABLE_GOB = $(ENABLED)
-#ENABLE_KYRA = $(ENABLED)
-#ENABLE_LURE = $(ENABLED)
- # ENABLE_M4 = $(ENABLED)
-#ENABLE_MADE = $(ENABLED)
-#ENABLE_PARALLACTION = $(ENABLED)
-#ENABLE_QUEEN = $(ENABLED)
-#ENABLE_SAGA = $(ENABLED)
-#ENABLE_SAGA2 = $(ENABLED)
-#ENABLE_IHNM = $(ENABLED)
-#ENABLE_SKY = $(ENABLED)
-#ENABLE_SWORD1 = $(ENABLED)
-#ENABLE_SWORD2 = $(ENABLED)
- # ENABLE_TINSEL = $(ENABLED)
-#ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_HE = $(ENABLED)
+# ENABLE_AGI = $(ENABLED)
+# ENABLE_AGOS = $(ENABLED)
+# ENABLE_AGOS2 = $(ENABLED)
+# ENABLE_CINE = $(ENABLED)
+# ENABLE_CRUISE = $(ENABLED)
+# ENABLE_DRACI = $(ENABLED)
+# ENABLE_DRASCULA = $(ENABLED)
+# ENABLE_GOB = $(ENABLED)
+# ENABLE_GROOVIE = $(ENABLED)
+## ENABLE_GROOVIE2 = $(ENABLED)
+# ENABLE_HUGO = $(ENABLED)
+# ENABLE_IHNM = $(ENABLED)
+# ENABLE_KYRA = $(ENABLED)
+## ENABLE_LOL = $(ENABLED)
+# ENABLE_LURE = $(ENABLED)
+## ENABLE_M4 = $(ENABLED)
+# ENABLE_MADE = $(ENABLED)
+# ENABLE_MOHAWK = $(ENABLED)
+# ENABLE_PARALLACTION = $(ENABLED)
+# ENABLE_QUEEN = $(ENABLED)
+# ENABLE_SAGA = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+# ENABLE_SCI = $(ENABLED)
+## ENABLE_SCI32 = $(ENABLED)
+# ENABLE_SKY = $(ENABLED)
+# ENABLE_SWORD1 = $(ENABLED)
+# ENABLE_SWORD2 = $(ENABLED)
+# ENABLE_TEENAGENT = $(ENABLED)
+# ENABLE_TINSEL = $(ENABLED)
+# ENABLE_TOON = $(ENABLED)
+# ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_TUCKER = $(ENABLED)
+
 
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,35 +61,34 @@ VPATH = $(srcdir)
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
-
+DEFINES  = -DRELEASE_BUILD -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
 
-INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
+INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
-TARGET = elf/scummvm.elf
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+TARGET = elf/scummvm.elf
 
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
+    
 MODULE_DIRS += .
 
-BACKEND := ps2
-
 include $(srcdir)/Makefile.common
 
 LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index 472ba5ec3a..3b807919b0 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -12,28 +12,41 @@ ENABLE_SCUMM_7_8 = $(ENABLED)
 ENABLE_HE = $(ENABLED)
 ENABLE_AGI = $(ENABLED)
 ENABLE_AGOS = $(ENABLED)
+ENABLE_AGOS2 = $(ENABLED)
 ENABLE_CINE = $(ENABLED)
 ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRACI = $(ENABLED)
 ENABLE_DRASCULA = $(ENABLED)
 ENABLE_GOB = $(ENABLED)
+ENABLE_GROOVIE = $(ENABLED)
+# ENABLE_GROOVIE2 = $(ENABLED)
+ENABLE_HUGO = $(ENABLED)
+ENABLE_IHNM = $(ENABLED)
 ENABLE_KYRA = $(ENABLED)
+# ENABLE_LOL = $(ENABLED)
 ENABLE_LURE = $(ENABLED)
 # ENABLE_M4 = $(ENABLED)
 ENABLE_MADE = $(ENABLED)
+ENABLE_MOHAWK = $(ENABLED)
 ENABLE_PARALLACTION = $(ENABLED)
 ENABLE_QUEEN = $(ENABLED)
 ENABLE_SAGA = $(ENABLED)
-ENABLE_SAGA2 = $(ENABLED)
-ENABLE_IHNM = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+ENABLE_SCI = $(ENABLED)
+# ENABLE_SCI32 = $(ENABLED)
 ENABLE_SKY = $(ENABLED)
 ENABLE_SWORD1 = $(ENABLED)
 ENABLE_SWORD2 = $(ENABLED)
-# ENABLE_TINSEL = $(ENABLED)
+ENABLE_TEENAGENT = $(ENABLED)
+ENABLE_TINSEL = $(ENABLED)
+ENABLE_TOON = $(ENABLED)
 ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TUCKER = $(ENABLED)
+
 
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,31 +61,32 @@ VPATH = $(srcdir)
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
+DEFINES  = -DRELEASE_BUILD -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
 
-
-INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
+INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
-TARGET = elf/scummvm.elf
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+TARGET = elf/scummvm.elf
 
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
+    
 MODULE_DIRS += .
 
 BACKEND := ps2
-- 
cgit v1.2.3


From 48b4c6c9233b05843a16504064adbe5fd6f4c57c Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Tue, 24 May 2011 20:32:08 +0200
Subject: SAMSUNGTV: Update port

This combines the following Samsung TV port updates from master:

944e0be209f5ab47c3b903f258d2d41b990d80cb
dc1d07774fc8ab0554047115d319ef8c0a2c3f63

It also includes the parts touching this backend of:

69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e
2fa63ca01586c4e5fda8eb12dca444d47a2375f1
---
 backends/platform/samsungtv/main.cpp      |  9 ++++---
 backends/platform/samsungtv/samsungtv.cpp | 39 +++++++++++--------------------
 backends/platform/samsungtv/samsungtv.h   | 13 +++++------
 backends/platform/sdl/main.cpp            |  1 +
 backends/platform/sdl/posix/posix.cpp     |  3 +++
 5 files changed, 27 insertions(+), 38 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp
index 3beb97165f..4f3291613d 100644
--- a/backends/platform/samsungtv/main.cpp
+++ b/backends/platform/samsungtv/main.cpp
@@ -18,11 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
+
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "base/main.h"
@@ -39,7 +38,7 @@ extern "C" int Game_Main(char *path, char *) {
 	assert(g_system);
 
 	// Pre initialize the backend
-	((OSystem_SDL_SamsungTV *)g_system)->init();
+	((OSystem_POSIX *)g_system)->init();
 
 #ifdef DYNAMIC_MODULES
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
@@ -49,7 +48,7 @@ extern "C" int Game_Main(char *path, char *) {
 	int res = scummvm_main(0, 0);
 
 	// Free OSystem
-	delete g_system;
+	delete (OSystem_SDL_SamsungTV *)g_system;
 
 	return res;
 }
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index 4d6dca7403..1b978d0121 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -18,25 +18,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
+#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
 
 #if defined(SAMSUNGTV)
 
 OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
 	:
-	OSystem_POSIX("/dtv/usb/sda1/.scummvmrc") {
-}
-
-bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
-	return
-		(f == OSystem::kFeatureAspectRatioCorrection) ||
-		(f == OSystem::kFeatureCursorHasPalette);
+	OSystem_POSIX("/mtd_rwarea/.scummvmrc") {
 }
 
 void OSystem_SDL_SamsungTV::initBackend() {
@@ -44,27 +36,22 @@ void OSystem_SDL_SamsungTV::initBackend() {
 	if (_eventSource == 0)
 		_eventSource = new SamsungTVSdlEventSource();
 
+	if (_graphicsManager == 0)
+		_graphicsManager = new SamsungTVSdlGraphicsManager(_eventSource);
+
 	// Call parent implementation of this method
-	OSystem_SDL::initBackend();
+	OSystem_POSIX::initBackend();
 }
 
-void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) {
-	switch (f) {
-	case OSystem::kFeatureAspectRatioCorrection:
-		_graphicsManager->setFeatureState(f, enable);
-		break;
-	default:
-		break;
-	}
+void OSystem_SDL_SamsungTV::quit() {
+	delete this;
 }
 
-bool OSystem_SDL_SamsungTV::getFeatureState(Feature f) {
-	switch (f) {
-	case OSystem::kFeatureAspectRatioCorrection:
-		return _graphicsManager->getFeatureState(f);
-	default:
-		return false;
-	}
+void OSystem_SDL_SamsungTV::fatalError() {
+	delete this;
+	// FIXME
+	warning("fatal error");
+	for (;;) {}
 }
 
 #endif
diff --git a/backends/platform/samsungtv/samsungtv.h b/backends/platform/samsungtv/samsungtv.h
index bccb6baee9..b7a78a96cd 100644
--- a/backends/platform/samsungtv/samsungtv.h
+++ b/backends/platform/samsungtv/samsungtv.h
@@ -18,14 +18,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef PLATFORM_SDL_SAMSUNGTV_H
 #define PLATFORM_SDL_SAMSUNGTV_H
 
+#if defined(SAMSUNGTV)
+
 #include "backends/platform/sdl/posix/posix.h"
 
 class OSystem_SDL_SamsungTV : public OSystem_POSIX {
@@ -33,10 +32,10 @@ public:
 	OSystem_SDL_SamsungTV();
 
 	virtual void initBackend();
-
-	virtual bool hasFeature(Feature f);
-	virtual void setFeatureState(Feature f, bool enable);
-	virtual bool getFeatureState(Feature f);
+	virtual void quit();
+	virtual void fatalError();
 };
 
 #endif
+
+#endif
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index 14cfaaee57..871fb2c531 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -36,6 +36,7 @@
     !defined(DINGUX) && \
     !defined(CAANOO) && \
     !defined(LINUXMOTO) && \
+    !defined(SAMSUNGTV) && \
     !defined(OPENPANDORA)
 
 #include "backends/platform/sdl/sdl.h"
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 71a88265a0..e15c09fec7 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -81,6 +81,9 @@ Common::WriteStream *OSystem_POSIX::createLogFile() {
 #else
 	logFile += "/.scummvm";
 #endif
+#ifdef SAMSUNGTV
+	logFile = "/mtd_ram";
+#endif
 
 	struct stat sb;
 
-- 
cgit v1.2.3


From 725db142bc4b16c930e46e03394611d7a625bbaa Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 24 May 2011 20:58:36 +0200
Subject: SAMSUNGTV: Fix build on non-SDL platforms

---
 backends/platform/samsungtv/main.cpp      | 6 ++++--
 backends/platform/samsungtv/samsungtv.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp
index 4f3291613d..8274bb00a2 100644
--- a/backends/platform/samsungtv/main.cpp
+++ b/backends/platform/samsungtv/main.cpp
@@ -22,12 +22,14 @@
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
+#include "common/scummsys.h"
+
+#if defined(SAMSUNGTV)
+
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "base/main.h"
 
-#if defined(SAMSUNGTV)
-
 #include <unistd.h>
 
 extern "C" int Game_Main(char *path, char *) {
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index 1b978d0121..ca97565185 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -20,12 +20,14 @@
  *
  */
 
+#include "common/scummsys.h"
+
+#if defined(SAMSUNGTV)
+
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
 #include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
 
-#if defined(SAMSUNGTV)
-
 OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
 	:
 	OSystem_POSIX("/mtd_rwarea/.scummvmrc") {
-- 
cgit v1.2.3


From 709f0de5c5910e0326ae6e45804526b5c9a9102d Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Tue, 24 May 2011 21:32:24 +0200
Subject: SAMSUNGTV: Fix build

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

(limited to 'backends/platform')

diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index ca97565185..9718eed1fe 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -27,6 +27,7 @@
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
 #include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
+#include "common/textconsole.h"
 
 OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
 	:
-- 
cgit v1.2.3


From 23958893722f4a99da89465dc53b84921fe2c727 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Wed, 25 May 2011 06:49:59 +0800
Subject: WINCE: Update port specific readme

---
 backends/platform/wince/README-WinCE.txt | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/wince/README-WinCE.txt b/backends/platform/wince/README-WinCE.txt
index 69abd66e69..6d3c66fda8 100644
--- a/backends/platform/wince/README-WinCE.txt
+++ b/backends/platform/wince/README-WinCE.txt
@@ -1,15 +1,25 @@
 ScummVM Windows CE FAQ
-Last updated: $Date$
-Release version: 1.1.0
+Last updated: 2011-05-25
+Release version: 1.3.0
 ------------------------------------------------------------------------
 
 New in this version
 -------------------
 
-1.1.1
+1.3.0:
+This is the first official Windows CE release since 1.1.1, there are no other
+port specific changes.
+
+1.2.1:
+(Note: No official 1.2.1 release)
+
+1.2.0:
+(Note: No official 1.2.0 release)
+
+1.1.1:
 Fix to the Normal2xAspect scaler that was causing crashes.
 
-1.1.0
+1.1.0:
 The TeenAgent engine is now included, but there are no other port specific
 changes since 1.0.0.
 
-- 
cgit v1.2.3


From 625f6d3b0e04add1694be14eb44ee9aa3bd71fd8 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Fri, 27 May 2011 22:14:04 +0200
Subject: WINCE: Update of port-related README

---
 backends/platform/wince/README-WinCE.txt | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/wince/README-WinCE.txt b/backends/platform/wince/README-WinCE.txt
index 6d3c66fda8..c48d9ca998 100644
--- a/backends/platform/wince/README-WinCE.txt
+++ b/backends/platform/wince/README-WinCE.txt
@@ -1,5 +1,5 @@
 ScummVM Windows CE FAQ
-Last updated: 2011-05-25
+Last updated: 2011-05-27
 Release version: 1.3.0
 ------------------------------------------------------------------------
 
@@ -7,8 +7,32 @@ New in this version
 -------------------
 
 1.3.0:
-This is the first official Windows CE release since 1.1.1, there are no other
-port specific changes.
+This is the first official Windows CE release since 1.1.1.
+
+The following new engines are now included (changes since last WinCE release):
+ - Draci Engine (Dragon History)
+ - Hugo Engine (Hugo Trilogy)
+ - Mohawk Engine (Myst, Riven, Living Book games & Where in Time is Carmen
+   Sandiego?)
+ - SCI Engine (Sierra SCI games, see main README for a list of supported games)
+ - Toon Engine (Toonstruck)
+
+Also, there are now 4 binaries in this distribution, a single executable
+which contains all engines (for devices with enough memory) and 3 smaller
+binaries which contain only some of the engines. The following lists all
+executables and the engines they contain:
+
+scummvm.exe:
+ - all supported engines
+scummvm1.exe:
+ - scumm, agi, cruise, draci, lure, queen, sky, sword1, tinsel, touche
+scummvm2.exe:
+ - agos, cine, drascula, gob, groovie, kyra, made, parallaction, saga,
+   teenagent, tucker
+scummvm3.exe:
+ - hugo, mohawk, sci, sword2, toon
+
+There are no other port specific changes.
 
 1.2.1:
 (Note: No official 1.2.1 release)
-- 
cgit v1.2.3