diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-26 11:08:49 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-11-26 14:56:33 +0100 |
| commit | ce3fa07b29753bd79af80345533446f04579a577 (patch) | |
| tree | 0861097670979af306e8c9fdf1be2c3af0c732f4 /gnu/packages/sdl.scm | |
| parent | 011e3152b6278cc852e45bd5ca509f0c6bfeaa32 (diff) | |
gnu: sdl2-mixer: Update to 2.6.2.
* gnu/packages/sdl.scm (sdl2-mixer): Update to 2.6.2.
[arguments]: Don't inherit; update configure flags for 2.6.2.
[inputs]: Clear.
[propagated-inputs]: Add FLAC, FLUIDSYNTH, LIBMODPLUG, LIBVORBIS, MPG123, and
OPUSFILE.
Diffstat (limited to 'gnu/packages/sdl.scm')
| -rw-r--r-- | gnu/packages/sdl.scm | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 906314d424..c5473bf297 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -484,7 +484,7 @@ directory.") (define-public sdl2-mixer (package (inherit sdl-mixer) (name "sdl2-mixer") - (version "2.0.4") + (version "2.6.2") (source (origin (method url-fetch) @@ -497,27 +497,31 @@ directory.") (delete-file-recursively "external") #t)) (sha256 - (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (base32 "0wd35a9fcj1bv534k9cr4jdk076dpiqq0ayk6cybmv3d6q8aiplc")))) (arguments - (substitute-keyword-arguments (package-arguments sdl-mixer) - ((#:configure-flags flags) - `(cons* - "--disable-music-opus-shared" - ;; These options were renamed in SDL2 mixer. Keeping the inherited - ;; variants produces a harmless warning. - "--disable-music-mod-modplug-shared" - "--disable-music-midi-fluidsynth-shared" - ,flags)))) - (inputs - (modify-inputs (package-inputs sdl-mixer) - (delete "libmikmod") - (prepend opusfile - ;; The default MOD library changed in SDL2 mixer. - libmodplug))) + (list #:tests? #f ;no tests + #:configure-flags + #~'(;; Prefer system libraries to bundled codecs. + "--enable-music-flac-libflac" + "--enable-music-midi-fluidsynth" + "--enable-music-mod-modplug" + "--enable-music-mp3-mpg123" + "--enable-music-ogg-vorbis" + "--enable-music-opus" + ;; Link the libraries instead of dlopening them. + "--enable-music-flac-libflac-shared=no" + "--enable-music-midi-fluidsynth-shared=no" + "--enable-music-mod-modplug-shared=no" + "--enable-music-mp3-mpg123-shared=no" + "--enable-music-ogg-vorbis-shared=no" + "--enable-music-opus-shared=no"))) (native-inputs - `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. + (list pkg-config)) + (inputs '()) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-mixer)) + (modify-inputs (propagated-inputs-with-sdl2 sdl-mixer) + ;; In Requires.private of SDL2_mixer.pc. + (append flac fluidsynth libmodplug libvorbis mpg123 opusfile))) (properties '((upstream-name . "SDL2_mixer"))))) (define-public sdl2-net |