pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/onscripter Update onscripter to 20120520.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c7ebb3d85284
branches: trunk
changeset: 604007:c7ebb3d85284
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Sun May 20 11:47:51 2012 +0000
description:
Update onscripter to 20120520.
(no English changelog in upstream)
* Makefile.onscripter quirk for Windows build was moved into Makefile.Win
* various bug fixes
* misc improvements mostly for Android and iOS supports
diffstat:
games/onscripter/Makefile | 5 +--
games/onscripter/distinfo | 11 +++----
games/onscripter/patches/patch-Makefile.Linux | 31 ++++++++++++--------
games/onscripter/patches/patch-Makefile.onscripter | 33 ----------------------
4 files changed, 25 insertions(+), 55 deletions(-)
diffs (131 lines):
diff -r ecc7cddb670c -r c7ebb3d85284 games/onscripter/Makefile
--- a/games/onscripter/Makefile Sun May 20 11:43:33 2012 +0000
+++ b/games/onscripter/Makefile Sun May 20 11:47:51 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/01/28 11:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/05/20 11:47:51 tsutsui Exp $
#
-DISTNAME= onscripter-20111025
-PKGREVISION= 2
+DISTNAME= onscripter-20120520
CATEGORIES= games
MASTER_SITES= http://onscripter.sourceforge.jp/
diff -r ecc7cddb670c -r c7ebb3d85284 games/onscripter/distinfo
--- a/games/onscripter/distinfo Sun May 20 11:43:33 2012 +0000
+++ b/games/onscripter/distinfo Sun May 20 11:47:51 2012 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2011/10/28 15:03:54 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2012/05/20 11:47:51 tsutsui Exp $
-SHA1 (onscripter-20111025.tar.gz) = 347d44b4bb6258147104e8abe70ce554281bcb71
-RMD160 (onscripter-20111025.tar.gz) = 6867f9593802f2817376d8fda40fe4bb94535540
-Size (onscripter-20111025.tar.gz) = 226127 bytes
-SHA1 (patch-Makefile.Linux) = 5345657c71b2fb2020e472a9af9bc4d11cfc2fbe
-SHA1 (patch-Makefile.onscripter) = 51e5cac78802322f4ff015b904d030b23b95410c
+SHA1 (onscripter-20120520.tar.gz) = 91e46ab60de6c56d2ac485cf597e168dcba83bc8
+RMD160 (onscripter-20120520.tar.gz) = 2e6935f9319dcd6be706bed5ef03d3a9d3a24a90
+Size (onscripter-20120520.tar.gz) = 228327 bytes
+SHA1 (patch-Makefile.Linux) = 99869a6fc851cc7ca6249c7deb691d7fcfbb4047
diff -r ecc7cddb670c -r c7ebb3d85284 games/onscripter/patches/patch-Makefile.Linux
--- a/games/onscripter/patches/patch-Makefile.Linux Sun May 20 11:43:33 2012 +0000
+++ b/games/onscripter/patches/patch-Makefile.Linux Sun May 20 11:47:51 2012 +0000
@@ -1,34 +1,39 @@
-$NetBSD: patch-Makefile.Linux,v 1.2 2011/04/29 17:02:27 ryoon Exp $
+$NetBSD: patch-Makefile.Linux,v 1.3 2012/05/20 11:47:51 tsutsui Exp $
---- Makefile.Linux.orig 2011-04-18 01:51:34.000000000 +0000
+- config with OggVorbis and Lua + fontconfig but without avifile
+- use appropriate pkg-config like tools for incs and libs
+- replace tools definitions with pkgsrc ones
+
+--- Makefile.Linux.orig 2012-05-20 04:51:31.000000000 +0000
+++ Makefile.Linux
-@@ -8,11 +8,15 @@
+@@ -8,11 +8,16 @@
#LIBS = `sdl-config --libs` `smpeg-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm
- #DEFS = -DLINUX
+ #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_AVIFILE -DUSE_OGG_VORBIS
--DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG
-+#DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG
+ #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_OGG_VORBIS -DUSE_LUA -DUSE_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 +33,11 @@ OBJSUFFIX = .o
+@@ -29,11 +34,11 @@ OBJSUFFIX = .o
.SUFFIXES: $(OBJSUFFIX) .cpp .h
# for GNU g++
-CC = g++
--LD = g++ -o
+-LD = g++ -o
+CC = @CXX@
-+LD = @CXX@ -o
++LD = @CXX@ -o
#CFLAGS = -g -Wall -pipe -c $(INCS) $(DEFS)
-CFLAGS = -O3 -Wall -fomit-frame-pointer -pipe -c $(INCS) $(DEFS)
@@ -36,7 +41,7 @@
# for GCC on PowerPC specfied
#CC = powerpc-unknown-linux-gnu-g++
-@@ -47,11 +51,12 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer
+@@ -47,11 +52,12 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer
#CFLAGS = -O3 -tpp6 -xK -c $(INCS) $(DEFS)
diff -r ecc7cddb670c -r c7ebb3d85284 games/onscripter/patches/patch-Makefile.onscripter
--- a/games/onscripter/patches/patch-Makefile.onscripter Sun May 20 11:43:33 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-Makefile.onscripter,v 1.2 2011/04/29 17:02:27 ryoon Exp $
-
---- Makefile.onscripter.orig 2011-04-18 01:51:34.000000000 +0000
-+++ Makefile.onscripter
-@@ -68,22 +68,22 @@ ONSCRIPTER_HEADER = ONScripterLabel.h $(
- ALL: $(TARGET)
-
- sardec$(EXESUFFIX): $(SARDEC_OBJS)
-- $(LD)$@ $(SARDEC_OBJS) $(LIBS)
-+ $(LD) $@ $(SARDEC_OBJS) $(LIBS)
-
- sarconv$(EXESUFFIX): $(SARCONV_OBJS)
-- $(LD)$@ $(SARCONV_OBJS) $(LIBS)
-+ $(LD) $@ $(SARCONV_OBJS) $(LIBS)
-
- nsadec$(EXESUFFIX): $(NSADEC_OBJS)
-- $(LD)$@ $(NSADEC_OBJS) $(LIBS)
-+ $(LD) $@ $(NSADEC_OBJS) $(LIBS)
-
- nsaconv$(EXESUFFIX): $(NSACONV_OBJS)
-- $(LD)$@ $(NSACONV_OBJS) $(LIBS)
-+ $(LD) $@ $(NSACONV_OBJS) $(LIBS)
-
- simple_aviplay$(EXESUFFIX): simple_aviplay$(OBJSUFFIX) AVIWrapper$(OBJSUFFIX)
-- $(LD)$@ simple_aviplay$(OBJSUFFIX) AVIWrapper$(OBJSUFFIX) $(LIBS)
-+ $(LD) $@ simple_aviplay$(OBJSUFFIX) AVIWrapper$(OBJSUFFIX) $(LIBS)
-
- onscripter$(EXESUFFIX): $(ONSCRIPTER_OBJS)
-- $(LD)$@ $(ONSCRIPTER_OBJS) $(LIBS)
-+ $(LD) $@ $(ONSCRIPTER_OBJS) $(LIBS)
-
- clean:
- -$(RM) $(TARGET)
Home |
Main Index |
Thread Index |
Old Index