diff options
author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
---|---|---|
committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /gnu/packages/audio.scm | |
parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
download | guix-patches-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar guix-patches-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz |
Merge 'master' into core-updates
Diffstat (limited to 'gnu/packages/audio.scm')
-rw-r--r-- | gnu/packages/audio.scm | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0900630df1..e0aa1705e2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -961,21 +961,27 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "1.1.6") + (version "1.1.8") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/fluidsynth/fluidsynth-" - version "/fluidsynth-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluidSynth/fluidsynth.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) - (build-system gnu-build-system) + "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd")))) + (build-system cmake-build-system) (arguments - `(#:phases + '(#:tests? #f ; no check phase + #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-broken-symlinks - (lambda _ (delete-file-recursively "m4") #t))))) + (add-after 'unpack 'fix-libdir + (lambda _ + (substitute* "CMakeLists.txt" + (("LIB_SUFFIX \\$\\{_init_lib_suffix\\}") + "LIB_SUFFIX \"\"")) + #t))))) (inputs `(("libsndfile" ,libsndfile) ("alsa-lib" ,alsa-lib) @@ -993,7 +999,7 @@ follower.") specifications. FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.") - (license license:gpl2+))) + (license license:lgpl2.1+))) (define-public faad2 (package |