diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
commit | 93be4e8e6c6b82a5825b56cce991563bf19aaaf2 (patch) | |
tree | 2b48c1c88f046ee6e1d59636d1f6e8fbbd1660c2 /gnu/packages/sdl.scm | |
parent | a068dba78bde9c83a69c755df1131c286d065850 (diff) | |
parent | e1509174957bd9eba777bec86ea290fb44a4bce3 (diff) | |
download | guix-patches-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar guix-patches-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r-- | gnu/packages/sdl.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index ee18c1b5d0..c9b82f4b62 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -158,6 +158,12 @@ other supporting functions for SDL.") (base32 "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b")))) (build-system gnu-build-system) + (arguments + ;; Explicitly link against shared libraries instead of dlopening them. + '(#:configure-flags '("--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + "--disable-webp-shared"))) (native-inputs `(("pkg-config" ,pkg-config))) ;; FIXME: Add webp ;; @@ -191,8 +197,14 @@ WEBP, XCF, XPM, and XV.") (build-system gnu-build-system) ;; no check target ;; use libmad instead of smpeg + ;; explicitly link against shared libraries instead of dlopening them (arguments `(#:tests? #f - #:configure-flags '("--enable-music-mp3-mad-gpl"))) + #:configure-flags '("--enable-music-mp3-mad-gpl" + "--disable-music-mod-shared" + "--disable-music-fluidsynth-shared" + "--disable-music-ogg-shared" + "--disable-music-flac-shared" + "--disable-music-mp3-shared"))) (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) |