From f90b2dbdb715b4eb255b32f7843b1e830a285bda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Oct 2016 08:48:06 +0200 Subject: 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. --- gnu/local.mk | 1 - gnu/packages/games.scm | 20 +++++-------- gnu/packages/patches/irrlicht-mesa-10.patch | 46 ----------------------------- 3 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/irrlicht-mesa-10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9079b42916..c80b213078 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -604,7 +604,6 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inkscape-drop-wait-for-targets.patch \ - %D%/packages/patches/irrlicht-mesa-10.patch \ %D%/packages/patches/jansson-CVE-2016-4425.patch \ %D%/packages/patches/jasper-CVE-2007-2721.patch \ %D%/packages/patches/jasper-CVE-2008-3520.patch \ 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 -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 - #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 - #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 - #include -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -@@ -60,6 +63,7 @@ - #include - #include - #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" -- cgit v1.2.3