[machineball] Patch and rebuild for new ode.
Jon Ciesla
limb at fedoraproject.org
Fri Aug 24 12:38:46 UTC 2012
commit ca6563387d5f1649c4c2ae16d7c46bc142cd071f
Author: Jon Ciesla <limburgher at gmail.com>
Date: Fri Aug 24 07:37:58 2012 -0500
Patch and rebuild for new ode.
machineball-1.0-ode.patch | 80 +++++++++++++++++++++++++++++++++++++++++++++
machineball.spec | 8 +++-
2 files changed, 86 insertions(+), 2 deletions(-)
---
diff --git a/machineball-1.0-ode.patch b/machineball-1.0-ode.patch
new file mode 100644
index 0000000..eb28e1f
--- /dev/null
+++ b/machineball-1.0-ode.patch
@@ -0,0 +1,80 @@
+--- main.cpp~ 2012-08-20 15:57:06.000000000 -0500
++++ main.cpp 2012-08-20 15:58:14.140799374 -0500
+@@ -9,6 +9,7 @@
+
+ #define ALLEGRO_STATICLINK
+ #include <allegro.h>
++#define dSINGLE
+ #include <ode/ode.h>
+
+ #include <aldumb.h>
+--- menu.cpp~ 2002-12-21 07:33:57.000000000 -0600
++++ menu.cpp 2012-08-20 16:00:46.916795962 -0500
+@@ -19,6 +19,7 @@
+ #include "text.h"
+ #include "timer.h"
+ #include "controls.h"
++#define dSINGLE
+ #include "glode.h"
+ #include "render.h"
+ #include "options.h"
+--- game.cpp~ 2012-08-20 16:01:10.000000000 -0500
++++ game.cpp 2012-08-20 16:04:34.815790847 -0500
+@@ -11,6 +11,7 @@
+ #include <allegro.h>
+ #include <alleggl.h>
+ #include <GL/glu.h>
++#define dSINGLE
+ #include <ode/ode.h>
+ #include <aldumb.h>
+
+--- ball.h~ 2002-12-21 07:31:40.000000000 -0600
++++ ball.h 2012-08-20 16:05:54.673789131 -0500
+@@ -10,6 +10,7 @@
+ #ifndef _BALL_H_
+ #define _BALL_H_
+
++#define dSINGLE
+ #include <ode/ode.h>
+
+ class Ball
+--- glode.h~ 2002-12-21 07:31:40.000000000 -0600
++++ glode.h 2012-08-20 16:07:09.156787409 -0500
+@@ -10,6 +10,7 @@
+ #ifndef _GLODE_H_
+ #define _GLODE_H_
+
++#define dSINGLE
+ #include <ode/ode.h>
+
+ void position_gl(dBodyID b);
+--- court.h~ 2002-12-21 07:31:40.000000000 -0600
++++ court.h 2012-08-20 16:12:22.525780409 -0500
+@@ -10,6 +10,7 @@
+ #ifndef _COURT_H_
+ #define _COURT_H_
+
++#define dSINGLE
+ #include <ode/ode.h>
+
+ // ____0_____
+--- render.cpp~ 2002-12-21 07:31:40.000000000 -0600
++++ render.cpp 2012-08-20 16:13:24.178779052 -0500
+@@ -11,6 +11,7 @@
+ #include <allegro.h>
+ #include <alleggl.h>
+ #include <GL/gl.h>
++#define dSINGLE
+ #include <ode/ode.h>
+
+ #include <stdio.h>
+--- machine.h~ 2002-12-21 07:31:40.000000000 -0600
++++ machine.h 2012-08-20 16:14:29.336777588 -0500
+@@ -10,6 +10,7 @@
+ #ifndef _MACHINE_H_
+ #define _MACHINE_H_
+
++#define dSINGLE
+ #include <ode/ode.h>
+ #include <allegro.h>
+
diff --git a/machineball.spec b/machineball.spec
index 53270a7..8de32db 100644
--- a/machineball.spec
+++ b/machineball.spec
@@ -1,6 +1,6 @@
Name: machineball
Version: 1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: A futuristic ball game with simple rules
Group: Amusements/Games
License: GPL+
@@ -9,6 +9,7 @@ Source0: http://benny.kramekweb.com/%{name}/%{name}-src-%{version}-1.tar.
Source1: machineball.desktop
Patch0: machineball-fixes.patch
Patch1: machineball-config-only-once.patch
+Patch2: machineball-1.0-ode.patch
BuildRequires: alleggl-devel libGLU-devel ode-devel dumb-devel allegro-tools
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -24,7 +25,7 @@ missiles and blast the ball into the goal. Be creative.
%setup -q -n %{name}-src
%patch0 -p1 -z .fixes
%patch1 -p1 -z .cfg-only-once
-
+%patch2 -p0 -z .ode
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -70,6 +71,9 @@ fi
%changelog
+* Mon Aug 20 2012 Jon Ciesla <limburgher at gmail.com> - 1.0-14
+- Patched and rebuilt for new ode.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list