rpms/torcs/devel torcs-1.2.4-extraqualif.patch, NONE, 1.1 torcs-1.2.4-freealutfix.patch, NONE, 1.1 torcs-1.2.4-track_cpp.patch, NONE, 1.1 torcs.spec, 1.11, 1.12

Matthias Saou (thias) fedora-extras-commits at redhat.com
Fri Mar 10 16:34:11 UTC 2006


Author: thias

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

Modified Files:
	torcs.spec 
Added Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-freealutfix.patch 
	torcs-1.2.4-track_cpp.patch 
Log Message:
Fix #179614 and update spec to build with modular X.


torcs-1.2.4-extraqualif.patch:

--- NEW FILE torcs-1.2.4-extraqualif.patch ---
diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h
--- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h	2005-08-24 21:19:47.000000000 +0200
+++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h	2006-03-10 16:50:51.000000000 +0100
@@ -78,7 +78,7 @@ public:
 
     void update(tSituation *s, float Fps);
 
-    void cGrScreen::camDraw(tSituation *s);
+    void camDraw(tSituation *s);
 
     void updateCurrent(tSituation *s);
 

torcs-1.2.4-freealutfix.patch:

--- NEW FILE torcs-1.2.4-freealutfix.patch ---
--- torcs-1.2.4/src/modules/graphic/ssggraph/Makefile.freealutfix	2006-02-01 10:46:38.000000000 -0500
+++ torcs-1.2.4/src/modules/graphic/ssggraph/Makefile	2006-02-01 10:46:56.000000000 -0500
@@ -24,7 +24,7 @@
 
 MODULEDIR = modules/graphic
 
-LIBS      = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal
+LIBS      = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut
 
 SHIPDIR   = config
 

torcs-1.2.4-track_cpp.patch:

--- NEW FILE torcs-1.2.4-track_cpp.patch ---
--- src/tools/trackgen/track.orig.cpp	2005-08-24 14:19:48.000000000 -0500
+++ src/tools/trackgen/track.cpp	2005-10-04 02:15:55.000000000 -0500
@@ -392,7 +392,7 @@
 	    trackvertices[3*nbvert]   = x;			\
 	    trackvertices[3*nbvert+1] = y;			\
 	    trackvertices[3*nbvert+2] = z;			\
-	    trackindices[nbvert]      = nbvert++;		\
+	    trackindices[nbvert]      = nbvert+1;		\
 	}							\
     } while (0)
 
@@ -403,7 +403,7 @@
 	    trackvertices[3*nbvert]   = x;			\
 	    trackvertices[3*nbvert+1] = y;			\
 	    trackvertices[3*nbvert+2] = z;			\
-	    trackindices[nbvert]      = nbvert++;		\
+	    trackindices[nbvert]      = nbvert+1;		\
 	    printf("x=%f y=%f z=%f  u=%f v=%f\n",		\
 		   (tdble)(x), (tdble)(y), (tdble)(z),		\
 		   (tdble)(t1), (tdble)(t2));			\


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torcs.spec	14 Oct 2005 08:30:08 -0000	1.11
+++ torcs.spec	10 Mar 2006 16:34:11 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -12,11 +12,20 @@
 Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
+Patch0: torcs-1.2.4-freealutfix.patch
+Patch1: torcs-1.2.4-track_cpp.patch
+Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
-BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3
+BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel, libXxf86vm-devel, libXrandr-devel, libXrender-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -39,13 +48,21 @@
 
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
+%patch0 -p1 -b .freealutfix
+%patch1 -p0 -b .track_cpp
+%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-%configure
-# Having %{?_smp_mflags} makes the build fail with 1.2.3
+# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+%configure \
+%if %{!?fedora:5}%{?fedora} >= 5
+    --x-includes=%{_includedir} \
+    --x-libraries=%{_libdir}
+%endif
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
 %{__make}
 
 
@@ -145,6 +162,19 @@
 
 
 %changelog
+* Fri Mar 10 2006 Matthias Saou <http://freshrpms.net/> 1.2.4-3
+- Remove patch that disabled checking for openal, since it also disabled
+  linking against it, and caused nasty things to happen.
+- Include track.cpp patch from Debian.
+- Explicitly set X includes and libraries with modular X, since otherwise
+  configure checks fail badly (first libm, then all X libs...).
+- Add missing modular X build requirements.
+- Include patch to fix one extra qualifification error with gcc 4.1.
+
+* Wed Mar  1 2006 Matthias Saou <http://freshrpms.net/> 1.2.4-2
+- Add support for modular X on FC >= 5.
+- Include patches to rebuild against new openal and freealut (#179614).
+
 * Wed Oct 12 2005 Matthias Saou <http://freshrpms.net/> 1.2.4-1
 - Update to 1.2.4.
 - Add torcs-data-tracks-road requirement directly to main torcs.




More information about the fedora-extras-commits mailing list