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

Merge pull request #28711 from danielfullmer/irrlicht-1.8.4

Browse Source 
irrlicht: 1.8-svn-5104 -> 1.8.4
This commit is contained in:
Jörg Thalheim 2017-08-29 22:44:48 +01:00 committed by GitHub
commit 1160be027b
4 changed files with 6 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,13 @@
{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }:
stdenv.mkDerivation rec {
name = "irrlicht-${version}-svn-${revision}";
version = "1.8";
revision = "5104"; # newest revision as of 05-16-15
name = "irrlicht-${version}";
version = "1.8.4";
src = fetchsvn {
url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
rev = "${revision}";
sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
src = fetchzip {
url = "mirror://sourceforge/irrlicht/${name}.zip";
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
};
preConfigure = ''

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

@ -1,40 +0,0 @@
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"

46
pkgs/development/libraries/irrlicht/irrlicht3843.nix
View File

@ -1,46 +0,0 @@
{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
stdenv.mkDerivation rec {
# Version 3843 is required for supertuxkart
name = "irrlicht-1.8-svn-3843";
src = fetchsvn {
url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
rev = 3843;
sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
};
patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
postPatch = ''
sed -i /stdcall-alias/d source/Irrlicht/Makefile
'';
preConfigure = ''
cd source/Irrlicht
'';
buildPhase = ''
make sharedlib NDEBUG=1
'';
preInstall = ''
sed -i s,/usr/local/lib,$out/lib, Makefile
mkdir -p $out/lib
'';
postInstall = ''
ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
'';
buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
meta = {
homepage = http://irrlicht.sourceforge.net/;
license = stdenv.lib.licenses.zlib;
description = "Open source high performance realtime 3D engine written in C++";
platforms = stdenv.lib.platforms.linux;
};
}

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

@ -8438,7 +8438,6 @@ with pkgs;
ip2location-c = callPackage ../development/libraries/ip2location-c { };
irrlicht = callPackage ../development/libraries/irrlicht { };
irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
isocodes = callPackage ../development/libraries/iso-codes { };