From 9baa4a5c2b853c32554e0a146729c25392cd8c43 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 27 May 2012 17:08:44 +0000 Subject: Update onscripter to 20120527. Changes from 20120520: - refactored Makefile.Linux - fix textbtnwait command bug --- games/onscripter/Makefile | 4 +- games/onscripter/distinfo | 10 ++-- games/onscripter/patches/patch-Makefile.Linux | 78 ++++++++++++++------------- 3 files changed, 49 insertions(+), 43 deletions(-) (limited to 'games/onscripter') diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile index 7b7f53218b7..2553ae54e8e 100644 --- a/games/onscripter/Makefile +++ b/games/onscripter/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2012/05/20 11:47:51 tsutsui Exp $ +# $NetBSD: Makefile,v 1.12 2012/05/27 17:08:44 tsutsui Exp $ # -DISTNAME= onscripter-20120520 +DISTNAME= onscripter-20120527 CATEGORIES= games MASTER_SITES= http://onscripter.sourceforge.jp/ diff --git a/games/onscripter/distinfo b/games/onscripter/distinfo index 3f960e37e46..93d802b4290 100644 --- a/games/onscripter/distinfo +++ b/games/onscripter/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2012/05/20 11:47:51 tsutsui Exp $ +$NetBSD: distinfo,v 1.8 2012/05/27 17:08:44 tsutsui Exp $ -SHA1 (onscripter-20120520.tar.gz) = 91e46ab60de6c56d2ac485cf597e168dcba83bc8 -RMD160 (onscripter-20120520.tar.gz) = 2e6935f9319dcd6be706bed5ef03d3a9d3a24a90 -Size (onscripter-20120520.tar.gz) = 228327 bytes -SHA1 (patch-Makefile.Linux) = 99869a6fc851cc7ca6249c7deb691d7fcfbb4047 +SHA1 (onscripter-20120527.tar.gz) = fb47ef1cb653a3af671ebae6a263129a9d13609c +RMD160 (onscripter-20120527.tar.gz) = 903ece16d3dd5cc4344d1afb5dd3851e89bb49d6 +Size (onscripter-20120527.tar.gz) = 228219 bytes +SHA1 (patch-Makefile.Linux) = f06c5892ac0c06d79322f802641e82603a553073 diff --git a/games/onscripter/patches/patch-Makefile.Linux b/games/onscripter/patches/patch-Makefile.Linux index 8e6bbf63a5a..d0098e45921 100644 --- a/games/onscripter/patches/patch-Makefile.Linux +++ b/games/onscripter/patches/patch-Makefile.Linux @@ -1,33 +1,48 @@ -$NetBSD: patch-Makefile.Linux,v 1.3 2012/05/20 11:47:51 tsutsui Exp $ +$NetBSD: patch-Makefile.Linux,v 1.4 2012/05/27 17:08:44 tsutsui Exp $ -- config with OggVorbis and Lua + fontconfig but without avifile -- use appropriate pkg-config like tools for incs and libs +- use appropriate pkg-config metainfo for INCS and LIBS definitions +- disable avifile (that is not in pkgsrc) support - replace tools definitions with pkgsrc ones ---- Makefile.Linux.orig 2012-05-20 04:51:31.000000000 +0000 +--- Makefile.Linux.orig 2012-05-27 05:49:49.000000000 +0000 +++ Makefile.Linux -@@ -8,11 +8,16 @@ - #LIBS = `sdl-config --libs` `smpeg-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm - #DEFS = -DLINUX -DUSE_CDROM - --INCS = `sdl-config --cflags` `smpeg-config --cflags` `avifile-config --cflags` -I/usr/include/lua5.1 -+#INCS = `sdl-config --cflags` `smpeg-config --cflags` `avifile-config --cflags` -I/usr/include/lua5.1 - # with OggVorbis and AVI --LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile -llua5.1 -+#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile -llua5.1 - #DEFS = -DLINUX -DUSE_CDROM -DUSE_AVIFILE -DUSE_OGG_VORBIS --DEFS = -DLINUX -DUSE_CDROM -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG -+#DEFS = -DLINUX -DUSE_CDROM -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG -+ -+# with OggVorbis and Lua + fontconfig -+INCS = `sdl-config --cflags` `smpeg-config --cflags` `pkg-config --cflags SDL_ttf` `pkg-config --cflags SDL_image` `pkg-config --cflags SDL_mixer` `pkg-config --cflags ogg` `pkg-config --cflags vorbis` `pkg-config --cflags vorbisfile` `pkg-config --cflags lua` `pkg-config --cflags fontconfig` -+LIBS = `sdl-config --libs` `smpeg-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm `pkg-config --libs ogg` `pkg-config --libs vorbis` `pkg-config --libs vorbisfile` `pkg-config --libs lua` `pkg-config --libs fontconfig` -+DEFS = -DLINUX -DUSE_CDROM -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG - - # with Integer OggVorbis and AVI in PDA size - #LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -lvorbisidec -@@ -29,11 +34,11 @@ OBJSUFFIX = .o - .SUFFIXES: $(OBJSUFFIX) .cpp .h +@@ -18,8 +18,8 @@ EXT_OBJS = + + # mandatory: SDL, SDL_ttf, SDL_image, SDL_mixer, bzip2, libjpeg + DEFS = -DLINUX +-INCS = `sdl-config --cflags` +-LIBS = `sdl-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm ++INCS = `sdl-config --cflags` `pkg-config --cflags SDL_ttf` `pkg-config --cflags SDL_image` `pkg-config --cflags SDL_mixer` ++LIBS = `sdl-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm + + # recommended: smpeg + DEFS += -DUSE_SMPEG +@@ -42,16 +42,16 @@ LIBS += -logg -lvorbis -lvorbisfile + DEFS += -DUSE_CDROM + + # optional: avifile +-DEFS += -DUSE_AVIFILE +-INCS += `avifile-config --cflags` +-LIBS += `avifile-config --libs` +-TARGET += simple_aviplay$(EXESUFFIX) +-EXT_OBJS += AVIWrapper$(OBJSUFFIX) ++#DEFS += -DUSE_AVIFILE ++#INCS += `avifile-config --cflags` ++#LIBS += `avifile-config --libs` ++#TARGET += simple_aviplay$(EXESUFFIX) ++#EXT_OBJS += AVIWrapper$(OBJSUFFIX) + + # optional: lua + DEFS += -DUSE_LUA +-INCS += -I/usr/include/lua5.1 +-LIBS += -llua5.1 ++INCS += `pkg-config --cflags lua` ++LIBS += `pkg-config --libs lua` + EXT_OBJS += LUAHandler$(OBJSUFFIX) + + # optional: force screen width for PDA +@@ -62,11 +62,11 @@ EXT_OBJS += LUAHandler$(OBJSUFFIX) + # for GNU g++ -CC = g++ @@ -41,20 +56,11 @@ $NetBSD: patch-Makefile.Linux,v 1.3 2012/05/20 11:47:51 tsutsui Exp $ # for GCC on PowerPC specfied #CC = powerpc-unknown-linux-gnu-g++ -@@ -47,11 +52,12 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer +@@ -80,6 +80,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer #CFLAGS = -O3 -tpp6 -xK -c $(INCS) $(DEFS) -RM = rm -f +RM = @RM@ --#TARGET = onscripter$(EXESUFFIX) sardec$(EXESUFFIX) nsadec$(EXESUFFIX) sarconv$(EXESUFFIX) nsaconv$(EXESUFFIX) --TARGET = onscripter$(EXESUFFIX) sardec$(EXESUFFIX) nsadec$(EXESUFFIX) sarconv$(EXESUFFIX) nsaconv$(EXESUFFIX) simple_aviplay$(EXESUFFIX) -+TARGET = onscripter$(EXESUFFIX) sardec$(EXESUFFIX) nsadec$(EXESUFFIX) sarconv$(EXESUFFIX) nsaconv$(EXESUFFIX) -+#TARGET = onscripter$(EXESUFFIX) sardec$(EXESUFFIX) nsadec$(EXESUFFIX) sarconv$(EXESUFFIX) nsaconv$(EXESUFFIX) simple_aviplay$(EXESUFFIX) - #EXT_OBJS = AVIWrapper$(OBJSUFFIX) --EXT_OBJS = AVIWrapper$(OBJSUFFIX) LUAHandler$(OBJSUFFIX) -+#EXT_OBJS = AVIWrapper$(OBJSUFFIX) LUAHandler$(OBJSUFFIX) -+EXT_OBJS = LUAHandler$(OBJSUFFIX) - include Makefile.onscripter -- cgit v1.2.3