GNU bug report logs - #40560
RFC : Update OpenTTD & OpenGFX

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40560 in the body.
You can then email your comments to 40560 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: RFC : Update OpenTTD & OpenGFX
Date: Sat, 11 Apr 2020 20:20:25 +0200

Hello,

here is an update to latest released
OpenTTD & deps.

There was a lot of GIMP errors during the build
of opengfx, but it still completed succesfully.

As my guixsd is with display, I cannot test
the resulting packages.

WDYT ?

-- 
Vincent Legoll

Message #8 received at 40560 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40560 <at> debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll <at> gmail.com>
Subject: [PATCH 1/2] gnu: openttd-opengfx: Update to 0.6.0.
Date: Sat, 11 Apr 2020 20:23:42 +0200

* gnu/packages/games.scm (openttd-opengfx)[version]: Update to 0.6.0.
[source]: Change uri to cdn.openttd.org.
[native-inputs]: Add which.
---
 gnu/packages/games.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 31e1936795..5543e46ac8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3034,15 +3034,15 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "0.5.5")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "http://binaries.openttd.org/extra/opengfx/"
+       (uri (string-append "https://cdn.openttd.org/opengfx-releases/"
                            version "/opengfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49"))))
+         "0qxc6gl2gxcrn1np88dnjgbaaakkkx96b13rcmy1spryc8c09hyr"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags (list "CC=gcc"
@@ -3072,6 +3072,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
                      ("gimp" ,gimp)
                      ("grfcodec" ,grfcodec)
                      ("nml" ,nml)
+                     ("which" ,which)
                      ("python" ,python-2)))
     (home-page "http://dev.openttdcoop.org/projects/opengfx")
     (synopsis "Base graphics set for OpenTTD")
-- 
2.26.0

Message #11 received at 40560 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40560 <at> debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll <at> gmail.com>
Subject: [PATCH 2/2] gnu: openttd: Update to 1.10.0.
Date: Sat, 11 Apr 2020 20:23:43 +0200

The os/dos subdirectory has been removed by upstream commit:
fdb804d86bcab8d0529bdf6ca925bed04ad2f047

* gnu/packages/games.scm (openttd)[version]: Update to 1.10.0.
[source]: Change uri to cdn.openttd.org, remove snippet & modules.
---
 gnu/packages/games.scm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5543e46ac8..ba3a199b97 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2971,20 +2971,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.9.3")
+    (version "1.10.0")
     (source
      (origin (method url-fetch)
-             (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
+             (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
              (sha256
               (base32
-               "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
-             (modules '((guix build utils)))
-             (snippet
-              ;; The DOS port contains proprietary software.
-              '(begin
-                 (delete-file-recursively "os/dos")
-                 #t))))
+               "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f              ; no "check" target
-- 
2.26.0

Message #14 received at 40560 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40560 <at> debbugs.gnu.org
Subject: Tested
Date: Sun, 12 Apr 2020 15:28:23 +0200

I changed the guixsd on my old laptop to be xorg+xfce,

then guix copy'ed the 1.10.0 version of openttd there

and tested it lightly, it runs...

Message #19 received at 40560-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Vincent Legoll <vincent.legoll <at> gmail.com>
Cc: 40560-done <at> debbugs.gnu.org
Subject: Re: [bug#40560] RFC : Update OpenTTD & OpenGFX
Date: Sun, 12 Apr 2020 15:40:01 +0200

Hello,

Vincent Legoll <vincent.legoll <at> gmail.com> writes:

> here is an update to latest released
> OpenTTD & deps.

Thank you!

> There was a lot of GIMP errors during the build
> of opengfx, but it still completed succesfully.

I tried to update mypaint-brushes, as it seems related. But GIMP won't
build with mypaint-brushes 2+, so it didn't solve the issue.

> As my guixsd is with display, I cannot test
> the resulting packages.

It works great. I applied your patches as
c492b23fb1c33e9f5d1c1f07e4bb3d364fe36df8 and
842a9d8f56794abe3266be904ad7574a2dc5a286.

Regards,

-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.