From dd738c48341f4aa3dd895fec3794955d893daad0 Mon Sep 17 00:00:00 2001 From: jsg Date: Sat, 7 Jul 2007 01:37:53 +0000 Subject: [PATCH] Update to 0.10.0 --- games/scummvm-tools/Makefile | 11 ++- games/scummvm-tools/distinfo | 10 +-- games/scummvm-tools/patches/patch-Makefile | 27 ++++--- games/scummvm-tools/pkg/PLIST | 8 +- games/scummvm/Makefile | 19 +++-- games/scummvm/distinfo | 10 +-- games/scummvm/patches/patch-Makefile | 12 --- games/scummvm/patches/patch-common_hashmap_h | 20 ++--- .../patches/patch-engines_simon_simon_cpp | 76 ------------------- .../patches/patch-engines_simon_simon_h | 22 ------ games/scummvm/pkg/PLIST | 13 +++- 11 files changed, 68 insertions(+), 160 deletions(-) delete mode 100644 games/scummvm/patches/patch-Makefile delete mode 100644 games/scummvm/patches/patch-engines_simon_simon_cpp delete mode 100644 games/scummvm/patches/patch-engines_simon_simon_h diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile index 4a50c3afff8..64f40c05047 100644 --- a/games/scummvm-tools/Makefile +++ b/games/scummvm-tools/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2006/07/08 04:16:18 jsg Exp $ +# $OpenBSD: Makefile,v 1.10 2007/07/07 01:39:47 jsg Exp $ # XXX hardcoded endian list COMMENT= "collection of various tools for scummvm" -DISTNAME= scummvm-tools-0.9.0 -PKGNAME= ${DISTNAME} -WRKDIST= ${WRKDIR}/${DISTNAME:S/scummvm-//} +DISTNAME= scummvm-tools-0.10.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} @@ -39,9 +37,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools ${INSTALL_PROGRAM} \ ${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \ - ${WRKBUILD}/compress_{scumm_sou,simon,sword1,sword2} \ + ${WRKBUILD}/compress_{scumm_sou,agos,sword1,sword2,touche} \ ${WRKBUILD}/de{kyra,scumm,sword2} \ - ${WRKBUILD/extract_{kyra,mm_nes,scumm_mac,zak_c64} \ + ${WRKBUILD/extract_{agos,kyra,loom_tg16,mm_apple,mm_c64} \ + ${WRKBUILD}/extract_{mm_nes,scumm_mac,zak_c64} \ ${PREFIX}/bin .include diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo index d1bfcd132ce..c7ef98fc28e 100644 --- a/games/scummvm-tools/distinfo +++ b/games/scummvm-tools/distinfo @@ -1,5 +1,5 @@ -MD5 (scummvm-tools-0.9.0.tar.gz) = USnTCYau+M3VSFrzPOrByA== -RMD160 (scummvm-tools-0.9.0.tar.gz) = AuoFvc1dIea71Q7UuGRk9LA4Z5Y= -SHA1 (scummvm-tools-0.9.0.tar.gz) = VKP/3+eWuiT/uT64EsTkqimuwVk= -SHA256 (scummvm-tools-0.9.0.tar.gz) = Uyr6A51hyggEhLORaoQEXix2AGAIL0ROQhTYqYs5B8c= -SIZE (scummvm-tools-0.9.0.tar.gz) = 139404 +MD5 (scummvm-tools-0.10.0.tar.gz) = B3dtyNGQAdt7dN3UB8dwiA== +RMD160 (scummvm-tools-0.10.0.tar.gz) = hio2gVxHgPLfLS3g6yeLE8HauEQ= +SHA1 (scummvm-tools-0.10.0.tar.gz) = WzNOWyL8uwqyhJuDSvObyke2Tgk= +SHA256 (scummvm-tools-0.10.0.tar.gz) = bjGvqZSaVO8SPlHowGGh03txR4P/ocUv4SzbgVh827U= +SIZE (scummvm-tools-0.10.0.tar.gz) = 163174 diff --git a/games/scummvm-tools/patches/patch-Makefile b/games/scummvm-tools/patches/patch-Makefile index d78e4d16297..14839e95952 100644 --- a/games/scummvm-tools/patches/patch-Makefile +++ b/games/scummvm-tools/patches/patch-Makefile @@ -1,40 +1,39 @@ -$OpenBSD: patch-Makefile,v 1.5 2006/07/08 04:16:18 jsg Exp $ ---- Makefile.orig Thu Jun 22 07:11:51 2006 -+++ Makefile Sat Jul 8 14:01:11 2006 +$OpenBSD: patch-Makefile,v 1.6 2007/07/07 01:39:47 jsg Exp $ +--- Makefile.orig Sun Jun 17 07:00:22 2007 ++++ Makefile Tue Jun 26 22:57:57 2007 @@ -3,9 +3,10 @@ SRC=. -CC := gcc -CXX := g++ --CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar +-CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX +#CC := gcc +#CXX := g++ -+CFLAGS += -Wall -Wno-long-long -Wno-multichar -+CXXFLAGS += -Wall -Wno-long-long -Wno-multichar ++CFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX ++CXXFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX # LDFLAGS += # Additional warnings -@@ -28,7 +29,7 @@ TARGETS := \ +@@ -29,7 +30,6 @@ TARGETS := \ dekyra$(EXEEXT) \ descumm$(EXEEXT) \ desword2$(EXEEXT) \ - encode_dxa$(EXEEXT) \ -+# encode_dxa$(EXEEXT) \ + extract_agos$(EXEEXT) \ extract_kyra$(EXEEXT) \ extract_loom_tg16$(EXEEXT) \ - extract_mm_c64$(EXEEXT) \ -@@ -61,7 +62,7 @@ compress_scumm_bun$(EXEEXT): compress_sc +@@ -89,7 +89,7 @@ desword2$(EXEEXT): desword2.o util.o $(CXX) $(LDFLAGS) -o $@ $+ encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o - $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -+ $(CXX) $(LDFLAGS) `pkg-config --cflags --libs libpng` -o $@ $+ ++ $(CXX) $(LDFLAGS) `pkg-config --cflags --libs libpng` -o $@ $+ -lz - extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o + extract_agos$(EXEEXT): extract_agos.o $(CC) $(LDFLAGS) -o $@ $+ -@@ -129,7 +130,7 @@ clean: - rm -f *.o $(TARGETS) +@@ -148,7 +148,7 @@ clean: + rm -f *.o utils/*.o $(TARGETS) .cpp.o: - $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o diff --git a/games/scummvm-tools/pkg/PLIST b/games/scummvm-tools/pkg/PLIST index 105b83c4fae..a36aea03a73 100644 --- a/games/scummvm-tools/pkg/PLIST +++ b/games/scummvm-tools/pkg/PLIST @@ -1,15 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.6 2006/07/08 04:16:18 jsg Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/07/07 01:39:47 jsg Exp $ +bin/compress_agos bin/compress_kyra bin/compress_queen bin/compress_saga bin/compress_scumm_bun bin/compress_scumm_san bin/compress_scumm_sou -bin/compress_simon bin/compress_sword1 bin/compress_sword2 +bin/compress_touche bin/dekyra bin/descumm bin/desword2 +bin/extract_mm_nes +bin/extract_scumm_mac +bin/extract_zak_c64 share/doc/scummvm-tools/ share/doc/scummvm-tools/README diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index bef17fe4215..822cb1060a2 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.23 2006/11/02 07:48:59 jsg Exp $ +# $OpenBSD: Makefile,v 1.24 2007/07/07 01:37:53 jsg Exp $ .if ${MACHINE_ARCH} == "hppa" BROKEN= "gcc bug" .endif COMMENT= "graphical adventure game interpreter" -DISTNAME= scummvm-0.9.1 +DISTNAME= scummvm-0.10.0 CATEGORIES= games x11 emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} @@ -61,10 +61,19 @@ CXXFLAGS+= -O1 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/{NEWS,AUTHORS,README} ${PREFIX}/share/doc/scummvm - ${INSTALL_DATA} ${WRKSRC}/icons/scummvm.xpm ${PREFIX}/share/pixmaps + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons + ${INSTALL_DATA_DIR} ${PREFIX}/share/scummvm + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/{NEWS,AUTHORS,README} \ + ${PREFIX}/share/doc/scummvm + ${INSTALL_DATA} ${WRKSRC}/icons/scummvm.{svg,xpm} ${PREFIX}/share/icons ${INSTALL_MAN} ${WRKSRC}/dists/scummvm.6 ${PREFIX}/man/man6 + ${INSTALL_DATA} ${WRKSRC}/gui/themes/classic080.ini \ + ${PREFIX}/share/scummvm + ${INSTALL_DATA} ${WRKSRC}/gui/themes/{modern.ini,modern.zip} \ + ${PREFIX}/share/scummvm + ${INSTALL_DATA} ${WRKSRC}/dists/scummvm.desktop \ + ${PREFIX}/share/applications ${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin .include diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index bd8b2912f1f..8ce7a560b8e 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1,5 +1,5 @@ -MD5 (scummvm-0.9.1.tar.gz) = dFbJmonpSX+e8/632P/YLw== -RMD160 (scummvm-0.9.1.tar.gz) = sF5uKYmLgfBMnojF3C1jRijQQgE= -SHA1 (scummvm-0.9.1.tar.gz) = 4xnrXC6wJz8a7ormqeMJkUzXYBw= -SHA256 (scummvm-0.9.1.tar.gz) = mx9Lh3SoawGiz5AbDceZQz2zh825AokyUPM8zqQYY+s= -SIZE (scummvm-0.9.1.tar.gz) = 5399932 +MD5 (scummvm-0.10.0.tar.gz) = WQFbIKPWcAiOEZCz+89orA== +RMD160 (scummvm-0.10.0.tar.gz) = nZgeOCdChaEbkENE4Xo7tcjDA64= +SHA1 (scummvm-0.10.0.tar.gz) = VSVP6IhSIQKOCIihav30s0Az75Y= +SHA256 (scummvm-0.10.0.tar.gz) = NwRGw5nyHa5nIt9HfEKfoHh/7CLHucEiZacwr2oXm8U= +SIZE (scummvm-0.10.0.tar.gz) = 5744317 diff --git a/games/scummvm/patches/patch-Makefile b/games/scummvm/patches/patch-Makefile deleted file mode 100644 index 928b355387f..00000000000 --- a/games/scummvm/patches/patch-Makefile +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.8 2006/07/08 04:14:30 jsg Exp $ ---- Makefile.orig Thu Jun 22 07:19:07 2006 -+++ Makefile Sat Jul 8 11:21:46 2006 -@@ -19,7 +19,7 @@ MODULE_DIRS := - include config.mak - - CXXFLAGS:= -Wall $(CXXFLAGS) --CXXFLAGS+= -O -Wuninitialized -+#CXXFLAGS+= -O -Wuninitialized - CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas - # Even more warnings... - CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion diff --git a/games/scummvm/patches/patch-common_hashmap_h b/games/scummvm/patches/patch-common_hashmap_h index 6afad3366a9..853b73dc00b 100644 --- a/games/scummvm/patches/patch-common_hashmap_h +++ b/games/scummvm/patches/patch-common_hashmap_h @@ -1,14 +1,14 @@ -$OpenBSD: patch-common_hashmap_h,v 1.1 2006/07/08 04:14:30 jsg Exp $ ---- common/hashmap.h.orig Sat Jul 8 11:26:46 2006 -+++ common/hashmap.h Sat Jul 8 11:27:50 2006 -@@ -121,10 +121,7 @@ uint nextTableSize(uint x); - template , class EqualFunc = EqualTo, class BaseNodeFunc = BaseNode > +$OpenBSD: patch-common_hashmap_h,v 1.2 2007/07/07 01:37:53 jsg Exp $ +--- common/hashmap.h.orig Tue Jun 26 21:57:02 2007 ++++ common/hashmap.h Tue Jun 26 21:57:37 2007 +@@ -88,10 +88,7 @@ template HM_t; + + struct Node { diff --git a/games/scummvm/patches/patch-engines_simon_simon_cpp b/games/scummvm/patches/patch-engines_simon_simon_cpp deleted file mode 100644 index 00570f1e1e4..00000000000 --- a/games/scummvm/patches/patch-engines_simon_simon_cpp +++ /dev/null @@ -1,76 +0,0 @@ -$OpenBSD: patch-engines_simon_simon_cpp,v 1.2 2006/11/02 07:48:59 jsg Exp $ ---- engines/simon/simon.cpp.orig Mon Oct 23 06:58:08 2006 -+++ engines/simon/simon.cpp Wed Nov 1 15:28:02 2006 -@@ -97,10 +97,6 @@ SimonEngine::SimonEngine(OSystem *syst) - _itemArraySize = 0; - _itemArrayInited = 0; - -- _itemHeapPtr = 0; -- _itemHeapCurPos = 0; -- _itemHeapSize = 0; -- - _iconFilePtr = 0; - - _tblList = 0; -@@ -587,7 +583,12 @@ SimonEngine::~SimonEngine() { - - midi.close(); - -- free(_itemHeapPtr - _itemHeapCurPos); -+ for (uint i = 0; i < _itemHeap.size(); i++) { -+ delete [] _itemHeap[i]; -+ } -+ -+ _itemHeap.clear(); -+ - free(_tablesHeapPtr - _tablesHeapCurPos); - - free(_gameOffsetsPtr); -@@ -653,16 +654,10 @@ void SimonEngine::paletteFadeOut(byte *p - } - - byte *SimonEngine::allocateItem(uint size) { -- byte *org = _itemHeapPtr; -- size = (size + 3) & ~3; -- -- _itemHeapPtr += size; -- _itemHeapCurPos += size; -- -- if (_itemHeapCurPos > _itemHeapSize) -- error("allocateItem: Itemheap overflow"); -- -- return org; -+ byte *item = new byte[size]; -+ memset(item, 0, size); -+ _itemHeap.push_back(item); -+ return item; - } - - void SimonEngine::setUserFlag(Item *item, int a, int b) { -@@ -727,9 +722,7 @@ Child *SimonEngine::allocateChildBlock(I - } - - void SimonEngine::allocItemHeap() { -- _itemHeapSize = 10000; -- _itemHeapCurPos = 0; -- _itemHeapPtr = (byte *)calloc(10000, 1); -+ _itemHeap.clear(); - } - - void SimonEngine::allocTablesHeap() { -@@ -1961,8 +1954,13 @@ void SimonEngine::shutdown() { - - free(_stringTabPtr); - free(_itemArrayPtr); -- free(_itemHeapPtr - _itemHeapCurPos); -- free(_tablesHeapPtr - _tablesHeapCurPos); -+ -+ for (uint i = 0; i < _itemHeap.size(); i++) { -+ delete [] _itemHeap[i]; -+ } -+ -+ _itemHeap.clear(); -+ - free(_tblList); - free(_zoneBuffers); - free(_iconFilePtr); diff --git a/games/scummvm/patches/patch-engines_simon_simon_h b/games/scummvm/patches/patch-engines_simon_simon_h deleted file mode 100644 index 6a7da27e19e..00000000000 --- a/games/scummvm/patches/patch-engines_simon_simon_h +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-engines_simon_simon_h,v 1.1 2006/07/08 04:14:30 jsg Exp $ ---- engines/simon/simon.h.orig Thu Jun 22 07:14:03 2006 -+++ engines/simon/simon.h Fri Jul 7 18:55:58 2006 -@@ -26,6 +26,7 @@ - - #include "base/engine.h" - -+#include "common/array.h" - #include "common/rect.h" - #include "common/util.h" - -@@ -210,9 +211,7 @@ protected: - uint _itemArraySize; - uint _itemArrayInited; - -- byte *_itemHeapPtr; -- uint _itemHeapCurPos; -- uint _itemHeapSize; -+ Common::Array _itemHeap; - - byte *_iconFilePtr; - diff --git a/games/scummvm/pkg/PLIST b/games/scummvm/pkg/PLIST index 333b73c2e05..20b08e164fe 100644 --- a/games/scummvm/pkg/PLIST +++ b/games/scummvm/pkg/PLIST @@ -1,9 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.4 2005/11/03 09:35:31 jsg Exp $ +@comment $OpenBSD: PLIST,v 1.5 2007/07/07 01:37:53 jsg Exp $ bin/scummvm @man man/man6/scummvm.6 +share/applications/ +share/applications/scummvm.desktop share/doc/scummvm/ share/doc/scummvm/AUTHORS share/doc/scummvm/NEWS share/doc/scummvm/README -share/pixmaps/ -share/pixmaps/scummvm.xpm +share/icons/ +share/icons/scummvm.svg +share/icons/scummvm.xpm +share/scummvm/ +share/scummvm/classic080.ini +share/scummvm/modern.ini +share/scummvm/modern.zip