summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-apm.diff6
-rw-r--r--packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/simpad-apm.patch6
-rw-r--r--packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb2
-rw-r--r--packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb2
-rw-r--r--packages/snes9x/snes9x-sdl-qpe_1.39.bb6
-rw-r--r--packages/snes9x/snes9x-sdl/.mtn2git_empty (renamed from packages/snes9x/snes9x-sdl-qpe-1.39/.mtn2git_empty)0
-rw-r--r--packages/snes9x/snes9x-sdl/compile.patch (renamed from packages/snes9x/snes9x-sdl-qpe-1.39/compile.patch)92
-rw-r--r--packages/snes9x/snes9x-sdl_1.39.bb23
8 files changed, 118 insertions, 19 deletions
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-apm.diff b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-apm.diff
index dfdbd99237..8b66c04276 100644
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-apm.diff
+++ b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-apm.diff
@@ -445,7 +445,7 @@
static struct file_operations apm_bios_fops = {
owner: THIS_MODULE,
read: do_read,
-@@ -454,6 +484,48 @@
+@@ -454,6 +484,50 @@
#define APM_INIT_ERROR_RETURN return -1
@@ -478,8 +478,10 @@
+ as->writer = 1;
+ as->reader = 0;
+
-+ while (!signal_pending (current)) {
++ for (;;) {
+ interruptible_sleep_on(&apm_suspend_waitqueue);
++ if (signal_pending (current))
++ break;
+
+ pm_suggest_suspend();
+
diff --git a/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/simpad-apm.patch b/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/simpad-apm.patch
index 900124e7d4..1446bc2eb7 100644
--- a/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/simpad-apm.patch
+++ b/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/simpad-apm.patch
@@ -450,7 +450,7 @@
static struct file_operations apm_bios_fops = {
owner: THIS_MODULE,
read: do_read,
-@@ -454,6 +483,48 @@
+@@ -454,6 +483,50 @@
#define APM_INIT_ERROR_RETURN return -1
@@ -483,8 +483,10 @@
+ as->writer = 1;
+ as->reader = 0;
+
-+ while (!signal_pending (current)) {
++ for (;;) {
+ interruptible_sleep_on(&apm_suspend_waitqueue);
++ if (signal_pending (current))
++ break;
+
+ pm_suggest_suspend();
+
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 6970dd994b..3f750e1f41 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -6,7 +6,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
-PR = "r20"
+PR = "r21"
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 95e483a5c8..df46fad53d 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -7,7 +7,7 @@ VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
USBV= "usb20040610"
-PR = "r2"
+PR = "r3"
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index b95357284f..6d9fadf062 100644
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -2,18 +2,20 @@ DESCRIPTION = "Super Nintendo Emulator based on SDL, QtE Palmtop Environments Ed
SECTION = "opie/games"
PRIORITY = "optional"
DEPENDS = "libsdl-qpe"
-PR = "r1"
+PR = "r2"
LICENSE = "snes9x"
SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
file://compile.patch;patch=1"
S = "${WORKDIR}/snes9x-sdl-${PV}"
+FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE_DIRNAME}/snes9x-sdl:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
FILES_${PN} = "${palmtopdir}/bin/snes9x"
do_compile() {
oe_runmake CC="${CC}" CCC="${CXX}" \
INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \
- LDLIBS="`sdl-config --libs` -Wl,-rpath-link,${STAGING_LIBDIR}"
+ LDLIBS="`sdl-config --libs` -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte"
}
do_install() {
diff --git a/packages/snes9x/snes9x-sdl-qpe-1.39/.mtn2git_empty b/packages/snes9x/snes9x-sdl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/snes9x/snes9x-sdl-qpe-1.39/.mtn2git_empty
+++ b/packages/snes9x/snes9x-sdl/.mtn2git_empty
diff --git a/packages/snes9x/snes9x-sdl-qpe-1.39/compile.patch b/packages/snes9x/snes9x-sdl/compile.patch
index 57ff0c409a..b41a30f30e 100644
--- a/packages/snes9x/snes9x-sdl-qpe-1.39/compile.patch
+++ b/packages/snes9x/snes9x-sdl/compile.patch
@@ -1,10 +1,10 @@
#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- snes9x-sdl-1.39/unix/svga.cpp~compile 2003-10-28 10:08:18.000000000 +0100
-+++ snes9x-sdl-1.39/unix/svga.cpp 2004-01-19 21:29:07.000000000 +0100
+--- snes9x-sdl-1.39/unix/svga.cpp~compile
++++ snes9x-sdl-1.39/unix/svga.cpp
@@ -48,7 +48,7 @@
#include <stdlib.h>
#include <signal.h>
@@ -14,8 +14,8 @@
#include "snes9x.h"
#include "memmap.h"
---- snes9x-sdl-1.39/unix/unix.cpp~compile 2003-10-28 22:09:02.000000000 +0100
-+++ snes9x-sdl-1.39/unix/unix.cpp 2004-01-19 21:29:07.000000000 +0100
+--- snes9x-sdl-1.39/unix/unix.cpp~compile
++++ snes9x-sdl-1.39/unix/unix.cpp
@@ -50,7 +50,7 @@
#include <sys/types.h>
#include <ctype.h>
@@ -25,8 +25,18 @@
#include "keydef.h"
#undef USE_THREADS
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ snes9x-sdl-1.39/unzip/unzipP.h 2004-01-19 21:29:07.000000000 +0100
+@@ -189,8 +189,7 @@
+ }
+
+ /*#include "cheats.h"*/
+-extern "C"
+-int SDL_main (int argc, char **argv)
++int main (int argc, char **argv)
+ {
+ if (argc < 2)
+ S9xUsage ();
+--- /dev/null
++++ snes9x-sdl-1.39/unzip/unzipP.h
@@ -0,0 +1,124 @@
+#ifndef _UNZIPP_H_
+#define _UNZIPP_H_
@@ -152,8 +162,8 @@
+} unz_s;
+
+#endif
---- snes9x-sdl-1.39/Makefile~compile 2003-10-28 16:49:50.000000000 +0100
-+++ snes9x-sdl-1.39/Makefile 2004-01-19 21:31:53.000000000 +0100
+--- snes9x-sdl-1.39/Makefile~compile
++++ snes9x-sdl-1.39/Makefile
@@ -53,12 +53,12 @@
ifdef THREAD_SOUND
@@ -176,7 +186,8 @@
-INCLUDES=-I/usr/local/include
+INCLUDES=
- OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer -mcpu=strongarm1100 -mtune=strongarm1100
+-OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer -mcpu=strongarm1100 -mtune=strongarm1100
++OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer
CCFLAGS = $(OPTIMISE) \
--I/opt/Qtopia/include/SDL \
-I. \
@@ -199,7 +210,66 @@
snes9x: $(OBJECTS)
- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) -L/opt/QtPalmtop/lib/ -lSDL -lSDLmain $(LDLIBS) -lqpe -lqte -lpthread
-+ $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lqpe -lqte -lpthread
++ $(CC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lz -lpthread
gsnes9x: $(OBJECTS) unix/x11.o unix/glide.o
$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o unix/glide.o $(LDLIBS) $(GLIDELIBS) -lXext -lX11 -lXxf86dga -lXxf86vm $(EXTRALIBS) -lz -lm
+--- snes9x-sdl-1.39/snapshot.cpp~compile
++++ snes9x-sdl-1.39/snapshot.cpp
+@@ -671,7 +671,7 @@
+ fields [i].type);
+ }
+
+- uint8 *block = new uint8 [len];
++ uint8 *block = (uint8*) malloc(len);
+ uint8 *ptr = block;
+ uint16 word;
+ uint32 dword;
+@@ -739,7 +739,7 @@
+ }
+
+ FreezeBlock (stream, name, block, len);
+- delete block;
++ free(block);
+ }
+
+ void FreezeBlock (STREAM stream, char *name, uint8 *block, int size)
+@@ -767,7 +767,7 @@
+ fields [i].type);
+ }
+
+- uint8 *block = new uint8 [len];
++ uint8 *block = (uint8*) malloc(len);
+ uint8 *ptr = block;
+ uint16 word;
+ uint32 dword;
+@@ -776,7 +776,7 @@
+
+ if ((result = UnfreezeBlock (stream, name, block, len)) != SUCCESS)
+ {
+- delete block;
++ free(block);
+ return (result);
+ }
+
+@@ -841,7 +841,7 @@
+ }
+ }
+
+- delete block;
++ free(block);
+ return (result);
+ }
+
+@@ -865,9 +865,9 @@
+
+ if (rem)
+ {
+- char *junk = new char [rem];
++ char *junk = (char*) malloc(rem);
+ READ_STREAM (junk, rem, stream);
+- delete junk;
++ free(junk);
+ }
+
+ return (SUCCESS);
diff --git a/packages/snes9x/snes9x-sdl_1.39.bb b/packages/snes9x/snes9x-sdl_1.39.bb
new file mode 100644
index 0000000000..9c37b12f00
--- /dev/null
+++ b/packages/snes9x/snes9x-sdl_1.39.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Super Nintendo Emulator based on SDL"
+SECTION = "games"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl zlib"
+PR = "r2"
+LICENSE = "snes9x"
+SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
+ file://compile.patch;patch=1"
+S = "${WORKDIR}/snes9x-sdl-${PV}"
+
+FILES_${PN} = "${bindir}/snes9x"
+
+do_compile() {
+ oe_runmake CC="${CC}" CCC="${CXX} -fno-rtti -fno-exceptions" \
+ INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \
+ LDLIBS="`sdl-config --libs`"
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 snes9x ${D}${bindir}/snes9x
+}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:00:13 +0000