diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2012-05-27 17:40:38 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2012-05-27 17:40:38 +0000 |
| commit | 443960d77ae6ab8985599c4fc773835d807657d1 (patch) | |
| tree | 3dc58edd2bee9910c969764531d2fc82c232ca04 /games | |
| parent | bded7f4c336417f9b04e5a5ac5a65e66b0fb2125 (diff) | |
| download | pkgsrc-443960d77ae6ab8985599c4fc773835d807657d1.tar.gz | |
Fix botch in previous: use more pkg-config metainfo for all necessary libs
Diffstat (limited to 'games')
| -rw-r--r-- | games/onscripter/distinfo | 4 | ||||
| -rw-r--r-- | games/onscripter/patches/patch-Makefile.Linux | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/games/onscripter/distinfo b/games/onscripter/distinfo index 93d802b4290..ecc3bc1527f 100644 --- a/games/onscripter/distinfo +++ b/games/onscripter/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2012/05/27 17:08:44 tsutsui Exp $ +$NetBSD: distinfo,v 1.9 2012/05/27 17:40:38 tsutsui Exp $ SHA1 (onscripter-20120527.tar.gz) = fb47ef1cb653a3af671ebae6a263129a9d13609c RMD160 (onscripter-20120527.tar.gz) = 903ece16d3dd5cc4344d1afb5dd3851e89bb49d6 Size (onscripter-20120527.tar.gz) = 228219 bytes -SHA1 (patch-Makefile.Linux) = f06c5892ac0c06d79322f802641e82603a553073 +SHA1 (patch-Makefile.Linux) = d16a09d0296386e480c17b36bdaea2e62606edb3 diff --git a/games/onscripter/patches/patch-Makefile.Linux b/games/onscripter/patches/patch-Makefile.Linux index d0098e45921..9a0b89fea8e 100644 --- a/games/onscripter/patches/patch-Makefile.Linux +++ b/games/onscripter/patches/patch-Makefile.Linux @@ -1,4 +1,4 @@ -$NetBSD: patch-Makefile.Linux,v 1.4 2012/05/27 17:08:44 tsutsui Exp $ +$NetBSD: patch-Makefile.Linux,v 1.5 2012/05/27 17:40:38 tsutsui Exp $ - use appropriate pkg-config metainfo for INCS and LIBS definitions - disable avifile (that is not in pkgsrc) support @@ -17,7 +17,23 @@ $NetBSD: patch-Makefile.Linux,v 1.4 2012/05/27 17:08:44 tsutsui Exp $ # recommended: smpeg DEFS += -DUSE_SMPEG -@@ -42,16 +42,16 @@ LIBS += -logg -lvorbis -lvorbisfile +@@ -28,11 +28,13 @@ LIBS += `smpeg-config --libs` + + # recommended: fontconfig (to get default font) + DEFS += -DUSE_FONTCONFIG +-LIBS += -lfontconfig ++INCS += `pkg-config --cflags fontconfig` ++LIBS += `pkg-config --libs fontconfig` + + # recommended: OggVorbis + DEFS += -DUSE_OGG_VORBIS +-LIBS += -logg -lvorbis -lvorbisfile ++INCS += `pkg-config --cflags ogg` `pkg-config --cflags vorbis` `pkg-config --cflags vorbisfile` ++LIBS += `pkg-config --libs ogg` `pkg-config --libs vorbis` `pkg-config --libs vorbisfile` + + # optional: Integer OggVorbis + #DEFS += -DUSE_OGG_VORBIS -DINTEGER_OGG_VORBIS +@@ -42,16 +44,16 @@ LIBS += -logg -lvorbis -lvorbisfile DEFS += -DUSE_CDROM # optional: avifile @@ -41,7 +57,7 @@ $NetBSD: patch-Makefile.Linux,v 1.4 2012/05/27 17:08:44 tsutsui Exp $ EXT_OBJS += LUAHandler$(OBJSUFFIX) # optional: force screen width for PDA -@@ -62,11 +62,11 @@ EXT_OBJS += LUAHandler$(OBJSUFFIX) +@@ -62,11 +64,11 @@ EXT_OBJS += LUAHandler$(OBJSUFFIX) # for GNU g++ @@ -56,7 +72,7 @@ $NetBSD: patch-Makefile.Linux,v 1.4 2012/05/27 17:08:44 tsutsui Exp $ # for GCC on PowerPC specfied #CC = powerpc-unknown-linux-gnu-g++ -@@ -80,6 +80,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer +@@ -80,6 +82,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer #CFLAGS = -O3 -tpp6 -xK -c $(INCS) $(DEFS) |