rpms/torcs/devel torcs-64bit.patch,NONE,1.1 torcs.spec,1.7,1.8

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18195

Modified Files:
	torcs.spec 
Added Files:
	torcs-64bit.patch 
Log Message:
* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 1.2.3-4
- fix build on 64bit arches


torcs-64bit.patch:

--- NEW FILE torcs-64bit.patch ---
--- torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp.64bit	2005-05-26 10:37:04.000000000 -0400
+++ torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp	2005-05-26 10:37:44.000000000 -0400
@@ -156,7 +156,7 @@
 static void
 grSplitScreen(void *vp)
 {
-    int p = (int)vp;
+    long p = (long)vp;
 
     switch (p) {
     case GR_SPLIT_ADD:
@@ -198,19 +198,19 @@
 static void
 grSetZoom(void *vp)
 {
-    grGetcurrentScreen()->setZoom((int)vp);
+    grGetcurrentScreen()->setZoom((int)(long)vp);
 }
 
 static void
 grSelectCamera(void *vp)
 {
-    grGetcurrentScreen()->selectCamera((int)vp);
+    grGetcurrentScreen()->selectCamera((int)(long)vp);
 }
 
 static void
 grSelectBoard(void *vp)
 {
-    grGetcurrentScreen()->selectBoard((int)vp);
+    grGetcurrentScreen()->selectBoard((int)(long)vp);
 }
 
 static void
--- torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp.64bit	2005-05-26 10:29:52.000000000 -0400
+++ torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp	2005-05-26 10:30:50.000000000 -0400
@@ -45,7 +45,7 @@
     tGfuiObject		*object;
     tGfuiScrollList	*scrollist;
     
-    object = gfuiGetObject(GfuiScreen, (int)(sinfo->userData));
+    object = gfuiGetObject(GfuiScreen, (int)(long)(sinfo->userData));
     if (object == NULL) {
 	return;
     }


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- torcs.spec	23 May 2005 00:01:03 -0000	1.7
+++ torcs.spec	26 May 2005 15:19:57 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
 Version: 1.2.3
-Release: 3
+Release: 4
 
 License: GPL
 Group: Amusements/Games
@@ -12,6 +12,7 @@
 Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz
 Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
+Patch0: torcs-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data
 %{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL}
@@ -44,6 +45,8 @@
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
+%patch0 -p1 -b .64bit
+
 
 %build
 %configure
@@ -115,6 +118,9 @@
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 1.2.3-4
+- fix build on 64bit arches
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.3-3
 - rebuild on all arches