Updating xmoto

svn path=/nixpkgs/trunk/; revision=23409
This commit is contained in:
Lluís Batlle i Rossell 2010-08-24 19:59:06 +00:00
parent 03ccbe3f78
commit 4ecebb6465
4 changed files with 6 additions and 20 deletions

View File

@ -1,12 +0,0 @@
From debian: https://launchpad.net/ubuntu/karmic/+source/xmoto/0.5.2-2
--- a/src/Replay.cpp
+++ b/src/Replay.cpp
@@ -156,7 +156,7 @@
v_replay.writeBuf(pcData, nDataSize);
/* Chunks */
- v_replay << m_Chunks.size();
+ v_replay << (unsigned int)m_Chunks.size();
for(unsigned int i=0;i<m_Chunks.size();i++) {
v_replay << m_Chunks[i]->nNumStates;
v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize * m_Chunks[i]->nNumStates);

View File

@ -4,7 +4,7 @@ let
buildInputs = with a; [ buildInputs = with a; [
chipmunk sqlite curl zlib bzip2 libjpeg libpng chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
lua5 ode lua5 ode libxdg_basedir
]; ];
in in
rec { rec {
@ -17,8 +17,6 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"]; phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"];
patches = [ ./64bit-ftbs.patch ];
meta = { meta = {
description = "X-Moto - obstacled race game"; description = "X-Moto - obstacled race game";
maintainers = [ maintainers = [

View File

@ -1,9 +1,9 @@
rec { rec {
version="0.5.2"; version="0.5.3";
name="xmoto-0.5.2"; name="xmoto-0.5.3";
hash="13q5b0a1ha5am3p2b7a399ca7vnw4fs82y96aw0n96s3xmw17jd8"; hash="1xqz1x4q75469s1m6qqy5akbh62327p30267ca5ivjff59wpcfyf";
url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.2/xmoto-0.5.2-src.tar.gz"; advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.3/xmoto-0.5.3-src.tar.gz";
} }

View File

@ -4961,7 +4961,7 @@ let
xmoto = builderDefsPackage (import ../games/xmoto) { xmoto = builderDefsPackage (import ../games/xmoto) {
inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
lua5 ode; lua5 ode libxdg_basedir;
}; };
xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };