Merge pull request #86 from tsoliman/maemo-master-rebased-2

MAEMO: New version of the port
This commit is contained in:
Eugene Sandulenko committed 2011-09-23 08:51:58 -07:00
commit 1ad388127a
20 files changed
+843 -1378

No files matched your search

@@ -0,0 +1,123 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MAEMO)
#include "common/scummsys.h"
#include "backends/events/maemosdl/maemosdl-events.h"
#include "common/translation.h"
MaemoSdlEventSource::MaemoSdlEventSource() : SdlEventSource(), _clickEnabled(true) {
}
bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
// List of special N810 keys:
// SDLK_F4 -> menu
// SDLK_F5 -> home
// SDLK_F6 -> fullscreen
// SDLK_F7 -> zoom +
// SDLK_F8 -> zoom -
switch (ev.type) {
case SDL_KEYDOWN:{
if (ev.key.keysym.sym == SDLK_F4) {
event.type = Common::EVENT_MAINMENU;
return true;
} else if (ev.key.keysym.sym == SDLK_F6) {
// handled in keyup
} else if (ev.key.keysym.sym == SDLK_F7) {
event.type = Common::EVENT_RBUTTONDOWN;
processMouseEvent(event, _km.x, _km.y);
return true;
} else if (ev.key.keysym.sym == SDLK_F8) {
if (ev.key.keysym.mod & KMOD_CTRL) {
event.type = Common::EVENT_KEYDOWN;
event.kbd.keycode = Common::KEYCODE_F7;
event.kbd.ascii = Common::ASCII_F7;
event.kbd.flags = 0;
return true;
} else {
// handled in keyup
return true;
}
}
break;
}
case SDL_KEYUP: {
if (ev.key.keysym.sym == SDLK_F4) {
event.type = Common::EVENT_MAINMENU;
return true;
} else if (ev.key.keysym.sym == SDLK_F6) {
bool currentState = ((OSystem_SDL *)g_system)->getGraphicsManager()->getFeatureState(OSystem::kFeatureFullscreenMode);
g_system->beginGFXTransaction();
((OSystem_SDL *)g_system)->getGraphicsManager()->setFeatureState(OSystem::kFeatureFullscreenMode, !currentState);
g_system->endGFXTransaction();
return true;
} else if (ev.key.keysym.sym == SDLK_F7) {
event.type = Common::EVENT_RBUTTONUP;
processMouseEvent(event, _km.x, _km.y);
return true;
} else if (ev.key.keysym.sym == SDLK_F8) {
if (ev.key.keysym.mod & KMOD_CTRL) {
event.type = Common::EVENT_KEYUP;
event.kbd.keycode = Common::KEYCODE_F7;
event.kbd.ascii = Common::ASCII_F7;
event.kbd.flags = 0;
return true;
} else {
_clickEnabled = !_clickEnabled;
((SurfaceSdlGraphicsManager*) _graphicsManager)->displayMessageOnOSD(
_clickEnabled ? _("Clicking Enabled") : _("Clicking Disabled"));
return true;
}
}
break;
}
}
// Invoke parent implementation of this method
return SdlEventSource::remapKey(ev, event);
}
bool MaemoSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT && !_clickEnabled) {
return false;
}
// Invoke parent implementation of this method
return SdlEventSource::handleMouseButtonDown(ev, event);
}
bool MaemoSdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT && !_clickEnabled) {
return false;
}
// Invoke parent implementation of this method
return SdlEventSource::handleMouseButtonUp(ev, event);
}
#endif
@@ -0,0 +1,48 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MAEMO)
#if !defined(BACKEND_EVENTS_SDL_MAEMO_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
#define BACKEND_EVENTS_SDL_MAEMO_H
#include "backends/events/sdl/sdl-events.h"
#include "backends/platform/sdl/sdl.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
/**
* SDL events manager for Maemo
*/
class MaemoSdlEventSource : public SdlEventSource {
public:
MaemoSdlEventSource();
protected:
virtual bool remapKey(SDL_Event &ev, Common::Event &event);
virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
bool _clickEnabled;
};
#endif
#endif
+5
View File
@@ -147,6 +147,11 @@ MODULE_OBJS += \
graphics/linuxmotosdl/linuxmotosdl-graphics.o
endif
ifeq ($(BACKEND),maemo)
MODULE_OBJS += \
events/maemosdl/maemosdl-events.o
endif
ifeq ($(BACKEND),n64)
MODULE_OBJS += \
fs/n64/n64-fs.o \
+227
View File
@@ -0,0 +1,227 @@
scummvm (1.4.0~git) unstable; urgency=low
* Non-maintainer upload.
-- Tarek Soliman <tarek@bashasoliman.com> Wed, 29 Jun 2011 16:41:09 -0500
scummvm (1.2.1~pre) unstable; urgency=low
* 1.2.1 testing release
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 8 Dec 2010 21:43:29 +0100
scummvm (1.2.0~pre) unstable; urgency=low
* 1.2.0 testing release
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 8 Oct 2010 21:38:12 +0200
scummvm (1.1.0~pre) unstable; urgency=low
* 1.1.0 testing release
* cleanup for N900 (new firmwares need less hacks)
* unified binary for all devices now have datafiles included (~2MB)
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 24 Mar 2010 01:48:05 +0100
scummvm (1.0.0-4) unstable; urgency=low
* datadir optified (/usr/share/scummvm -> /opt/scummvm/share)
* added engine files to datadir
* Application Manager icon enlarged to 48x48
-- Frantisek Dufka <dufkaf@seznam.cz> Thu, 17 Dec 2009 13:54:51 +0100
scummvm (1.0.0-3) unstable; urgency=low
* disable taskmanager topleft button in fullscreen mode (N900)
* map shift+click to right button click
* mam ctrl+click to mouse move (no click)
* set fullscreen window as _HILDON_NON_COMPOSITED_WINDOW (N900)
-- Frantisek Dufka <dufkaf@seznam.cz> Tue, 15 Dec 2009 23:12:51 +0100
scummvm (1.0.0-2) unstable; urgency=low
* grab N900 volume keys
* map Shift+Backspace to Escape key, shift+enter to Menu key (N900)
* optified = main binary moved to /opt/scummvm/bin/scummvm
-- Frantisek Dufka <dufkaf@seznam.cz> Sat, 12 Dec 2009 23:39:04 +0100
scummvm (1.0.0-1) unstable; urgency=low
* -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp breaks Gobliins, reverted
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 2 Dec 2009 10:25:11 +0100
scummvm (1.0.0) unstable; urgency=low
* upstream 1.0 release
* Initial support for N900
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 6 Nov 2009 22:02:25 +0100
scummvm (1.0.0~rc1-3) unstable; urgency=low
* updated to 1.0 branch revision 43999 to fix bugs (Cruise pause, ..)
* Cruise for Corpse mapping added to zoom+ for N800/770
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 7 Sep 2009 09:03:13 +0200
scummvm (1.0.0~rc1-2) unstable; urgency=low
* Cruise for Corpse key bindings added
- menu key for menu, zoom-=right click, zoom+=context menu
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 2 Sep 2009 23:03:59 +0200
scummvm (1.0.0~rc1-1) unstable; urgency=low
* Discworld key bindings added - menu key for menu, zoom-=right click, zoom+=Enter/y key
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 2 Sep 2009 09:53:08 +0200
scummvm (1.0.0~rc1) unstable; urgency=low
* upstream 1.0.0rc1 release
-- Frantisek Dufka <dufkaf@seznam.cz> Thu, 20 Aug 2009 23:33:59 +0200
scummvm (0.13.1) unstable; urgency=low
* upstream 0.13.1 release
-- Frantisek Dufka <dufkaf@seznam.cz> Sat, 18 Apr 2009 22:40:42 +0200
scummvm (0.13.0-2) unstable; urgency=low
* dbus_service.patch is incomplete - needs also install line in debian/rules
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 27 Feb 2009 20:37:29 +0100
scummvm (0.13.0-1) unstable; urgency=low
* fix crash in task switcher caption code when .scummvmrc had fullscreen value set
* enabled also dbus_service.patch for home key switching back (not needed in OS < 2008)
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 27 Feb 2009 09:29:01 +0100
scummvm (0.13.0) unstable; urgency=low
* upstream 0.13.0 release
* Feeble Files mapping
* task switcher item name patch from mikkov
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 18 Feb 2009 21:52:33 +0100
scummvm (0.11.99-4) unstable; urgency=low
* Maemo extras-devel test version
- maemo-taskswitcher.patch: title shown right from the beginning
and title not fixed to "ScummVM" only
- dbus_service.patch: modify scummvm.desktop, scummvm.wrapper and
scummvm.service to make switching application automatically back
via second home key long press to work
-- Mikko Vartiainen <mvartiainen@gmail.com> Thu, 03 Jan 2009 01:59:52 +0200
scummvm (0.11.99-3) unstable; urgency=low
* Maemo extras-devel test version
- maemo-taskswitcher.patch
-- Mikko Vartiainen <mvartiainen@gmail.com> Thu, 01 Jan 2009 13:13:13 +0200
scummvm (0.11.99-2) unstable; urgency=low
* Maemo extras-devel test version
- keeping version below 0.12.0
- not in user/ category
-- Mikko Vartiainen <mvartiainen@gmail.com> Thu, 01 Jan 2009 02:04:14 +0200
scummvm (0.12.0) unstable; urgency=low
* upstream 0.12.0 release
* update description
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 25 Aug 2008 21:47:41 +0200
scummvm (0.11.99) unstable; urgency=low
* upstream 0.12.0 testing pre-release
* big icons added for OS2008 menu
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 22 Aug 2008 08:20:48 +0200
scummvm (0.11.1) unstable; urgency=low
* upstream 0.11.1 release
* mapping for N810: zoom+ = menu for all games (except FW)
-- Frantisek Dufka <dufkaf@seznam.cz> Sat, 23 Feb 2008 20:41:37 +0100
scummvm (0.11.0-2) unstable; urgency=low
* mapping for N800/770: zoom+ = y, zoom- = 1 (all games except FW)
this fixes save dialog in BS1 and also allows to exit some games via 'y'
* mapping for N810: zoom- = rightclick for all games
* updated to revision 30849 from 0.11 branch (some bugfixes for 0.11.1)
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 11 Feb 2008 22:22:48 +0100
scummvm (0.11.0-1) unstable; urgency=low
* theme files added back
* SWORD2,SAGA - added zoom keys =1/2 for saved games
* different mapping for N810 rightclick=zoom-,menu=zoom+ (currently only in LURE)
* added NEWS README COPYRIGHT do doc dir as per scummvm project guidelines
-- Frantisek Dufka <dufkaf@seznam.cz> Sun, 13 Jan 2008 22:58:41 +0100
scummvm (0.11.0-0) unstable; urgency=low
* upstream 0.11 release
-- Frantisek Dufka <dufkaf@seznam.cz> Sat, 12 Jan 2008 22:26:34 +0100
scummvm (0.10.0-5) unstable; urgency=low
* fixed for chinook, menu selection postinst script added
-- Frantisek Dufka <dufkaf@seznam.cz> Thu, 25 Oct 2007 09:56:32 +0200
scummvm (0.10.0-4) unstable; urgency=low
* AGI - added pred.dic to DATA_PATH (=/usr/share/scummvm) to enable
predictive input
-- Frantisek Dufka <dufkaf@seznam.cz> Tue, 28 Aug 2007 09:58:29 +0200
scummvm (0.10.0-3) unstable; urgency=low
* SCUMM - added mapping also for key up events (may fix right button in FT?)
* SWORD2 - added right button press mapping (not tested)
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 20 Aug 2007 22:39:07 +0200
scummvm (0.10.0-2) unstable; urgency=low
* Future Wars - add mapping for left/up/down/right,zoom +/-
* fix SDL backend to set mouse position on button down event
as we may not have mousemove events with touchscreen
-- Frantisek Dufka <dufkaf@seznam.cz> Fri, 13 Jul 2007 09:56:37 +0200
scummvm (0.10.0-1) unstable; urgency=low
* mapped F10 in Future Wars to menu key
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 11 Jul 2007 22:20:00 +0200
scummvm (0.10.0) unstable; urgency=low
* upstream 0.10 release, enabled FLAC too
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 4 Jul 2007 12:48:48 +0200
scummvm (0.9.1-1) unstable; urgency=low
* 0.9.1 mapped right mouse button in sword1
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 18 Jun 2007 21:15:31 +0200
scummvm (0.9.1) unstable; urgency=low
* 0.9.1 upstream release
-- Frantisek Dufka <dufkaf@seznam.cz> Wed, 1 Nov 2006 20:40:51 +0100
scummvm (0.9.0-3) unstable; urgency=low
* merged fixes in 0.9.0 upstream branch
-- Frantisek Dufka <dufkaf@seznam.cz> Mon, 9 Oct 2006 15:40:59 +0200
scummvm (0.9.0-2) unstable; urgency=low
* merged fixes in 0.9.0 upstream branch
-- Frantisek Dufka <dufkaf@seznam.cz> Sat, 12 Aug 2006 20:10:47 +0200
scummvm (0.9.0-1) unstable; urgency=low
* merged changes in 0.9.0 upstream release
-- Frantisek Dufka <dufkaf@seznam.cz> Sun, 23 Jul 2006 22:29:51 +0200
scummvm (0.9.0) unstable; urgency=low
* 0.9.0 upstream release
-- Frantisek Dufka <dufkaf@seznam.cz> Tue, 27 Jun 2006 20:30:54 +0200
+1
View File
@@ -0,0 +1 @@
4
+51
View File
@@ -0,0 +1,51 @@
Source: scummvm
Section: user/games
Priority: optional
Maintainer: Frantisek Dufka <dufkaf@seznam.cz>
Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbisidec-dev, libmpeg2-4-dev, libflac-dev (>= 1.1.2), libz-dev, quilt
Standards-Version: 3.6.1.1
Package: scummvm
Depends: ${shlibs:Depends}
Architecture: i386 armel
Section: user/games
Description: interpreter that will play graphic adventure games
written for LucasArts' SCUMM virtual machine, Sierra's AGI adventures,
Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files,
Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2,
Interactive Binary Illusions' Flight of the Amazon Queen,
Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth,
Westwood's Legend of Kyrandia, and various others.
This package does not contain any actual games.
XBS-Maemo-Icon-26:
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAC/VBMVEUICwcH
CQUKDAgLDQoMDwsOEAwREAUPEQ0QEg8PFQoRExAUEwoVFAwPGAcTFBIRFg0W
FQ0XFg4RGgkTGA8XGQsTGwwUHA0aGRIWGxMXHQkVHQ8aGhMbGxQcHQocGxUZ
HwsYIgcfHxgeIRUbJQwhIBofJAweJwgfKQocKwwgKgshKw0gLggfLg8jLQ8n
LwwpLhEmMwcoMRQjNgotLCYmNwQlNwwqOBQtOQgsOQ8xNh4sPQswNyQqQAUw
PAsuOiAsQgcwOyIqRgIsSAQvRgs0PyY1Rg06RA0+PDAwSwg2RxUzTQE4TQsz
VAc/SSo6VAk4VwE6VRM2XAVAUC85XwlJVCNEXQo+YwJGXwxMWS1JXC5AagBI
awJUagRIcQBSbwpHeAJTaD9OdwNXcwJKewZNfABacRlOfQBPfgBQfwBMggBW
fgBNgwNSgQJOhAVecUJjdSZefwNUiABZhgBjeDZieDxhezFQjQBgghZkhQ5j
iQJUkAZcixJmgDZnhCtckQpblgBekw5clwBqgkthlQBdmAJriz90hz5omgBs
mAhxlgd0mAB5lgBpnA16khdzmAtxnABooQBtnwB4jUpzngBkpQR5nQF8j0Vr
pQduoRZ4nRR3k014oQBzpAt8oAh/ogBvqA5trACBmypwqRF1pw+GogCAow+D
pQB8phJ/nUNurxh0rRd4rwmHqQd6qDOArwCJqwyDsgCMrgB8ryiFtAB7uQN8
sDKBuAWOsBWJqFR8ti2IsiOSswaBuRt6vxCOtgqXsgePrjR9wQCFuw2KuQyB
uSeSuACEux6JuR2OvACAxACEvCuSuhOHujSMwQGTtiqfuACRvwGOvRWHuz2T
wASPwwmYvwaLvTebuxiWvhmSwBqZwAmNu0aevgiKvkCVviaMvE6bwQycuTid
vhylvQyZwB2cwg+QywCawR6fwB+bwyGI0gaewCudxCOjwyOT1ACmwjiX0g+j
xTqmxzOd1gCV0i6kyyuoyTah1Sif2h6tzjukzF+pz1uq1Eeg2Uml3U1kaLAB
AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAHrSURBVCjPY2BAAC5ubkFB
BkzAzggDfKgSUFEmKCmOIsPvktA0aVpbSYQ+FwsjkwpMBsi2m/X7z89v3759
+ngg1UqIlZEVponJYcW/rw9unH/04u2bc0vbo+WZWGCahEv/fj+6Yc2SZfv3
b5w6+eACHVYWmCazMz+unN44b3ZfV3dnx5yDiaKsUAOZGD2/fL58+PSGg3Gu
buEVWyZacLCzw6S8X324fOHqibMxWpKy5okBIjAZoNOt9r47e+HOnafbe/ND
DNWkOGAyDKwsCtXPTly4eufqm+fvHy4M1RRggsnJMLI6z9x99Oqtx7cuPP/2
ele5LjtCGyObbcHcDfuevHn+5s319RuSpOByrEwcwsqhlcvXHbp38+LxiXP6
DeBSTKzWvkrCun5Zq04dO7S6p67ZHibFziiRt6PYUk5YtfbUqSMTGnKyHaFS
rMDA3fHr7tqayKDWa0dWVmXHp5lCpRgZ2QI2HTl25NLt+1t3rppRFJ8SrwGX
4g9rmbJo0cpVqxZNaK5OS0nzF4NLMWkHZ1TVN9bXlxXmAo2L0uNgZITaxcjI
axAYH5+RATQrPtZHk5udA+Z2cIpQN3Hy8vOwMVLmYGTidoenDSawLAsnJz8L
kMUiY4ySpviYoKmKRVAcIyXKyIiLyygi+ADqVqrAkApevwAAAABJRU5ErkJg
gg==
+22
View File
@@ -0,0 +1,22 @@
ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002.
Packaged for the Maemo platform by Tomas Junnoen <tomas@fs-security.com> Oct 2005
From 0.8.2 to 1.2.1, packaging for Maemo was done by Frantisek Dufka <dufkaf@seznam.cz>
Since 1.4 packaging for Maemo is done by Tarek Soliman <tarek@bashasoliman.com>
It was downloaded from <http://www.scummvm.org/>.
Upstream Authors: see AUTHORS file of the ScummVM source distribution.
Copyright:
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version. In addition, some parts are also licensed under LGPL and
BSD licenses. See COPYING.BSD and COPYING.LGPL.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
This copyright also applies to the Debian-related build scripts.
+25
View File
@@ -0,0 +1,25 @@
#! /bin/sh
# This is a workaround for older maemo versions related to the icon.
# The /usr/share/icons/scummvm.xpm icon is needed for OS2006 (Nokia 770)
# but if present it overrides nicer icons for newer systems in /usr/share/icons/hicolor.
# This workaround removes it if the OS isn't old (2006/2007).
if [ "$1" = "configure" ] ; then
OSVER=$OSSO_VERSION
[ -z "$OSVER" -a -f /etc/osso_software_version ] && OSVER=`cat /etc/osso_software_version`
OSVER=`echo $OSVER | cut -d _ -f 2`
case $OSVER in
2006*|2007*)
#nothing to do
true
;;
*)
#ugly trick, until this icon is removed big icon in menu does not show
[ -f /usr/share/icons/scummvm.xpm ] && rm /usr/share/icons/scummvm.xpm
;;
esac
[ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor
[ -x /usr/bin/maemo-select-menu-location -a -z "$2" ] && /usr/bin/maemo-select-menu-location scummvm.desktop tana_fi_games
fi
exit 0
+71
View File
@@ -0,0 +1,71 @@
#!/usr/bin/make -f
#include /usr/share/quilt/quilt.make
build: scummvm
scummvm:
dh_testdir
./configure --host=maemo
$(MAKE)
clean:
dh_testdir
dh_testroot
-$(MAKE) distclean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean
dh_installdirs
# run as fake dbus-service to enable switching back to application from desktop via home key
install -m0755 dists/maemo/scummvm.servicewrapper debian/scummvm/usr/games/scummvm
install -m0644 dists/maemo/scummvm.servicedesktop debian/scummvm/usr/share/applications/hildon/scummvm.desktop
install -m0644 dists/maemo/scummvm.service debian/scummvm/usr/share/dbus-1/services
# the following commented out lines are the alternative for not running scummvm as a fake service
# install -m0755 dists/maemo/scummvm.wrapper debian/scummvm/usr/games/scummvm
# install -m0644 dists/maemo/scummvm.desktop debian/scummvm/usr/share/applications/hildon
install -m0644 dists/maemo/scummvm26.png debian/scummvm/usr/share/icons/hicolor/26x26/hildon/scummvm.png
install -m0644 dists/maemo/scummvm40.png debian/scummvm/usr/share/icons/hicolor/40x40/hildon/scummvm.png
install -m0644 dists/maemo/scummvm48.png debian/scummvm/usr/share/icons/hicolor/48x48/hildon/scummvm.png
install -m0644 dists/maemo/scummvm64.png debian/scummvm/usr/share/icons/hicolor/64x64/hildon/scummvm.png
install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons
# install -m0644 -d debian/scummvm/usr/lib/scummvm
# install -m0644 plugins/lib*.so debian/scummvm/usr/lib/scummvm
##non-optified version
# install -m0755 scummvm debian/scummvm/usr/games/scummvm.bin
# install -m0644 -d debian/scummvm/usr/share/scummvm
# install -m0644 dists/pred.dic debian/scummvm/usr/share/scummvm
# install -m0644 gui/themes/scummclassic.zip gui/themes/scummmodern.zip debian/scummvm/usr/share/scummvm
# optified version (save rootfs space on N900), see also configure prefix and datadir paths above
install -m0644 -d debian/scummvm/opt/scummvm/bin
install -m0755 scummvm debian/scummvm/opt/scummvm/bin
install -m0644 -d debian/scummvm/opt/scummvm/share
install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share
install -m0644 gui/themes/scummclassic.zip gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
# for optified version we can also add engine datafiles
install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/m4.dat dists/engine-data/mads.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
install -m0644 -d debian/scummvm/usr/share/doc/scummvm
install -m0644 NEWS README COPYRIGHT debian/scummvm/usr/share/doc/scummvm
binary: binary-arch
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs NEWS
dh_link
dh_strip
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary-indep:
.PHONY: build clean binary install binary-arch binary-indep
@@ -0,0 +1,8 @@
usr/games
usr/share/icons
usr/share/icons/hicolor/26x26/hildon
usr/share/icons/hicolor/40x40/hildon
usr/share/icons/hicolor/48x48/hildon
usr/share/icons/hicolor/64x64/hildon
usr/share/applications/hildon
usr/share/dbus-1/services
+97
View File
@@ -0,0 +1,97 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MAEMO)
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "backends/platform/maemo/maemo.h"
#include "backends/events/maemosdl/maemosdl-events.h"
#include "common/textconsole.h"
#include <SDL/SDL_syswm.h>
#include <X11/Xutil.h>
OSystem_SDL_Maemo::OSystem_SDL_Maemo()
:
OSystem_POSIX() {
}
void OSystem_SDL_Maemo::initBackend() {
// Create the events manager
if (_eventSource == 0)
_eventSource = new MaemoSdlEventSource();
ConfMan.set("vkeybdpath", DATA_PATH);
// Call parent implementation of this method
OSystem_POSIX::initBackend();
}
void OSystem_SDL_Maemo::quit() {
delete this;
}
void OSystem_SDL_Maemo::fatalError() {
delete this;
}
void OSystem_SDL_Maemo::setXWindowName(const char *caption) {
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
if (SDL_GetWMInfo(&info)) {
Display *dpy = info.info.x11.display;
Window win;
win = info.info.x11.fswindow;
if (win) XStoreName(dpy, win, caption);
win = info.info.x11.wmwindow;
if (win) XStoreName(dpy, win, caption);
}
}
void OSystem_SDL_Maemo::setWindowCaption(const char *caption) {
Common::String cap;
byte c;
// The string caption is supposed to be in LATIN-1 encoding.
// SDL expects UTF-8. So we perform the conversion here.
while ((c = *(const byte *)caption++)) {
if (c < 0x80)
cap += c;
else {
cap += 0xC0 | (c >> 6);
cap += 0x80 | (c & 0x3F);
}
}
SDL_WM_SetCaption(cap.c_str(), cap.c_str());
Common::String cap2("ScummVM - "); // 2 lines in OS2008 task switcher, set first line
cap = cap2 + cap;
setXWindowName(cap.c_str());
}
#endif
+45
View File
@@ -0,0 +1,45 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MAEMO)
#ifndef PLATFORM_SDL_MAEMO_H
#define PLATFORM_SDL_MAEMO_H
#include "backends/platform/sdl/posix/posix.h"
class OSystem_SDL_Maemo : public OSystem_POSIX {
public:
OSystem_SDL_Maemo();
virtual void initBackend();
virtual void quit();
virtual void fatalError();
virtual void setWindowCaption(const char *caption);
private:
virtual void setXWindowName(const char *caption);
};
#endif
#endif
+52
View File
@@ -0,0 +1,52 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MAEMO)
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#include "backends/platform/maemo/maemo.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
#include <unistd.h>
int main(int argc, char* argv[]) {
g_system = new OSystem_SDL_Maemo();
assert(g_system);
((OSystem_SDL_Maemo *)g_system)->init();
#ifdef DYNAMIC_MODULES
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
#endif
// Invoke the actual ScummVM main entry point:
int res = scummvm_main(argc, argv);
// Free OSystem
delete (OSystem_SDL_Maemo *)g_system;
return res;
}
#endif
+13
View File
@@ -0,0 +1,13 @@
MODULE := backends/platform/maemo
MODULE_OBJS := \
main.o \
maemo.o
# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
OBJS := $(MODULE_OBJS) $(OBJS)
MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
-include $(srcdir)/backends/platform/sdl/module.mk
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -26,7 +26,7 @@
// of this file. The following "#if" ensures that.
#if !defined(POSIX) && \
!defined(WIN32) && \
!defined(__MAEMO__) && \
!defined(MAEMO) && \
!defined(__SYMBIAN32__) && \
!defined(_WIN32_WCE) && \
!defined(__amigaos4__) && \
+1 -1
View File
@@ -22,7 +22,7 @@
#include "common/scummsys.h"
#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3)
#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3)
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"
Vendored
+45 -5
View File
@@ -745,6 +745,7 @@ Special configuration feature:
gp2xwiz for GP2X Wiz
iphone for Apple iPhone
linupy for Yopy PDA
maemo for Nokia Maemo
motoezx for MotoEZX
motomagx for MotoMAGX
n64 for Nintendo 64
@@ -1131,6 +1132,22 @@ linupy)
_host_os=linux
_host_cpu=arm
;;
maemo)
_host_os=maemo
_host_cpu=arm
_host_alias=arm-linux
# The prefix is always the same on Maemo so we hardcode the default
# here. It is still possible to define a custom prefix which is
# needed when packaging the app with a user-specific app ID.
test "x$prefix" = xNONE && prefix=/opt/scummvm
# Maemo apps are installed into app-specific directories. The
# default directory structure of ScummVM makes no sense here so we
# hardcode Maemo specific directories here.
datarootdir='${prefix}/share'
datadir=/opt/scummvm/share
docdir='${datarootdir}/doc/scummvm'
;;
motoezx)
_host_os=linux
_host_cpu=arm
@@ -1921,6 +1938,9 @@ case $_host_os in
CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
fi
;;
maemo)
DEFINES="$DEFINES -DMAEMO"
;;
mingw*)
DEFINES="$DEFINES -DWIN32"
DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
@@ -2212,6 +2232,23 @@ if test -n "$_host"; then
_ar="m68k-atari-mint-ar cru"
_seq_midi=no
;;
maemo)
CXXFLAGS="$CXXFLAGS -Os"
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
INCLUDES="$INCLUDES -I/usr/X11R6/include"
LIBS="$LIBS -lpthread"
LIBS="$LIBS -L/usr/lib"
_backend="maemo"
_vkeybd=yes
_build_hq_scalers=no
_mt32emu=no
_alsa=no
_mad=yes
_tremor=yes
_zlib=yes
;;
*mingw32*)
_sdlconfig=$_host-sdl-config
_windres=$_host-windres
@@ -2462,6 +2499,9 @@ case $_backend in
linuxmoto)
DEFINES="$DEFINES -DLINUXMOTO"
;;
maemo)
DEFINES="$DEFINES -DMAEMO"
;;
n64)
INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
@@ -2544,7 +2584,7 @@ MODULES="$MODULES backends/platform/$_backend"
# Setup SDL specifics for SDL based backends
#
case $_backend in
dingux | gp2x | gph | linuxmoto | openpandora | samsungtv | sdl)
dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
@@ -2567,7 +2607,7 @@ esac
# Enable 16bit support only for backends which support it
#
case $_backend in
android | bada | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | webos | wii)
android | bada | dingux | dreamcast | gph | maemo | openpandora | psp | samsungtv | sdl | webos | wii)
if test "$_16bit" = auto ; then
_16bit=yes
else
@@ -2593,7 +2633,7 @@ case $_host_os in
amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
_posix=no
;;
android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
_posix=yes
;;
os2-emx*)
@@ -3462,8 +3502,8 @@ case $_backend in
# Add ../plugins as a path so plugins can be found when running from a .PND.
DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
;;
webos)
# The WebOS app wants the plugins in the "lib" directory
maemo | webos)
# The WebOS and Maemo apps want the plugins in the "lib" directory
# without a scummvm sub directory.
DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
;;
+7
View File
@@ -96,3 +96,10 @@ endif
# Include common rules
include $(srcdir)/rules.mk
ifeq ($(BACKEND), maemo)
#ugly workaround, screen.cpp crashes gcc version 3.4.4 (CodeSourcery ARM 2005q3-2) with anything but -O3
$(MODULE)/screen.o: $(MODULE)/screen.cpp
$(MKDIR) $(*D)/$(DEPDIR)
$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) -O3 $(CPPFLAGS) -c $(<) -o $*.o
endif
+1
View File
@@ -80,3 +80,4 @@ backends/events/gph/gph-events.cpp
backends/events/openpandora/op-events.cpp
backends/updates/macosx/macosx-updates.mm
backends/platform/bada/form.cpp
backends/events/maemosdl/maemosdl-events.cpp