RFC : Update OpenTTD & OpenGFX

  • Done
  • quality assurance status badge
Details
2 participants
  • Nicolas Goaziou
  • Vincent Legoll
Owner
unassigned
Submitted by
Vincent Legoll
Severity
normal

Debbugs page

Vincent Legoll wrote 5 years ago
(address . guix-patches@gnu.org)
CAEwRq=rVtS_xxaaMEqnhDc-inTdv0ix85WfcKRzW7PotVPB=cg@mail.gmail.com
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
Vincent Legoll wrote 5 years ago
[PATCH 1/2] gnu: openttd-opengfx: Update to 0.6.0.
(address . 40560@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200411182343.4938-1-vincent.legoll@gmail.com
* 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(-)

Toggle diff (33 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 2/2] gnu: openttd: Update to 1.10.0.
(address . 40560@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200411182343.4938-2-vincent.legoll@gmail.com
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(-)

Toggle diff (30 lines)
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
Vincent Legoll wrote 5 years ago
Tested
(address . 40560@debbugs.gnu.org)
708a6234-a50d-c020-7414-939a6eb69ebe@gmail.com
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...
Nicolas Goaziou wrote 5 years ago
Re: [bug#40560] RFC : Update OpenTTD & OpenGFX
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40560-done@debbugs.gnu.org)
875ze42572.fsf@nicolasgoaziou.fr
Hello,

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

Toggle quote (3 lines)
> here is an update to latest released
> OpenTTD & deps.

Thank you!

Toggle quote (3 lines)
> 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.

Toggle quote (3 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 40560@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 40560
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help