Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Rich Mattes
e41fbb4123 Rebuild for new bullet
- Add fix for build error with new bullet
2012-10-15 22:37:52 -04:00
2 changed files with 19 additions and 1 deletions

View file

@ -0,0 +1,12 @@
diff -up ./src/dynamicsworld.cpp.bullet281 ./src/dynamicsworld.cpp
--- ./src/dynamicsworld.cpp.bullet281 2012-10-13 14:18:39.646677972 -0400
+++ ./src/dynamicsworld.cpp 2012-10-13 14:18:52.874174967 -0400
@@ -101,7 +101,7 @@ bool DynamicsWorld::castRay(
int patch_id = -1;
const BEZIER * b = 0;
const TRACKSURFACE * s = TRACKSURFACE::None();
- btCollisionObject * c = 0;
+ const btCollisionObject * c = 0;
MyRayResultCallback ray(origin, p, caster);
rayTest(origin, p, ray);

View file

@ -1,6 +1,6 @@
Name: vdrift
Version: 20111022
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Driving/drift racing simulation
Group: Amusements/Games
@ -26,6 +26,7 @@ Patch4: vdrift-20090215-joepack-includes.patch
# patch to unbundle bullet, not upstreamable
#Patch6: vdrift-2010-06-30-unbundle.patch
#Patch7: vdrift-2011-09-09-curl.patch
Patch8: vdrift-20111022-constfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
@ -82,6 +83,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript
#%patch5 -p0
#%patch6 -p0
#%patch7 -p0
%patch8 -p0
#/bin/chmod -x src/gamestate.cpp
#/bin/chmod -x src/logo.cpp
@ -145,6 +147,10 @@ rm -rf %{buildroot}
%{_datadir}/vdrift
%changelog
* Sat Oct 13 2012 Rich Mattes <richmattes@gmail.com> - 20111022-4
- Rebuild for new bullet
- Add fix for build error with new bullet
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20111022-3
- Rebuilt for c++ ABI breakage