rpms/torcs/devel TORCS-1.2.3-64bit.patch, NONE, 1.1 torcs.spec, 1.8, 1.9 torcs-64bit.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Aug 3 14:43:55 UTC 2005
Author: thias
Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10039
Modified Files:
torcs.spec
Added Files:
TORCS-1.2.3-64bit.patch
Removed Files:
torcs-64bit.patch
Log Message:
Fix available drivers and add cars-extras for the default quick race to work, add olethros that got missed previously.
TORCS-1.2.3-64bit.patch:
--- NEW FILE TORCS-1.2.3-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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- torcs.spec 26 May 2005 15:19:57 -0000 1.8
+++ torcs.spec 3 Aug 2005 14:43:53 -0000 1.9
@@ -3,8 +3,7 @@
Summary: The Open Racing Car Simulator
Name: torcs
Version: 1.2.3
-Release: 4
-
+Release: 5%{?dist}
License: GPL
Group: Amusements/Games
URL: http://torcs.org/
@@ -12,12 +11,11 @@
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
+Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
+Patch0: TORCS-1.2.3-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs-data
-%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL}
-%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL}
-BuildRequires: gcc-c++, plib-devel >= 1.8.3, freeglut-devel
+Requires: torcs-data, torcs-data-cars-extra
+BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3
BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
BuildRequires: desktop-file-utils
@@ -30,7 +28,7 @@
%package robots
Summary: The Open Racing Car Simulator robots
Group: Amusements/Games
-Requires: %{name}
+Requires: %{name} = %{version}
%description robots
TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
@@ -41,12 +39,11 @@
%prep
-%setup -a 1 -a 2 -a 3
+%setup -a 1 -a 2 -a 3 -a 4
+%patch0 -p1 -b .64bit
# Put the drivers back where they belong
%{__mv} %{name}-%{version}/src/drivers/* src/drivers/
-%patch0 -p1 -b .64bit
-
%build
%configure
@@ -65,7 +62,7 @@
Name=TORCS
Comment=The Open Racing Car Simulator
Exec=torcs
-Icon=torcs.png
+Icon=%{name}.png
Terminal=false
Type=Application
Encoding=UTF-8
@@ -78,7 +75,7 @@
%{name}.desktop
# We need this for proper automatic stripping to take place (still in 1.2.3)
-find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x
+find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
%clean
@@ -89,42 +86,86 @@
%defattr(-, root, root, 0755)
%doc CHANGELOG.html COPYING README.linux TODO.html
%{_bindir}/*
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/drivers
-%{_libdir}/%{name}/drivers/human
-%{_libdir}/%{name}/lib
-%{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}/drivers/
+# From main
+%{_libdir}/%{name}/drivers/human/
+# From robots-base
+%{_libdir}/%{name}/drivers/cylos1/
+%{_libdir}/%{name}/drivers/damned/
+%{_libdir}/%{name}/drivers/inferno/
+%{_libdir}/%{name}/drivers/inferno2/
+%{_libdir}/%{name}/drivers/lliaw/
+%{_libdir}/%{name}/drivers/tanhoj/
+%{_libdir}/%{name}/drivers/tita/
+%{_libdir}/%{name}/lib/
+%{_libdir}/%{name}/modules/
%{_libdir}/%{name}/setup_linux.sh
%{_libdir}/%{name}/*-bin
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%dir %{_datadir}/games/%{name}
-%{_datadir}/games/%{name}/config
-%dir %{_datadir}/games/%{name}/drivers
-%{_datadir}/games/%{name}/drivers/human
-%{_datadir}/games/%{name}/results
-%{_datadir}/games/%{name}/telemetry
+%dir %{_datadir}/games/%{name}/
+%{_datadir}/games/%{name}/config/
+%dir %{_datadir}/games/%{name}/drivers/
+# From main
+%{_datadir}/games/%{name}/drivers/human/
+# From robots-base
+%{_datadir}/games/%{name}/drivers/cylos1/
+%{_datadir}/games/%{name}/drivers/damned/
+%{_datadir}/games/%{name}/drivers/inferno/
+%{_datadir}/games/%{name}/drivers/inferno2/
+%{_datadir}/games/%{name}/drivers/lliaw/
+%{_datadir}/games/%{name}/drivers/tanhoj/
+%{_datadir}/games/%{name}/drivers/tita/
+%{_datadir}/games/%{name}/results/
+%{_datadir}/games/%{name}/telemetry/
%{_datadir}/pixmaps/%{name}.png
%files robots
%defattr(-, root, root, 0755)
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/drivers
-# Easier this way, since we package them all-minus-one in ;-)
-%exclude %{_libdir}/%{name}/drivers/human
-%dir %{_datadir}/games/%{name}
-%{_datadir}/games/%{name}/drivers
-%exclude %{_datadir}/games/%{name}/drivers/human
+%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}/drivers/
+# From robots-berniw
+%{_libdir}/%{name}/drivers/berniw/
+%{_libdir}/%{name}/drivers/berniw2/
+%{_libdir}/%{name}/drivers/berniw3/
+%{_libdir}/%{name}/drivers/sparkle/
+# From robots-bt
+%{_libdir}/%{name}/drivers/bt/
+# From robots-olethros
+%{_libdir}/%{name}/drivers/olethros/
+%dir %{_datadir}/games/%{name}/
+%dir %{_datadir}/games/%{name}/drivers/
+# From robots-berniw
+%{_datadir}/games/%{name}/drivers/berniw/
+%{_datadir}/games/%{name}/drivers/berniw2/
+%{_datadir}/games/%{name}/drivers/berniw3/
+%{_datadir}/games/%{name}/drivers/sparkle/
+# From robots-bt
+%{_datadir}/games/%{name}/drivers/bt/
+# From robots-olethros
+%{_datadir}/games/%{name}/drivers/olethros/
%changelog
+* Wed Aug 3 2005 Matthias Saou <http://freshrpms.net/> 1.2.3-5
+- Move base robots from the sub-package to the main one to have the default
+ quick race work. Hopefully this will change in later versions if the game
+ checks which drivers are available before starting the default quick race.
+- Add torcs-data-cars-extra requirement for the same reason as above : Without,
+ none of the drivers of the default quick race have a car and the game exits.
+- Add olethros robots.
+- Change %%files section to explicitly list all robots since the above change
+ moved many of them to the main package, not just "human".
+- Renamed 64bit patch to TORCS-1.2.3-64bit.patch.
+
* 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
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.3-2
- rebuilt
* Mon Feb 7 2005 Matthias Saou <http://freshrpms.net/> 1.2.3-1
--- torcs-64bit.patch DELETED ---
More information about the fedora-extras-commits
mailing list