rpms/maniadrive/F-10 maniadrive-1.2-fix-ode-assert.h, NONE, 1.1 maniadrive-1.2-php-5.2.8-fix.patch, NONE, 1.1 maniadrive.spec, 1.10, 1.11
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Feb 15 21:06:23 UTC 2009
- Previous message (by thread): rpms/maniadrive/devel maniadrive-1.2-fix-ode-assert.h, NONE, 1.1 maniadrive-1.2-php-5.2.8-fix.patch, NONE, 1.1 maniadrive.spec, 1.10, 1.11
- Next message (by thread): rpms/maniadrive/F-9 maniadrive-1.2-fix-ode-assert.h, NONE, 1.1 maniadrive-1.2-php-5.2.8-fix.patch, NONE, 1.1 maniadrive.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/maniadrive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28019
Modified Files:
maniadrive.spec
Added Files:
maniadrive-1.2-fix-ode-assert.h
maniadrive-1.2-php-5.2.8-fix.patch
Log Message:
* Sun Feb 15 2009 Hans de Goede <hdegoede at redhat.com> 1.2-12
- Fix maniadrive crashing with php 5.2.8 (and later)
- Fix maniadrive triggering an assert in the latest ode
--- NEW FILE maniadrive-1.2-fix-ode-assert.h ---
diff -up ManiaDrive-1.2-src/raydium/config.h~ ManiaDrive-1.2-src/raydium/config.h
--- ManiaDrive-1.2-src/raydium/config.h~ 2006-08-08 18:58:51.000000000 +0200
+++ ManiaDrive-1.2-src/raydium/config.h 2009-02-15 21:47:11.000000000 +0100
@@ -17,7 +17,7 @@
#ifndef NO_ODE_SUPPORT
// Enable ODE physics support
#define ODE_SUPPORT
-#define ODE_QUICKSTEP
+//#define ODE_QUICKSTEP
#define ODE_PREDICTION
//#define ODE_NETWORK_GHOSTS
#endif
maniadrive-1.2-php-5.2.8-fix.patch:
--- NEW FILE maniadrive-1.2-php-5.2.8-fix.patch ---
--- ManiaDrive-1.2-src/raydium/php.c 2009-02-15 21:15:03.000000000 +0100
+++ ManiaDrive-1.2-src.new/raydium/php.c 2009-02-15 20:40:01.000000000 +0100
@@ -119,7 +119,7 @@
FILE *fp;
char suffix[32];
zval *vars[RAYDIUM_MAX_REG_VARIABLES];
- zend_file_handle file_handle;
+ zend_file_handle file_handle = { 0, };
zend_llist global_vars;
int i,nvars;
@@ -168,10 +168,10 @@
raydium_log("php: ERROR: cannot post-open '%s' file",name);
return 0;
}
- file_handle.filename=name;
+ file_handle.filename = name;
file_handle.type = ZEND_HANDLE_FP;
file_handle.free_filename = 0;
- file_handle.opened_path = NULL;
+ file_handle.opened_path = estrdup(name);
// if(php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
@@ -280,7 +281,7 @@
}
php_request_shutdown(NULL);
- raydium_sapi_module.shutdown(&raydium_sapi_module);
+ php_module_shutdown(TSRMLS_C);
return 1;
}
Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/F-10/maniadrive.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maniadrive.spec 3 Jan 2009 08:32:34 -0000 1.10
+++ maniadrive.spec 15 Feb 2009 21:05:52 -0000 1.11
@@ -1,6 +1,6 @@
Name: maniadrive
Version: 1.2
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: 3D stunt driving game
Group: Amusements/Games
License: GPLv2+
@@ -10,6 +10,8 @@
Source2: %{name}.desktop
Source3: %{name}-track-editor.desktop
Patch0: %{name}-1.2-fixes.patch
+Patch1: %{name}-1.2-php-5.2.8-fix.patch
+Patch2: %{name}-1.2-fix-ode-assert.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glew-devel ode-devel php-devel php-embedded-devel
BuildRequires: freealut-devel libjpeg-devel libXinerama-devel
@@ -67,6 +69,8 @@
%prep
%setup -q -n ManiaDrive-%{version}-src
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
rm -r rayphp/r3s rayphp/README
@@ -161,6 +165,10 @@
%changelog
+* Sun Feb 15 2009 Hans de Goede <hdegoede at redhat.com> 1.2-12
+- Fix maniadrive crashing with php 5.2.8 (and later)
+- Fix maniadrive triggering an assert in the latest ode
+
* Wed Dec 17 2008 Hans de Goede <hdegoede at redhat.com> 1.2-11
- Rebuild for new php version
- Previous message (by thread): rpms/maniadrive/devel maniadrive-1.2-fix-ode-assert.h, NONE, 1.1 maniadrive-1.2-php-5.2.8-fix.patch, NONE, 1.1 maniadrive.spec, 1.10, 1.11
- Next message (by thread): rpms/maniadrive/F-9 maniadrive-1.2-fix-ode-assert.h, NONE, 1.1 maniadrive-1.2-php-5.2.8-fix.patch, NONE, 1.1 maniadrive.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list