From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albin Subject: Re: [PATCH] gnu: Add openttd-engine Date: Thu, 14 Apr 2016 11:51:00 +0200 Message-ID: <570F6804.8030701@fripost.org> References: <570C2836.7030100@fripost.org> <20160412010929.GA22784@jasmine> <570D0C58.5050905@fripost.org> <87d1puivr2.fsf@gmail.com> <20160412182458.GB3241@jasmine> <570DAA4B.2000409@fripost.org> <87oa9c1ryw.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QmqqoffH37Ef9iS3LA0hO9diPGioqorgM" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqdvm-0004le-KH for guix-devel@gnu.org; Thu, 14 Apr 2016 05:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqdvi-0007Xh-D6 for guix-devel@gnu.org; Thu, 14 Apr 2016 05:51:22 -0400 Received: from giraff.fripost.org ([178.16.208.44]:57363 helo=outgoing.fripost.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqdvh-0007Wo-VQ for guix-devel@gnu.org; Thu, 14 Apr 2016 05:51:18 -0400 In-Reply-To: <87oa9c1ryw.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" To: Alex Kost Cc: guix-devel@gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QmqqoffH37Ef9iS3LA0hO9diPGioqorgM Content-Type: multipart/mixed; boundary="DeQ7jUAFpqgRaE3tpFEj19hJO8hhUUj9g" From: Albin To: Alex Kost Cc: Leo Famulari , guix-devel@gnu.org Message-ID: <570F6804.8030701@fripost.org> Subject: Re: [PATCH] gnu: Add openttd-engine References: <570C2836.7030100@fripost.org> <20160412010929.GA22784@jasmine> <570D0C58.5050905@fripost.org> <87d1puivr2.fsf@gmail.com> <20160412182458.GB3241@jasmine> <570DAA4B.2000409@fripost.org> <87oa9c1ryw.fsf@gmail.com> In-Reply-To: <87oa9c1ryw.fsf@gmail.com> --DeQ7jUAFpqgRaE3tpFEj19hJO8hhUUj9g Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Thanks! Just one little thing: in the TODO, please change "openttd-opensfx" to "openttd-openmsx". This will give the user free GPLv2 licensed music (along with the graphics) and should make a good out-of-the-box experience even without the non-free (NC) opensfx sound effects that I guess we shouldn't distribute directly ourselves. I will work on the additional packages but I can't say when they will be finished. Albin Den 2016-04-14 kl. 11:04, skrev Alex Kost: > Albin (2016-04-13 05:09 +0300) wrote: >=20 >> Here is a new patch for OpenTTD. >> >> I have >> >> * changed the name to openttd-engine (so that we can later add game da= ta >> as companion packages), >=20 > I'm going to make this 'openttd-engine' variable private and to add the= > following lines after it (I'm not sure if I should do it in a separate > commit): >=20 > --8<---------------cut here---------------start------------->8--- > ;; TODO Add 'openttd-opengfx' and 'openttd-opensfx' packages and make > ;; 'openttd' a wrapper around them. The engine is playable by itself, > ;; but it asks a user to download graphics if it's not found. >=20 > (define-public openttd > (package > (inherit openttd-engine) > (name "openttd"))) > --8<---------------cut here---------------end--------------->8--- >=20 > So you are welcome to add these graphics/sound packages if you wish :-)= >=20 >> * removed the "Unix"->"GNU" hack, >> * enabled 'lzo', >> * added more licenses, >> * rephrased a few comments, >> * modified the commit message. >=20 > OK, thanks for your great work on this package! >=20 > I'm going to commit it in a day or two if there will be no other > comments. >=20 > No need to resend the patch, I will adjust it as I mentioned and also > for the following nitpicks: >=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/release= s/" >> + version "/openttd-" version "-source= =2Etar.xz")) >> + (sha256 >> + (base32 >> + "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc"= )) >> + (modules '((guix build utils))) >> + (snippet >> + '(begin >> + ;; The DOS port contains proprietary software. >> + (delete-file-recursively "os/dos"))))) >=20 > No need to use 'begin' here. >=20 >> + (build-system gnu-build-system) >> + (arguments >> + `(#:tests? #f ;; no "check" target. >=20 > It is a convention to use ";" for marginal comments and ";;" for > comments that are placed on separate lines. >=20 >> + #:phases >> + (modify-phases %standard-phases >> + ;; The build process fails if the configure script is passed= the >> + ;; 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/". >=20 > I prefer your previous commentary: >=20 > ;; Put the binary in 'bin' instead of 'games'. >=20 >> + "--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 Tran= sport >> +Tycoon Deluxe with many enhancements including multiplayer mode, >> +internationalization support, conditional orders and the ability to c= lone, >> +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+ an= d Zlib >> + ;; licenses. In addition, this software contains an in-game down= loader >> + ;; from which the user may find non-functional data licensed unde= r >> + ;; different terms. >> + (license (list license:bsd-3 license:gpl2 license:lgpl2.1+ licens= e:zlib)))) >> + >> (define-public pinball >> (package >> (name "pinball") >=20 --DeQ7jUAFpqgRaE3tpFEj19hJO8hhUUj9g-- --QmqqoffH37Ef9iS3LA0hO9diPGioqorgM 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 iQEcBAEBCAAGBQJXD2gKAAoJEJ9oLhm3wRsiZvoH/jcjNGUZXOYplO7M9EhY6KyC pKyUf4C9uM2CEJw+BaCqZhA056l0ptgXH9d5cKHuqyfySb12XW0mL4oD1JtUnI7q WV9oyqQSmMNj9m1taexjwE60f6Ys/nY4v3MXYq/K8uK0zZvKKYgT+t2lmqn04Ey0 xmZsoTi+Uq8D/F3DRkOt8/AhjHSpXa0zAUlDnfGGzd/Xe9u0LkE59TELMxAWP34p 3ESYuD+vqTarrujPvORzWV8vbD/MBBlK3F0+loAgueW06JP2FIgSfjSX1mXihjTR yRcOppp/Vx0Wiyiv8TXfhrtTtJF8g37Rhy66Nw9WQb9Sm+8iDf1p2WNVGZmP07E= =5gZg -----END PGP SIGNATURE----- --QmqqoffH37Ef9iS3LA0hO9diPGioqorgM--