ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

xmoto-0.5.9+libpng-1.5 patch

Browse Source 
svn path=/nixpkgs/trunk/; revision=31447
This commit is contained in:
Yury G. Kudryashov 2012-01-08 23:31:31 +00:00
parent d9d74208b5
commit c403364c06
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/xmoto/default.nix
View File

@ -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 = [

26
pkgs/games/xmoto/r3402.patch Normal file
View File

@ -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

8
pkgs/games/xmoto/src-for-default.nix
View File

@ -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";
}

2
pkgs/top-level/all-packages.nix
View File

@ -6186,7 +6186,7 @@ let
xmoto = builderDefsPackage (import ../games/xmoto) {
inherit 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;
};
xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };