[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-11-g4d49579

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 5a5fb8081a17add5d5defae1432afe1d31fcd737
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 04:18:56 2010 +0100

    Disable JIT QVM compiler (which seems to crash on startup) on x86-64, falling back to the architecture-neutral QVM interpreter

diff --git a/debian/changelog b/debian/changelog
index 20c140d..94f3152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
     (Closes: #473848)
   * Apply part of upstream r756 to fix sorting by ping, and install the
     modified menu to override the one in tremulous-data (Closes: #476621)
+  * Disable JIT QVM compiler (which seems to crash on startup) on x86-64,
+    falling back to the architecture-neutral QVM interpreter
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/patches/0009-Disable-JIT-QVM-interpreter-on-x86-64.patch b/debian/patches/0009-Disable-JIT-QVM-interpreter-on-x86-64.patch
new file mode 100644
index 0000000..f9802d8
--- /dev/null
+++ b/debian/patches/0009-Disable-JIT-QVM-interpreter-on-x86-64.patch
@@ -0,0 +1,28 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sat, 17 Jul 2010 04:06:35 +0100
+Subject: [PATCH] Disable JIT QVM compiler on x86-64
+
+It seems to crash on startup, and probably needs merging from ioquake3.
+I don't speak assembler, so let's use the tried-and-tested interpreter
+instead...
+
+Forwarded: no
+Origin: vendor
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index de9a1e4..ec2255f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -205,7 +205,7 @@ ifeq ($(PLATFORM),linux)
+       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+       -fstrength-reduce
+     # experimental x86_64 jit compiler! you need GNU as
+-    HAVE_VM_COMPILED = true
++    #HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 337a431..14204cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch
 0007-Fix-to-disappearing-cursor-on-map-load-Com_Error-bug.patch
 0008-Fixed-sort-by-ping.patch
+0009-Disable-JIT-QVM-interpreter-on-x86-64.patch

-- 
team based FPS game - packaging