diff options
| -rw-r--r-- | gnu/packages/audio.scm | 21 | ||||
| -rw-r--r-- | gnu/packages/games.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 2 |
3 files changed, 21 insertions, 4 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5ec10b370e..a1745bb7a6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Brett Gilio <brettg@posteo.net> +;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1041,7 +1042,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "1.1.11") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -1050,7 +1051,7 @@ follower.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh")))) + "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target @@ -1082,6 +1083,22 @@ device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.") (license license:lgpl2.1+))) +;; gzdoom@3.3.0 and lmms@1.1.3 requires this version. Remove once no longer +;; needed. +(define-public fluidsynth-1 + (package + (inherit fluidsynth) + (version "1.1.11") + (source (origin + (inherit (package-source fluidsynth)) + (uri (git-reference + (url "https://github.com/FluidSynth/fluidsynth") + (commit (string-append "v" version)))) + (file-name (git-file-name "fluidsynth" version)) + (sha256 + (base32 + "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh")))))) + (define-public faad2 (package (name "faad2") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c3067c5684..bb96bbe68a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5355,7 +5355,7 @@ You can save humanity and get programming skills!") (build-system cmake-build-system) (inputs `(("bzip2" ,bzip2) ("fluid-3" ,fluid-3) - ("fluidsynth" ,fluidsynth) + ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating ("gtk+3" ,gtk+) ("libgme" ,libgme) ("libjpeg" ,libjpeg) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 13a6ecc36f..cdd06647e1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3567,7 +3567,7 @@ are a C compiler and glib. Full API documentation and examples are included.") ("fltk" ,fltk) ("libogg" ,libogg) ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth) + ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating ("libvorbis" ,libvorbis) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) |