summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2019-12-29 15:38:31 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-12-29 15:38:31 +0100
commit161b297b235908322023c4164a8122575519edf2 (patch)
tree0d0dba05cc986295ad2e89eadde167a7a2dc1882
parent92fcf9856face3822ce827d7732c4b152f715f62 (diff)
gnu: scummvm: Fix build.
* gnu/packages/emulators.scm (scummvm)[arguments]: Add a phase to work around a build failure introduced by recent Fluidsynth upgrade.
-rw-r--r--gnu/packages/emulators.scm14
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0ab6ee7c9a..6312c6c5ed 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