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):
03098e4d1611cef3b7123e'>refslogtreecommitdiff
|
Age | Commit message (Expand) | Author |
2020-07-19 | gnu: perl-gd: Update to 2.72 [fixes CVE-2019-6977]....* gnu/packages/gd.scm (perl-gd): Update to 2.72.
| Tobias Geerinckx-Rice |
2020-04-08 | gnu: perl-gd: Do not rely on 'libgd-config'....* gnu/packages/gd.scm (perl-gd)[native-inputs]: Add PERL-EXTUTILS-PKGCONFIG.
| Marius Bakke |
2020-03-26 | gnu: gd: Update to 2.3.0....* gnu/packages/patches/gd-fix-tests-on-i686.patch: Adjust context.
* gnu/packages/patches/gd-CVE-2018-1000222.patch,
gnu/packages/patches/gd-CVE-2018-5711.patch,
gnu/packages/patches/gd-CVE-2019-6977.patch,
gnu/packages/patches/gd-CVE-2019-6978.patch,
gnu/packages/patches/gd-freetype-test-failure.patch: Delete files.
* gnu/packages/patches/gd-brect-bounds.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly
* gnu/packages/gd.scm (gd): Update to 2.3.0.
[source](patches): Remove obsolete.
* gnu/packages/gd.scm (gd):
[propagated-inputs]: Move LIBJPEG-TURBO and FONTCONFIG ...
[inputs]: ... here.
| Marius Bakke |
2020-03-14 | Merge branch 'master' into core-updates | Marius Bakke |
2020-03-11 | gnu: gd: Use HTTPS home page....* gnu/packages/gd.scm (gd)[home-page]: Use HTTPS.
| Tobias Geerinckx-Rice |