diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2016-10-17 08:48:06 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2016-10-17 17:11:51 +0200 |
| commit | f90b2dbdb715b4eb255b32f7843b1e830a285bda (patch) | |
| tree | bf1316ee862511dee1d78edc8aa9c8953a642d57 /gnu/packages | |
| parent | b8a35ccea6c179c2ea259e8fe761007c7f94be1b (diff) | |
| download | guix-f90b2dbdb715b4eb255b32f7843b1e830a285bda.tar guix-f90b2dbdb715b4eb255b32f7843b1e830a285bda.tar.gz | |
gnu: irrlicht: Update to 1.8.4.
* gnu/packages/games.scm (irrlicht): Update to 1.8.4.
[arguments]: Delete phase "apply-patch/mesa-10-fix".
[native-inputs]: Remove "patch/mesa-10-fix".
* gnu/packages/patches/irrlicht-mesa-10.patch: Delete file.
* gnu/local.mk (dist_path_DATA): Remove irrlicht patch.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/games.scm | 20 | ||||
| -rw-r--r-- | gnu/packages/patches/irrlicht-mesa-10.patch | 46 |
2 files changed, 7 insertions, 59 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index edd3651912..17ca12bce6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -545,7 +545,7 @@ are primarily in English, however some in other languages are provided.") (define-public irrlicht (package (name "irrlicht") - (version "1.8.1") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append @@ -554,10 +554,10 @@ are primarily in English, however some in other languages are provided.") "/" version "/irrlicht-" version ".zip")) (sha256 (base32 - "0yz9lvsc8aqk8wj4rnpanxrw90gqpwn9w5hxp94r8hnm2q0vjjw1")))) + "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after + `(#:phases (alist-cons-after 'unpack 'fix-build-env (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -572,19 +572,13 @@ are primarily in English, however some in other languages are provided.") (lambda* (#:key source #:allow-other-keys) (and (zero? (system* "unzip" source)) ;; The actual source is buried a few directories deep. - (chdir "irrlicht-1.8.1/source/Irrlicht/"))) - (alist-cons-after - 'unpack 'apply-patch/mesa-10-fix - (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "patch" "--force" "-p3" "-i" - (assoc-ref inputs "patch/mesa-10-fix")))) - ;; No configure script - (alist-delete 'configure %standard-phases)))) + (chdir (string-append "irrlicht-" ,version "/source/Irrlicht/")))) + ;; No configure script + (alist-delete 'configure %standard-phases))) #:tests? #f ; no check target #:make-flags '("CC=gcc" "sharedlib"))) (native-inputs - `(("patch/mesa-10-fix" ,(search-patch "irrlicht-mesa-10.patch")) - ("unzip" ,unzip))) + `(("unzip" ,unzip))) (inputs `(("mesa" ,mesa) ("glu" ,glu))) diff --git a/gnu/packages/patches/irrlicht-mesa-10.patch b/gnu/packages/patches/irrlicht-mesa-10.patch deleted file mode 100644 index b567c384a3..0000000000 --- a/gnu/packages/patches/irrlicht-mesa-10.patch +++ /dev/null @@ -1,46 +0,0 @@ -Patch to work around incompatibility between irrlicht-1.8.1 and mesa-10.x. -Upstream bug (fixed in trunk): http://sourceforge.net/p/irrlicht/bugs/429/ -Upstream fix: http://sourceforge.net/p/irrlicht/code/4810 -This patch copied from: -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch?view=markup - -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"
|