public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes irrlicht and minetest to work with mesa > 10

Browse Source
This commit is contained in:
Richard Zetterberg 2015-04-03 20:45:50 +02:00
parent 6d4a9fa393
commit 46178f057e
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/irrlicht/default.nix
View File

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
}; };
patchPhase = '' patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
postPatch = ''
sed -i /stdcall-alias/d source/Irrlicht/Makefile sed -i /stdcall-alias/d source/Irrlicht/Makefile
''; '';

40
pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch Normal file
View File

@ -0,0 +1,40 @@
From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@mgail.com>
Date: Wed, 26 Feb 2014 11:13:03 +1100
Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
problems.
--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
@@ -21,6 +21,7 @@
#endif
#include <GL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#include "wglext.h"
@@ -35,6 +36,7 @@
#endif
#include <OpenGL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
@@ -48,6 +50,7 @@
#define NO_SDL_GLEXT
#include <SDL/SDL_video.h>
#include <SDL/SDL_opengl.h>
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -60,6 +63,7 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
#include "glxext.h"

2
pkgs/games/minetest/default.nix
View File

@ -7,10 +7,12 @@ let
src = fetchgit { src = fetchgit {
url = "https://github.com/celeron55/minetest.git"; url = "https://github.com/celeron55/minetest.git";
rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8";
sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1";
}; };
data = fetchgit { data = fetchgit {
url = "https://github.com/celeron55/minetest_game.git"; url = "https://github.com/celeron55/minetest_game.git";
rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; rev = "3928eccf74af0288d12ffb14f8222fae479bc06b";
sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif";
}; };
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {