The following commit has been merged in the debian branch: commit 21edfc98ae2c4d760c5bff0e8b160c8410262375 Author: Simon McVittie <s...@debian.org> Date: Mon Jul 12 23:11:54 2010 +0100
Replace the patch for Bug #382121 with a more complete upstream fix from ioquake3, which just uses the OS's memcpy() diff --git a/debian/changelog b/debian/changelog index d39da35..33532ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low * New maintainer - Debian Games Team * Set source format to 3.0 (quilt) * Separate out patches from previous versions into debian/patches + * Replace the patch for Bug #382121 with a more complete upstream fix + from ioquake3, which just uses the OS's memcpy() -- Simon McVittie <s...@debian.org> Mon, 12 Jul 2010 22:22:25 +0100 diff --git a/debian/patches/0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch b/debian/patches/0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch deleted file mode 100644 index 1162f03..0000000 --- a/debian/patches/0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Damien Laniel <here...@tuxfamily.org> -Date: Mon, 12 Jul 2010 22:33:38 +0100 -Subject: [PATCH] Applied the patch to remove the warning about OP_BLOCK_COPY on ppc - -[Obsoleted by ioquake3 r1456, which fixes -http://bugzilla.icculus.org/show_bug.cgi?id=3756 -smcv] - -Forwarded: no -Bug-Debian: http://bugs.debian.org/382121 ---- - src/qcommon/vm_interpreted.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/qcommon/vm_interpreted.c b/src/qcommon/vm_interpreted.c -index 44b6e5d..b39a4fd 100644 ---- a/src/qcommon/vm_interpreted.c -+++ b/src/qcommon/vm_interpreted.c -@@ -494,10 +494,12 @@ nextInstruction2: - - src = (int *)&image[ r0&dataMask ]; - dest = (int *)&image[ r1&dataMask ]; -- if ( ( (intptr_t)src | (intptr_t)dest | count ) & 3 ) { -+// avoid flooding console -+/* if ( ( (intptr_t)src | (intptr_t)dest | count ) & 3 ) { - // happens in westernq3 - Com_Printf( S_COLOR_YELLOW "Warning: OP_BLOCK_COPY not dword aligned\n"); - } -+*/ - count >>= 2; - for ( i = count-1 ; i>= 0 ; i-- ) { - dest[i] = src[i]; --- diff --git a/debian/patches/0005-Fix-unaligned-access-issue.patch b/debian/patches/0005-Fix-unaligned-access-issue.patch new file mode 100644 index 0000000..ff60ac8 --- /dev/null +++ b/debian/patches/0005-Fix-unaligned-access-issue.patch @@ -0,0 +1,36 @@ +From: Patrick Baggett <unknown> +Date: Mon, 12 Jul 2010 23:07:55 +0100 +Subject: [PATCH] Fix unaligned access issue + +Bug: http://bugzilla.icculus.org/show_bug.cgi?id=3756 +Bug-Debian: http://bugs.debian.org/382121 +--- + src/qcommon/vm_interpreted.c | 14 ++++---------- + 1 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/qcommon/vm_interpreted.c b/src/qcommon/vm_interpreted.c +index 44b6e5d..99dea92 100644 +--- a/src/qcommon/vm_interpreted.c ++++ b/src/qcommon/vm_interpreted.c +@@ -492,16 +492,10 @@ nextInstruction2: + count = ((srci + count) & dataMask) - srci; + count = ((desti + count) & dataMask) - desti; + +- src = (int *)&image[ r0&dataMask ]; +- dest = (int *)&image[ r1&dataMask ]; +- if ( ( (intptr_t)src | (intptr_t)dest | count ) & 3 ) { +- // happens in westernq3 +- Com_Printf( S_COLOR_YELLOW "Warning: OP_BLOCK_COPY not dword aligned\n"); +- } +- count >>= 2; +- for ( i = count-1 ; i>= 0 ; i-- ) { +- dest[i] = src[i]; +- } ++ src = (int *)&image[ srci ]; ++ dest = (int *)&image[ desti ]; ++ ++ memcpy(dest, src, count); + programCounter += 4; + opStack -= 2; + } +-- diff --git a/debian/patches/series b/debian/patches/series index 5132cb1..bd7b300 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ 0002-Avoid-building-game-logic-as-QVMs.patch 0003-Don-t-build-q3lcc.patch 0004-Use-USER-as-default-player-name.patch -0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch +0005-Fix-unaligned-access-issue.patch -- team based FPS game - packaging _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits