aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/pingus-sdl-libs-config.patch
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2014-06-12 23:54:44 -0500
committerEric Bavier <bavier@member.fsf.org>2014-06-13 14:11:14 -0500
commita83c6a6471b0f1950ab5c53acb278e1b88d51c11 (patch)
treeb43e894cb00940d9c066baed73c033bcf3845d4c /gnu/packages/patches/pingus-sdl-libs-config.patch
parent95faa1071484ab550b2919c56d9d755eff9696c8 (diff)
downloadguix-a83c6a6471b0f1950ab5c53acb278e1b88d51c11.tar
guix-a83c6a6471b0f1950ab5c53acb278e1b88d51c11.tar.gz
gnu: Add pingus.
* gnu/packages/games.scm (pingus): New variable. * gnu/packages/patches/pingus-sdl-libs-config.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches/pingus-sdl-libs-config.patch')
-rw-r--r--gnu/packages/patches/pingus-sdl-libs-config.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/patches/pingus-sdl-libs-config.patch b/gnu/packages/patches/pingus-sdl-libs-config.patch
new file mode 100644
index 0000000000..4d695c40db
--- /dev/null
+++ b/gnu/packages/patches/pingus-sdl-libs-config.patch
@@ -0,0 +1,21 @@
+Do not assume the SDL_image and SLD_mixer libraries are installed at the same
+prefix reported by sdl-config, but instead get flags from the pkg-config files
+installed with these libraries.
+
+--- a/SConscript 2011-12-24 15:46:47.000000000 -0600
++++ b/SConscript 2014-06-12 21:20:45.702668330 -0500
+@@ -199,7 +199,13 @@
+ self.fatal_error += " * library 'png' not found\n"
+
+ def configure_sdl(self):
+- if self.conf.CheckMyProgram('sdl-config'):
++ if self.conf.CheckMyProgram('pkg-config'):
++ self.conf.env.ParseConfig("pkg-config --cflags --libs sdl")
++ for sdllib in ['image', 'mixer']:
++ self.conf.env.ParseConfig("pkg-config --cflags --libs SDL_%s" % sdllib)
++ if not self.conf.CheckSDLLib(sdllib):
++ self.fatal_error += " * SDL library '%s' not found\n" % sdllib
++ elif self.conf.CheckMyProgram('sdl-config'):
+ self.conf.env.ParseConfig("sdl-config --cflags --libs | sed 's/-I/-isystem/g'")
+ for sdllib in ['image', 'mixer']:
+ if not self.conf.CheckSDLLib(sdllib):