diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 23:31:31 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 23:31:31 +0000 |
| commit | c403364c0607d61f15159b50a5de6e4348473676 (patch) | |
| tree | f3f436eea19c1f221b63741851afced4c59832c8 /pkgs/games/xmoto | |
| parent | d9d74208b59f5935e5241c8ed1ddf7e7a666ed98 (diff) | |
| download | nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar.gz nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar.bz2 nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar.lz nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar.xz nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.tar.zst nixpkgs-c403364c0607d61f15159b50a5de6e4348473676.zip | |
xmoto-0.5.9+libpng-1.5 patch
svn path=/nixpkgs/trunk/; revision=31447
Diffstat (limited to 'pkgs/games/xmoto')
| -rw-r--r-- | pkgs/games/xmoto/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/xmoto/r3402.patch | 26 | ||||
| -rw-r--r-- | pkgs/games/xmoto/src-for-default.nix | 8 |
3 files changed, 33 insertions, 5 deletions
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7ddbcc7de0f..af2e1e94bdc 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -4,7 +4,7 @@ let buildInputs = with a; [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir + lua5 ode libxdg_basedir libxml2 ]; in rec { @@ -17,6 +17,8 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"]; + patches = [ ./r3402.patch ]; + meta = { description = "X-Moto - obstacled race game"; maintainers = [ diff --git a/pkgs/games/xmoto/r3402.patch b/pkgs/games/xmoto/r3402.patch new file mode 100644 index 00000000000..787e5625b5f --- /dev/null +++ b/pkgs/games/xmoto/r3402.patch @@ -0,0 +1,26 @@ +Index: a/src/image/tim_png.cpp +=================================================================== +--- a/src/image/tim_png.cpp (revision 3401) ++++ b/src/image/tim_png.cpp (revision 3402) +@@ -25,7 +25,8 @@ + #include <stdio.h> + #include <string.h> + #include "tim.h" +-#include "png.h" ++#include <png.h> ++#include <zlib.h> + + /*============================================================================== + Types +Index: ChangeLog +=================================================================== +--- a/ChangeLog (revision 3401) ++++ b/ChangeLog (revision 3402) +@@ -1,3 +1,7 @@ ++X-Moto 0.5.10 2012- ++-------------------------------- ++ * libpng patch by Kelly Anderson ++ + X-Moto 0.5.9 2011-11-13 + -------------------------------- + * fix a compilation error with libxml diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index d879f486d03..7d85cdbe528 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.7"; - name="xmoto-0.5.7"; - hash="19pwxjgvajv2img3sz8rd0c37d1gsidscwwjbm4jyxhahgg33mks"; + version="0.5.9"; + name="xmoto-0.5.9"; + hash="1r1kl3w2scncw754lgsfa7i6hh4mg39zc3bcvd1iqcmdfr25gmvl"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.7/xmoto-0.5.7-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz"; } |