[SCM] pcsxr packaging branch, master, updated. debian/1.9.92-1-8-ga656676
Andrey Rahmatullin
wrar at wrar.name
Sat May 28 07:29:59 UTC 2011
The following commit has been merged in the master branch:
commit a6566761f730d63723062f61a4511a09f84f6d79
Author: Andrey Rahmatullin <wrar at wrar.name>
Date: Sat May 28 13:28:53 2011 +0600
Fix FTBFS on armel
diff --git a/debian/changelog b/debian/changelog
index 5a21b14..41fb5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pcsxr (1.9.92-3) UNRELEASED; urgency=low
+
+ * Fix FTBFS on armel
+
+ -- Andrey Rahmatullin <wrar at wrar.name> Fri, 27 May 2011 22:11:51 +0600
+
pcsxr (1.9.92-2) unstable; urgency=low
* Move the package to the pkg-games team
diff --git a/debian/patches/fix-armel-ftbfs.diff b/debian/patches/fix-armel-ftbfs.diff
new file mode 100644
index 0000000..28eef5c
--- /dev/null
+++ b/debian/patches/fix-armel-ftbfs.diff
@@ -0,0 +1,235 @@
+Description: Fix FTBFS on armel by renaming symbols conflicting with system ones
+ enum breakpoint_types has several name clashes with armel <sys/ucontext.h>
+Origin: upstream, http://pcsxr.codeplex.com/SourceControl/changeset/changes/66613
+Bug: http://pcsxr.codeplex.com/workitem/8584
+Last-Update: 2011-05-27
+
+Index: pcsxr/libpcsxcore/psxmem.c
+===================================================================
+--- pcsxr/libpcsxcore/psxmem.c (revision 66612)
++++ pcsxr/libpcsxcore/psxmem.c (revision 66613)
+@@ -157,7 +157,7 @@
+ p = (char *)(psxMemRLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, R1);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BR1);
+ return *(u8 *)(p + (mem & 0xffff));
+ } else {
+ #ifdef PSXMEM_LOG
+@@ -186,7 +186,7 @@
+ p = (char *)(psxMemRLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, R2);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BR2);
+ return SWAPu16(*(u16 *)(p + (mem & 0xffff)));
+ } else {
+ #ifdef PSXMEM_LOG
+@@ -215,7 +215,7 @@
+ p = (char *)(psxMemRLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, R4);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BR4);
+ return SWAPu32(*(u32 *)(p + (mem & 0xffff)));
+ } else {
+ #ifdef PSXMEM_LOG
+@@ -244,7 +244,7 @@
+ p = (char *)(psxMemWLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, W1);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BW1);
+ *(u8 *)(p + (mem & 0xffff)) = value;
+ #ifdef PSXREC
+ psxCpu->Clear((mem & (~3)), 1);
+@@ -275,7 +275,7 @@
+ p = (char *)(psxMemWLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BW2);
+ *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
+ #ifdef PSXREC
+ psxCpu->Clear((mem & (~1)), 1);
+@@ -307,7 +307,7 @@
+ p = (char *)(psxMemWLUT[t]);
+ if (p != NULL) {
+ if (Config.Debug)
+- DebugCheckBP((mem & 0xffffff) | 0x80000000, W4);
++ DebugCheckBP((mem & 0xffffff) | 0x80000000, BW4);
+ *(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
+ #ifdef PSXREC
+ psxCpu->Clear(mem, 1);
+Index: pcsxr/libpcsxcore/debug.h
+===================================================================
+--- pcsxr/libpcsxcore/debug.h (revision 66612)
++++ pcsxr/libpcsxcore/debug.h (revision 66613)
+@@ -25,7 +25,7 @@
+ #endif
+
+ enum breakpoint_types {
+- E, R1, R2, R4, W1, W2, W4
++ BE, BR1, BR2, BR4, BW1, BW2, BW4
+ };
+
+ void StartDebugger();
+Index: pcsxr/libpcsxcore/debug.c
+===================================================================
+--- pcsxr/libpcsxcore/debug.c (revision 66612)
++++ pcsxr/libpcsxcore/debug.c (revision 66613)
+@@ -193,7 +193,7 @@
+ Execution flow control commands acknowledge (4xx):
+ -------------------------------------------------
+ 400 <number>@<address>-<type>
+- Displays a breakpoint, where 'type' can be of E, R1, R2, R4, W1, W2 or W4.
++ Displays a breakpoint, where 'type' can be of BE, BR1, BR2, BR4, BW1, BW2 or BW4.
+ 401 <message>
+ Breakpoint deleting acknowledge.
+ 410, 420, 421, 422, 430, 431, 432 <number>
+@@ -389,7 +389,7 @@
+ }
+ }
+ if (!paused) {
+- DebugCheckBP(psxRegs.pc, E);
++ DebugCheckBP(psxRegs.pc, BE);
+ }
+ if (mapping_e) {
+ MarkMap(psxRegs.pc, MAP_EXEC);
+@@ -951,7 +951,7 @@
+ // sprintf(reply, "531 Invalid address %08X\r\n", address);
+ // break;
+ // }
+- code = add_breakpoint(E, address);
++ code = add_breakpoint(BE, address);
+ sprintf(reply, "410 %X\r\n", code);
+ break;
+ case 0x320:
+@@ -963,7 +963,7 @@
+ sprintf(reply, "532 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(R1, address);
++ code = add_breakpoint(BR1, address);
+ sprintf(reply, "420 %X\r\n", code);
+ break;
+ case 0x321:
+@@ -975,7 +975,7 @@
+ sprintf(reply, "532 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(R2, address);
++ code = add_breakpoint(BR2, address);
+ sprintf(reply, "421 %X\r\n", code);
+ break;
+ case 0x322:
+@@ -987,7 +987,7 @@
+ sprintf(reply, "532 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(R4, address);
++ code = add_breakpoint(BR4, address);
+ sprintf(reply, "422 %X\r\n", code);
+ break;
+ case 0x330:
+@@ -999,7 +999,7 @@
+ sprintf(reply, "533 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(W1, address);
++ code = add_breakpoint(BW1, address);
+ sprintf(reply, "430 %X\r\n", code);
+ break;
+ case 0x331:
+@@ -1011,7 +1011,7 @@
+ sprintf(reply, "533 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(W2, address);
++ code = add_breakpoint(BW2, address);
+ sprintf(reply, "431 %X\r\n", code);
+ break;
+ case 0x332:
+@@ -1023,7 +1023,7 @@
+ sprintf(reply, "533 Invalid address %08X\r\n", address);
+ break;
+ }
+- code = add_breakpoint(W4, address);
++ code = add_breakpoint(BW4, address);
+ sprintf(reply, "432 %X\r\n", code);
+ break;
+ case 0x390:
+@@ -1087,59 +1087,59 @@
+ return;
+ }
+ }
+- if (breakmp_e && type == E) {
++ if (breakmp_e && type == BE) {
+ if (!IsMapMarked(address, MAP_EXEC)) {
+ sprintf(reply, "010 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_r8 && type == R1) {
++ if (breakmp_r8 && type == BR1) {
+ if (!IsMapMarked(address, MAP_R8)) {
+ sprintf(reply, "011 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_r16 && type == R2) {
++ if (breakmp_r16 && type == BR2) {
+ if (!IsMapMarked(address, MAP_R16)) {
+ sprintf(reply, "012 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_r32 && type == R4) {
++ if (breakmp_r32 && type == BR4) {
+ if (!IsMapMarked(address, MAP_R32)) {
+ sprintf(reply, "013 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_w8 && type == W1) {
++ if (breakmp_w8 && type == BW1) {
+ if (!IsMapMarked(address, MAP_W8)) {
+ sprintf(reply, "014 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_w16 && type == W2) {
++ if (breakmp_w16 && type == BW2) {
+ if (!IsMapMarked(address, MAP_W16)) {
+ sprintf(reply, "015 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (breakmp_w32 && type == W4) {
++ if (breakmp_w32 && type == BW4) {
+ if (!IsMapMarked(address, MAP_W32)) {
+ sprintf(reply, "016 %08X@%08X\r\n", address, psxRegs.pc);
+ WriteSocket(reply, strlen(reply));
+ paused = 1;
+ }
+ }
+- if (mapping_r8 && type == R1) MarkMap(address, MAP_R8);
+- if (mapping_r16 && type == R2) MarkMap(address, MAP_R16);
+- if (mapping_r32 && type == R4) MarkMap(address, MAP_R32);
+- if (mapping_w8 && type == W1) MarkMap(address, MAP_W8);
+- if (mapping_w16 && type == W2) MarkMap(address, MAP_W16);
+- if (mapping_w32 && type == W4) MarkMap(address, MAP_W32);
++ if (mapping_r8 && type == BR1) MarkMap(address, MAP_R8);
++ if (mapping_r16 && type == BR2) MarkMap(address, MAP_R16);
++ if (mapping_r32 && type == BR4) MarkMap(address, MAP_R32);
++ if (mapping_w8 && type == BW1) MarkMap(address, MAP_W8);
++ if (mapping_w16 && type == BW2) MarkMap(address, MAP_W16);
++ if (mapping_w32 && type == BW4) MarkMap(address, MAP_W32);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 4782409..7e10ef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-i386-exec-stack.patch
+fix-armel-ftbfs.diff
--
pcsxr packaging
More information about the Pkg-games-commits
mailing list