From: Albin <albin@fripost.org>
To: Alex Kost <alezost@gmail.com>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add openttd-engine
Date: Thu, 14 Apr 2016 11:51:00 +0200 [thread overview]
Message-ID: <570F6804.8030701@fripost.org> (raw)
In-Reply-To: <87oa9c1ryw.fsf@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 5066 bytes --]
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:
>
>> 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),
>
> 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):
>
> --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.
>
> (define-public openttd
> (package
> (inherit openttd-engine)
> (name "openttd")))
> --8<---------------cut here---------------end--------------->8---
>
> So you are welcome to add these graphics/sound packages if you wish :-)
>
>> * removed the "Unix"->"GNU" hack,
>> * enabled 'lzo',
>> * added more licenses,
>> * rephrased a few comments,
>> * modified the commit message.
>
> OK, thanks for your great work on this package!
>
> I'm going to commit it in a day or two if there will be no other
> comments.
>
> No need to resend the patch, I will adjust it as I mentioned and also
> for the following nitpicks:
>
> [...]
>> +(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.tar.xz"))
>> + (sha256
>> + (base32
>> + "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc"))
>> + (modules '((guix build utils)))
>> + (snippet
>> + '(begin
>> + ;; The DOS port contains proprietary software.
>> + (delete-file-recursively "os/dos")))))
>
> No need to use 'begin' here.
>
>> + (build-system gnu-build-system)
>> + (arguments
>> + `(#:tests? #f ;; no "check" target.
>
> It is a convention to use ";" for marginal comments and ";;" for
> comments that are placed on separate lines.
>
>> + #: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=" out)
>> + ;; Provide the "lzo" path.
>> + (string-append "--with-liblzo2="
>> + lzo "/lib/liblzo2.a")
>> + ;; Put the symlink to the binary in
>> + ;; ".guix-profile/bin/".
>
> I prefer your previous commentary:
>
> ;; Put the binary in 'bin' instead of 'games'.
>
>> + "--binary-dir=bin"))))))))
>> + (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 Transport
>> +Tycoon Deluxe with many enhancements including multiplayer mode,
>> +internationalization support, conditional orders and the ability to clone,
>> +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 Zlib
>> + ;; licenses. In addition, this software contains an in-game downloader
>> + ;; from which the user may find non-functional data licensed under
>> + ;; different terms.
>> + (license (list license:bsd-3 license:gpl2 license:lgpl2.1+ license:zlib))))
>> +
>> (define-public pinball
>> (package
>> (name "pinball")
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
next prev parent reply other threads:[~2016-04-14 9:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 22:41 [PATCH] gnu: Add openttd Albin
2016-04-12 1:09 ` Leo Famulari
2016-04-12 8:30 ` Alex Kost
2016-04-12 13:09 ` Albin
2016-04-12 14:55 ` Albin
2016-04-12 17:26 ` Alex Kost
2016-04-12 18:24 ` Leo Famulari
2016-04-13 2:09 ` [PATCH] gnu: Add openttd-engine Albin
2016-04-13 2:14 ` Albin
2016-04-14 8:27 ` Alex Kost
2016-04-14 9:04 ` Alex Kost
2016-04-14 9:51 ` Albin [this message]
2016-04-15 8:36 ` Alex Kost
2016-04-12 18:23 ` [PATCH] gnu: Add openttd Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=570F6804.8030701@fripost.org \
--to=albin@fripost.org \
--cc=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).