From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albin Subject: [PATCH] gnu: Add openttd-engine Date: Wed, 13 Apr 2016 04:09:15 +0200 Message-ID: <570DAA4B.2000409@fripost.org> References: <570C2836.7030100@fripost.org> <20160412010929.GA22784@jasmine> <570D0C58.5050905@fripost.org> <87d1puivr2.fsf@gmail.com> <20160412182458.GB3241@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RfTSvBDlhdM55uDEx4XHrAAxDV7JEQVJf" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqAFO-0003rN-As for guix-devel@gnu.org; Tue, 12 Apr 2016 22:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqAFJ-0007y7-Or for guix-devel@gnu.org; Tue, 12 Apr 2016 22:09:38 -0400 Received: from giraff.fripost.org ([178.16.208.44]:54814 helo=outgoing.fripost.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqAFJ-0007xZ-AP for guix-devel@gnu.org; Tue, 12 Apr 2016 22:09:33 -0400 In-Reply-To: <20160412182458.GB3241@jasmine> 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" To: Leo Famulari , Alex Kost Cc: guix-devel@gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RfTSvBDlhdM55uDEx4XHrAAxDV7JEQVJf Content-Type: multipart/mixed; boundary="AEvC7WAsjdNfpXLlJJml4QuTM9euOLxhb" From: Albin To: Leo Famulari , Alex Kost Cc: guix-devel@gnu.org Message-ID: <570DAA4B.2000409@fripost.org> Subject: [PATCH] gnu: Add openttd-engine References: <570C2836.7030100@fripost.org> <20160412010929.GA22784@jasmine> <570D0C58.5050905@fripost.org> <87d1puivr2.fsf@gmail.com> <20160412182458.GB3241@jasmine> In-Reply-To: <20160412182458.GB3241@jasmine> --AEvC7WAsjdNfpXLlJJml4QuTM9euOLxhb Content-Type: multipart/mixed; boundary="------------060706080401040307010700" This is a multi-part message in MIME format. --------------060706080401040307010700 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Here is a new patch for OpenTTD. I have * changed the name to openttd-engine (so that we can later add game data as companion packages), * removed the "Unix"->"GNU" hack, * enabled 'lzo', * added more licenses, * rephrased a few comments, * modified the commit message. Best regards, Albin --------------060706080401040307010700 Content-Type: text/x-patch; name="0001-gnu-Add-openttd-engine.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-openttd-engine.patch" =46rom 15ca9395ef42c89a0d4d3a3f9f9212e1cb0f1db6 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Albin=3D20S=3DC3=3DB6derqvist?=3D Date: Wed, 13 Apr 2016 03:50:36 +0200 Subject: [PATCH] gnu: Add openttd-engine. * gnu/packages/games.scm (openttd-engine): New variable. --- gnu/packages/games.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 653e0c7..4338653 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -17,6 +17,7 @@ ;;; Copyright =C2=A9 2016 Rodger Fox ;;; Copyright =C2=A9 2016 Manolis Fragkiskos Ragkousis ;;; Copyright =C2=A9 2016 Nils Gillmann +;;; Copyright =C2=A9 2016 Albin S=C3=B6derqvist ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages haskell) #:use-module (gnu packages mp3) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) @@ -1859,6 +1861,67 @@ and a game metadata scraper.") (home-page "http://www.emulationstation.org") (license license:expat))) =20 +(define-public openttd-engine + (package + (name "openttd-engine") + (version "1.6.0") + (source + (origin (method url-fetch) + (uri (string-append "http://binaries.openttd.org/releases/"= + version "/openttd-" version "-source.ta= r.xz")) + (sha256 + (base32 + "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; The DOS port contains proprietary software. + (delete-file-recursively "os/dos"))))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;; no "check" target. + #:phases + (modify-phases %standard-phases + ;; The build process fails if the configure script is passed th= e + ;; option "--enable-fast-install". + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lzo (assoc-ref inputs "lzo"))) + (zero? + (system* "./configure" + (string-append "--prefix=3D" out) + ;; Provide the "lzo" path. + (string-append "--with-liblzo2=3D" + lzo "/lib/liblzo2.a") + ;; Put the symlink to the binary in + ;; ".guix-profile/bin/". + "--binary-dir=3Dbin")))))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("allegro" ,allegro-4) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("lzo" ,lzo) + ("sdl" ,sdl) + ("xz" ,xz) + ("zlib" ,zlib))) + (synopsis "Transportation economics simulator") + (description "OpenTTD is a game in which you transport goods and +passengers by land, water and air. It is a re-implementation of Transpo= rt +Tycoon Deluxe with many enhancements including multiplayer mode, +internationalization support, conditional orders and the ability to clon= e, +autoreplace and autoupdate vehicles.") + (home-page "http://openttd.org/") + ;; This package is GPLv2, except for a few files located in + ;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Z= lib + ;; licenses. In addition, this software contains an in-game downloa= der + ;; from which the user may find non-functional data licensed under + ;; different terms. + (license (list license:bsd-3 license:gpl2 license:lgpl2.1+ license:z= lib)))) + (define-public pinball (package (name "pinball") --=20 2.6.3 --------------060706080401040307010700-- --AEvC7WAsjdNfpXLlJJml4QuTM9euOLxhb-- --RfTSvBDlhdM55uDEx4XHrAAxDV7JEQVJf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXDapRAAoJEJ9oLhm3wRsi8B4H/0ImCCaabN2bCt3378CBgwig IJvANBlrEdsP2KoS1+tEyl7zdh17Gbz/vJfa/KwB1/HLDc7j9WiFnX21kWlhBHWC 53SORkS/QVUtC/AU6tQOkGdRwqM9yCkaE/6iXdz4MKIzTLvxvIY9EwV1V4Iy5QXB 3w1SCQ9JVBVc2bHthkpBylfmQnwOwZhCpCOokiIYd2Q1tjUPcjqTD0AGR0/pP4O7 G5Jxp4+mJu3v38dx/5q6fqzI2xVGs8/nlHUECowXjGolDxDeD+zyJIZTDAZKU+Fb AVJo40js/n3MeyrbHHUvcbvTfPcfWlFiudP7MqZOfpQxfQZt1fDTYxOSRC4d2O4= =qRlF -----END PGP SIGNATURE----- --RfTSvBDlhdM55uDEx4XHrAAxDV7JEQVJf--