[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
276/285: gnu: scummvm: Fix build.
From: |
guix-commits |
Subject: |
276/285: gnu: scummvm: Fix build. |
Date: |
Sun, 29 Dec 2019 20:44:47 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit 88d93c4086c01c03ada76963794932c72bcbaad0
Author: Nicolas Goaziou <address@hidden>
Date: Sun Dec 29 15:38:31 2019 +0100
gnu: scummvm: Fix build.
* gnu/packages/emulators.scm (scummvm)[arguments]: Add a phase to work
around
a build failure introduced by recent Fluidsynth upgrade.
---
gnu/packages/emulators.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0ab6ee7..6312c6c 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1162,6 +1162,20 @@ multi-system game/emulator system.")
#:configure-flags (list "--enable-release") ;for optimizations
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-build
+ ;; XXX: The following works around a build failure introduced when
+ ;; Fluidsynth was updated to version 2.1. It has been applied
+ ;; upstream as 68758a879e0c8ecc0d40962516d4e808aa4e15e5 and can be
+ ;; removed once ScummVM 2.1.1+ is out.
+ (lambda _
+ (substitute* "audio/softsynth/fluidsynth.cpp"
+ (("#include <fluidsynth.h>") "")
+ (("#include \"common/scummsys.h\"") "#include \"config.h\"")
+ (("#include \"common/config-manager.h\"" line)
+ (string-append "#include <fluidsynth.h>\n"
+ "#include \"common/scummsys.h\"\n"
+ line)))
+ #t))
(replace 'configure
;; configure does not work followed by both "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead
- 252/285: gnu: python-waf: Update to 2.0.19., (continued)
- 252/285: gnu: python-waf: Update to 2.0.19., guix-commits, 2019/12/29
- 257/285: gnu: portaudio: Add C++ bindings., guix-commits, 2019/12/29
- 256/285: gnu: emacs-shroud: Update to 1.105., guix-commits, 2019/12/29
- 254/285: gnu: Add ardupilot., guix-commits, 2019/12/29
- 259/285: gnu: Add copyq., guix-commits, 2019/12/29
- 263/285: gnu: ruby-ansi: Don't use unstable tarball., guix-commits, 2019/12/29
- 248/285: gnu: Add python-audioread., guix-commits, 2019/12/29
- 251/285: gnu: Add gnome-themes-extra, guix-commits, 2019/12/29
- 267/285: gnu: emacs-auth-source-pass: Use upstream URL., guix-commits, 2019/12/29
- 278/285: profiles: Add 'map-manifest-entries'., guix-commits, 2019/12/29
- 276/285: gnu: scummvm: Fix build.,
guix-commits <=
- 281/285: inferior: Add 'inferior-package-provenance'., guix-commits, 2019/12/29
- 284/285: gnu: gnome-themes-extra: Remove cache file., guix-commits, 2019/12/29
- 216/285: gnu: r-car: Update to 3.0-6., guix-commits, 2019/12/29
- 224/285: guix: emacs-utils: Add emacs-batch-disable-compilation., guix-commits, 2019/12/29
- 250/285: gnu: beets: Add support for Acoustid., guix-commits, 2019/12/29
- 253/285: gnu: python-waf: Add some extra tools., guix-commits, 2019/12/29
- 255/285: gnu: password-store: Make search path single-entry., guix-commits, 2019/12/29
- 258/285: gnu: Add picom., guix-commits, 2019/12/29
- 261/285: gnu: ruby-multi-json: Don't use unstable tarball., guix-commits, 2019/12/29
- 264/285: gnu: ruby-guard: Don't use unstable tarball., guix-commits, 2019/12/29