rott: decouple from opie using sdl.bbclass

diff --git a/packages/rott/files/.mtn2git_empty b/packages/rott/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/rott/files/gcc4.patch b/packages/rott/files/gcc4.patch
new file mode 100644 (file)
index 0000000..6a85053
--- /dev/null
+++ b/packages/rott/files/gcc4.patch
@@ -0,0 +1,39 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- rott-1.0/rott/rt_actor.c~gcc4
++++ rott-1.0/rott/rt_actor.c
+@@ -430,11 +430,11 @@
+ void AvoidPlayerMissile(objtype*ob);
+ int EnvironmentDamage(objtype *ob);
+ 
+-static int     STOPSPEED         =    0x200;
+-static int     PLAYERFRICTION    =    0xe000;
+-static int     ACTORFRICTION     =    0xf000;
+-static int     DIAGADJUST        =    0xb504;
+-static boolean MissileSound      =    true;
++int     STOPSPEED         =    0x200;
++int     PLAYERFRICTION    =    0xe000;
++int     ACTORFRICTION     =    0xf000;
++int     DIAGADJUST        =    0xb504;
++boolean MissileSound      =    true;
+ 
+ 
+ 
+--- rott-1.0/rott/rt_in.c~gcc4
++++ rott-1.0/rott/rt_in.c
+@@ -155,9 +155,9 @@
+ //
+ //****************************************************************************]
+ 
+-static KeyboardDef KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};
+-static JoystickDef JoyDefs[MaxJoys];
+-static ControlType Controls[MAXPLAYERS];
++KeyboardDef KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};
++JoystickDef JoyDefs[MaxJoys];
++ControlType Controls[MAXPLAYERS];
+ 
+ 
+ static boolean  IN_Started;

diff --git a/packages/rott/files/rott.jpg b/packages/rott/files/rott.jpg
new file mode 100644 (file)
index 0000000..e0d2807
Binary files /dev/null and b/packages/rott/files/rott.jpg differ

diff --git a/packages/rott/rott_1.0.bb b/packages/rott/rott_1.0.bb
index 821e6ad..5453001 100644 (file)
--- a/packages/rott/rott_1.0.bb
+++ b/packages/rott/rott_1.0.bb
@@ -1,22 +1,22 @@
 DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition"
-SECTION = "opie/games"
-PRIORITY = "optional"
+HOMEPAGE = "http://www.icculus.org/root"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz"
+APPIMAGE = "${WORKDIR}/rott.jpg"
+
+SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz \
+           file://gcc4.patch;patch=1;pnum=2 \
+           file://rott.jpg"
 S = "${WORKDIR}/rott-${PV}/rott"
 
 CFLAGS += "-DPLATFORM_UNIX"
 EXTRA_OEMAKE = 'SDL_INC_DIR=${STAGING_INCDIR}/SDL CC="${CC}" EXTRALDFLAGS="${LDFLAGS}"'
 
-# FIXME: Add Opie integration, i.e. a .desktop file and a logo
+inherit sdl
 
 do_install() {
-       install -d ${D}${palmtopdir}/bin/
-       install -m 0755 rott ${D}${palmtopdir}/bin/
+       install -d ${D}${bindir}
+       install -m 0755 rott ${D}${bindir}
 }
-
-FILES_${PN} = "${palmtopdir}"