From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: Re: [PATCH 2/3] gnu: Add irrlicht. Date: Fri, 05 Sep 2014 15:42:36 -0400 Message-ID: <87y4txq2fn.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> References: <1409943198-858-1-git-send-email-dthompson2@worcester.edu> <1409943198-858-2-git-send-email-dthompson2@worcester.edu> <874mwl3mtp.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPzPF-0001jZ-Vv for guix-devel@gnu.org; Fri, 05 Sep 2014 15:42:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPzP8-0003pF-Ej for guix-devel@gnu.org; Fri, 05 Sep 2014 15:42:49 -0400 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:38443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPzP8-0003mR-4c for guix-devel@gnu.org; Fri, 05 Sep 2014 15:42:42 -0400 Received: by mail-qg0-f48.google.com with SMTP id z107so12151532qgd.7 for ; Fri, 05 Sep 2014 12:42:39 -0700 (PDT) In-Reply-To: <874mwl3mtp.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Eric Bavier Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Eric Bavier writes: > David Thompson writes: > >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let ((prefix (assoc-ref outputs "out"))) > > This should probably be named "out" rather than "prefix" for consistency > with the rest of guix's packages. > Done. >> + (description >> + "3D game engine.") > > Perhaps something more descriptive. Like: > > "The Irrlicht Engine is a high performance realtime 3D engine written in > C++. It is completely cross-platform, using D3D, OpenGL and its own > software renderers, and has all of the state-of-the-art features." > I used just the first sentence. The second sentence mentioned proprietary software (D3D) and sounded too much like marketing. >> + (license bsd-3))) > > It's actually the zlib license. > Damn, you're right. Fixed. Thanks for the feedback. New patch below. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-irrlicht.patch >From db3bc54eb6aa5c42888125ce8bb69447284d03d3 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 5 Sep 2014 13:16:50 -0400 Subject: [PATCH 2/3] gnu: Add irrlicht. * gnu/packages/games.scm (irrlicht): New variable. --- gnu/packages/games.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e6ef402..3faf892 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages games) + #:use-module (srfi srfi-1) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -43,6 +44,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages linux) + #:use-module (gnu packages zip) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake)) @@ -353,3 +355,49 @@ through the EFX extension. It also facilitates streaming audio, multi-channel buffers, and audio capture.") (home-page "http://kcat.strangesoft.net/openal.html") (license lgpl2.0+))) + +(define-public irrlicht + (package + (name "irrlicht") + (version "1.8.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/irrlicht/Irrlicht%20SDK/" + (string-join (take (string-split version #\.) 2) ".") + "/" version "/irrlicht-" version ".zip")) + (sha256 + (base32 + "0yz9lvsc8aqk8wj4rnpanxrw90gqpwn9w5hxp94r8hnm2q0vjjw1")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-cons-after + 'unpack 'fix-build-env + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("INSTALL_DIR = /usr/local/lib") + (string-append "INSTALL_DIR = " out "/lib"))) + ;; The Makefile assumes these directories exist. + (mkdir-p (string-append out "/lib")) + (mkdir-p (string-append out "/include")))) + (alist-replace + 'unpack + (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/"))) + ;; No configure script + (alist-delete 'configure %standard-phases))) + #:tests? #f ; no check target + #:make-flags '("CC=gcc" "sharedlib"))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("mesa" ,mesa))) + (synopsis "3D game engine") + (description + "The Irrlicht Engine is a high performance realtime 3D engine written in +C++.") + (home-page "http://irrlicht.sourceforge.net/") + (license zlib))) -- 2.1.0 --=-=-= Content-Type: text/plain -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--