[vdrift/f18] Rebuild for new bullet
rmattes
rmattes at fedoraproject.org
Sat Oct 13 20:43:59 UTC 2012
commit 737490fb14fe74d29e4f54493559b8417a2cd65d
Author: Rich Mattes <richmattes at gmail.com>
Date: Sat Oct 13 15:08:11 2012 -0400
Rebuild for new bullet
- Add fix for build error with new bullet
vdrift-20111022-constfix.patch | 12 ++++++++++++
vdrift.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/vdrift-20111022-constfix.patch b/vdrift-20111022-constfix.patch
new file mode 100644
index 0000000..4ddafd4
--- /dev/null
+++ b/vdrift-20111022-constfix.patch
@@ -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);
diff --git a/vdrift.spec b/vdrift.spec
index 231255d..451248e 100644
--- a/vdrift.spec
+++ b/vdrift.spec
@@ -1,6 +1,6 @@
Name: vdrift
Version: 20111022
-Release: 7%{?dist}
+Release: 8%{?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 at gmail.com> - 20111022-8
+- Rebuild for new bullet
+- Add fix for build error with new bullet
+
* Wed Aug 01 2012 Adam Jackson <ajax at redhat.com> - 20111022-7
- Rebuild for new glew
More information about the scm-commits
mailing list