* [bug#48613] [PATCH] gnu: openttd: update to 1.11.2
@ 2021-05-23 17:27 Solene Rapenne via Guix-patches via
2021-05-24 8:34 ` [bug#48613] openttd: update to 1.11.2 - not mangled patch Solene Rapenne via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: Solene Rapenne via Guix-patches via @ 2021-05-23 17:27 UTC (permalink / raw)
To: 48613
- the build system switched from GNU configure to cmake
- tests enabled by copying the assets files before check step
---
gnu/packages/games.scm | 54 +++++++++++++-----------------------------
1 file changed, 17 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 24e487a2b8..e83911a2cd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4317,35 +4317,15 @@ world}, @uref{http://evolonline.org, Evol
Online} and (define openttd-engine
(package
(name "openttd-engine")
- (version "1.10.3")
+ (version "1.11.2")
(source
(origin (method url-fetch)
(uri (string-append
"https://cdn.openttd.org/openttd-releases/" version "/openttd-" version
"-source.tar.xz")) (sha256
(base32
-
"0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"))))
- (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
the
- ;; option "--enable-fast-install".
- (replace 'configure
- (lambda* (#:key inputs outputs (configure-flags '())
- #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (lzo (assoc-ref inputs "lzo")))
- (apply invoke "./configure"
- (string-append "--prefix=" out)
- ;; Provide the "lzo" path.
- (string-append "--with-liblzo2="
- lzo "/lib/liblzo2.a")
- ;; Put the binary in 'bin' instead of 'games'.
- "--binary-dir=bin"
- configure-flags)))))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+
"0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
+ (build-system cmake-build-system)
(inputs
`(("allegro" ,allegro)
("fontconfig" ,fontconfig)
@@ -4511,20 +4491,20 @@ Transport Tycoon Deluxe.")
(inherit openttd-engine)
(name "openttd")
(arguments
- `(#:configure-flags
- (list (string-append "--with-midi=" (assoc-ref %build-inputs
"timidity++")
- "/bin/timidity"))
- ,@(substitute-keyword-arguments (package-arguments
openttd-engine)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'install 'install-data
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (for-each
- (lambda (input)
- (copy-recursively (assoc-ref inputs input)
- (assoc-ref outputs "out")))
- (list "opengfx" "openmsx" "opensfx"))
- #t)))))))
+ `(
+ #:configure-flags
+ (let* ((out (assoc-ref %outputs "out")))
+ (list (string-append "-DCMAKE_INSTALL_BINDIR=" out "/bin")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'install-data
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (for-each
+ (lambda (input)
+ (copy-recursively (assoc-ref inputs input)
+ (assoc-ref outputs "out")))
+ (list "opengfx" "openmsx" "opensfx"))
+ #t)))))
(inputs
`(("timidity++" ,timidity++)
,@(package-inputs openttd-engine)))
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#48613] openttd: update to 1.11.2 - not mangled patch
2021-05-23 17:27 [bug#48613] [PATCH] gnu: openttd: update to 1.11.2 Solene Rapenne via Guix-patches via
@ 2021-05-24 8:34 ` Solene Rapenne via Guix-patches via
2021-05-25 10:09 ` bug#48613: " Nicolas Goaziou
0 siblings, 1 reply; 3+ messages in thread
From: Solene Rapenne via Guix-patches via @ 2021-05-24 8:34 UTC (permalink / raw)
To: 48613
the previous patch was mangled by my mail editor.
I forgot to fix it for all the sent emails.
- the build system switched from GNU configure to cmake
- tests enabled by copying the assets files before check step
---
gnu/packages/games.scm | 54 +++++++++++++-----------------------------
1 file changed, 17 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 24e487a2b8..e83911a2cd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4317,35 +4317,15 @@ world}, @uref{http://evolonline.org, Evol Online} and
(define openttd-engine
(package
(name "openttd-engine")
- (version "1.10.3")
+ (version "1.11.2")
(source
(origin (method url-fetch)
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
version "/openttd-" version "-source.tar.xz"))
(sha256
(base32
- "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"))))
- (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 the
- ;; option "--enable-fast-install".
- (replace 'configure
- (lambda* (#:key inputs outputs (configure-flags '())
- #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (lzo (assoc-ref inputs "lzo")))
- (apply invoke "./configure"
- (string-append "--prefix=" out)
- ;; Provide the "lzo" path.
- (string-append "--with-liblzo2="
- lzo "/lib/liblzo2.a")
- ;; Put the binary in 'bin' instead of 'games'.
- "--binary-dir=bin"
- configure-flags)))))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ "0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
+ (build-system cmake-build-system)
(inputs
`(("allegro" ,allegro)
("fontconfig" ,fontconfig)
@@ -4511,20 +4491,20 @@ Transport Tycoon Deluxe.")
(inherit openttd-engine)
(name "openttd")
(arguments
- `(#:configure-flags
- (list (string-append "--with-midi=" (assoc-ref %build-inputs "timidity++")
- "/bin/timidity"))
- ,@(substitute-keyword-arguments (package-arguments openttd-engine)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'install 'install-data
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (for-each
- (lambda (input)
- (copy-recursively (assoc-ref inputs input)
- (assoc-ref outputs "out")))
- (list "opengfx" "openmsx" "opensfx"))
- #t)))))))
+ `(
+ #:configure-flags
+ (let* ((out (assoc-ref %outputs "out")))
+ (list (string-append "-DCMAKE_INSTALL_BINDIR=" out "/bin")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'install-data
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (for-each
+ (lambda (input)
+ (copy-recursively (assoc-ref inputs input)
+ (assoc-ref outputs "out")))
+ (list "opengfx" "openmsx" "opensfx"))
+ #t)))))
(inputs
`(("timidity++" ,timidity++)
,@(package-inputs openttd-engine)))
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#48613: openttd: update to 1.11.2 - not mangled patch
2021-05-24 8:34 ` [bug#48613] openttd: update to 1.11.2 - not mangled patch Solene Rapenne via Guix-patches via
@ 2021-05-25 10:09 ` Nicolas Goaziou
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Goaziou @ 2021-05-25 10:09 UTC (permalink / raw)
To: Solene Rapenne; +Cc: 48613-done
Hello,
Solene Rapenne via Guix-patches via <guix-patches@gnu.org> writes:
> - the build system switched from GNU configure to cmake
> - tests enabled by copying the assets files before check step
I tweaked the commit message, added a copyright line for you, and
applied your patch.
Thank you.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-25 10:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-23 17:27 [bug#48613] [PATCH] gnu: openttd: update to 1.11.2 Solene Rapenne via Guix-patches via
2021-05-24 8:34 ` [bug#48613] openttd: update to 1.11.2 - not mangled patch Solene Rapenne via Guix-patches via
2021-05-25 10:09 ` bug#48613: " Nicolas Goaziou
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.