Hi,
This patch works fine on my desktop ( amd64 / 6000+).
I set the maximum in graphics options, and it works very well with my
ati x800gt.
Thanks for the port and thanks to oga@ ;)
Matthias Kilian wrote:
On Sun, Jan 11, 2009 at 10:43:32AM +0900, Jordi Beltran Creix wrote:
Of course. It is much better this way.
Here's a complete diff, ready to commit if someone checks at least
one of the unchecked archs. If noone tests this on other archs,
I'll put it in with ONLY_FOR_ARCHS=amd i386 macppc in a few days.
Ciao,
Kili
Unbreak at least for amd64. Initial fix (for amd64 only) from Jordi
Beltran Creix (jbcreix.mail at gmail.com). Generalized for all LP64
architectures by me.
Tested on amd64 by Jonathan Armani (dbd at asystant.net). No changes
for i386 and macppc. Tested on
[ ] alpha by ___________
[X] arm by me (fps really sucks on zaurus)
[ ] hppe64 by ___________
[ ] sparc64 by ___________
[ ] mips64 by ___________
I want at least one more [X] (and a name and/or mail address) here
before committing.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openarena/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 5 Nov 2008 21:25:28 -0000 1.3
+++ Makefile 18 Jan 2009 20:26:46 -0000
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.3 2008/11/05 21:25:28 weerd Exp $
-ONLY_FOR_ARCHS = i386 macppc
-
COMMENT-main = OpenArena client
COMMENT-server = OpenArena server
COMMENT-data = OpenArena data for client/server
@@ -16,7 +14,7 @@ PKGNAME-main = openarena-${V}
PKGNAME-server = openarena-server-${V}
PKGNAME-data = openarena-data-${V}
-PKG_ARCH-data = i386,macppc
+PKG_ARCH-data = *
DISTNAME = oa${V:S/.//g}
DISTFILES = ${DISTNAME}.zip openarena-engine-${V}-1.tar.bz2
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/openarena/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 27 Oct 2008 13:29:02 -0000 1.1.1.1
+++ patches/patch-Makefile 18 Jan 2009 20:26:46 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2008/10/27 13:29:02 weerd Exp $
---- Makefile.orig Thu Aug 7 00:52:08 2008
-+++ Makefile Fri Aug 22 21:27:21 2008
+--- Makefile.orig Sat Aug 9 22:22:37 2008
++++ Makefile Sun Jan 18 21:10:27 2009
@@ -143,8 +143,8 @@ endif
#############################################################################
@@ -80,7 +80,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/
$(echo_cmd) "LD $@"
$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
-@@ -2041,17 +2040,17 @@ copyfiles: release
+@@ -2037,17 +2036,17 @@ copyfiles: release
-$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
ifneq ($(BUILD_CLIENT),0)
Index: patches/patch-code_qcommon_vm_interpreted_c
===================================================================
RCS file: patches/patch-code_qcommon_vm_interpreted_c
diff -N patches/patch-code_qcommon_vm_interpreted_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-code_qcommon_vm_interpreted_c 18 Jan 2009 20:26:46 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- code/qcommon/vm_interpreted.c.orig Sat Aug 9 18:28:20 2008
++++ code/qcommon/vm_interpreted.c Sat Jan 10 21:23:02 2009
+@@ -532,8 +532,8 @@ nextInstruction2:
+
+ //VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
+ {
+- intptr_t* argptr = (intptr_t *)&image[
programStack + 4 ];
+- #if __WORDSIZE == 64
++ intptr_t* argptr;
++ #if LONG_BIT == 64
+ // the vm has ints on the stack, we expect
+ // longs so we have to convert it
+ intptr_t argarr[16];
+@@ -542,6 +542,8 @@ nextInstruction2:
+ argarr[i] = *(int*)&image[
programStack + 4 + 4*i ];
+ }
+ argptr = argarr;
++ #else
++ argptr = (intptr_t *)&image[
programStack + 4 ];
+ #endif
+ r = vm->systemCall( argptr );
+ }
