zepto-mirrors/meta-games
1
0
Fork 0
mirror of https://github.com/cazfi/meta-games.git synced 2026-09-12 12:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

pingus: use pkg-config for finding sdl

Browse Source 
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2014-09-06 13:00:30 +03:00
parent 767a3a1bfa
commit b46abfcd2c
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-games/pingus/pingus/sdl_pkgconfig.patch Normal file
View File

@@ -0,0 +1,26 @@
Use pkg-config instead of sdl-config to find sdl
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd pingus-0.7.6/SConscript pingus-0.7.6/SConscript
--- pingus-0.7.6/SConscript 2011-12-24 23:46:47.000000000 +0200
+++ pingus-0.7.6/SConscript 2014-09-06 12:54:54.944135788 +0300
@@ -199,8 +199,8 @@
self.fatal_error += " * library 'png' not found\n"
def configure_sdl(self):
- if self.conf.CheckMyProgram('sdl-config'):
- self.conf.env.ParseConfig("sdl-config --cflags --libs | sed 's/-I/-isystem/g'")
+ if self.conf.CheckMyProgram('pkg-config'):
+ self.conf.env.ParseConfig("pkg-config --cflags --libs sdl | sed 's/-I/-isystem/g'")
for sdllib in ['image', 'mixer']:
if not self.conf.CheckSDLLib(sdllib):
self.fatal_error += " * SDL library '%s' not found\n" % sdllib
@@ -220,7 +220,7 @@
'-dylib_file', '@loader_path/Frameworks/smpeg.framework/Versions/A/smpeg:/Library/Frameworks/SDL_mixer.framework/Versions/A/Frameworks/smpeg.framework/Versions/A/smpeg' ],
CPPPATH = ['/Library/Frameworks/SDL_mixer.framework/Headers/'])
else:
- self.fatal_error += " * couldn't find sdl-config, SDL missing\n"
+ self.fatal_error += " * library 'sdl' not found\n"
def configure_iconv(self):
iconv_const = self.conf.CheckIconv()

4
recipes-games/pingus/pingus_0.7.6.bb
View File

@@ -1,9 +1,8 @@
DESCRIPTION = "Pingus is a free Lemmings clone."
DEPENDS = "virtual/libiconv boost libpng libglu"
DEPENDS = "virtual/libiconv boost libpng libglu libsdl-mixer libsdl-image"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
HOMEPAGE = "http://pingus.seul.org/"
PR = "r3"
RDEPENDS_${PN} += "libmikmod"
@@ -12,6 +11,7 @@ inherit scons sdl pythonnative
SRC_URI = "\
http://${PN}.googlecode.com/files/${P}.tar.bz2 \
file://version.patch \
file://sdl_pkgconfig.patch \
file://pingus.desktop \
file://pingus.png \
"