cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.10.0

Browse Source
This commit is contained in:
jsg 2007-07-07 01:37:53 +00:00
parent 5c47030920
commit dd738c4834
11 changed files with 68 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/scummvm-tools/Makefile
View File

@ -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 # XXX hardcoded endian list
COMMENT= "collection of various tools for scummvm" COMMENT= "collection of various tools for scummvm"
DISTNAME= scummvm-tools-0.9.0 DISTNAME= scummvm-tools-0.10.0
PKGNAME= ${DISTNAME}
WRKDIST= ${WRKDIR}/${DISTNAME:S/scummvm-//}
CATEGORIES= games CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@ -39,9 +37,10 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools
${INSTALL_PROGRAM} \ ${INSTALL_PROGRAM} \
${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \ ${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}/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 ${PREFIX}/bin
.include <bsd.port.mk> .include <bsd.port.mk>

10
games/scummvm-tools/distinfo
View File

@ -1,5 +1,5 @@
MD5 (scummvm-tools-0.9.0.tar.gz) = USnTCYau+M3VSFrzPOrByA== MD5 (scummvm-tools-0.10.0.tar.gz) = B3dtyNGQAdt7dN3UB8dwiA==
RMD160 (scummvm-tools-0.9.0.tar.gz) = AuoFvc1dIea71Q7UuGRk9LA4Z5Y= RMD160 (scummvm-tools-0.10.0.tar.gz) = hio2gVxHgPLfLS3g6yeLE8HauEQ=
SHA1 (scummvm-tools-0.9.0.tar.gz) = VKP/3+eWuiT/uT64EsTkqimuwVk= SHA1 (scummvm-tools-0.10.0.tar.gz) = WzNOWyL8uwqyhJuDSvObyke2Tgk=
SHA256 (scummvm-tools-0.9.0.tar.gz) = Uyr6A51hyggEhLORaoQEXix2AGAIL0ROQhTYqYs5B8c= SHA256 (scummvm-tools-0.10.0.tar.gz) = bjGvqZSaVO8SPlHowGGh03txR4P/ocUv4SzbgVh827U=
SIZE (scummvm-tools-0.9.0.tar.gz) = 139404 SIZE (scummvm-tools-0.10.0.tar.gz) = 163174

27
games/scummvm-tools/patches/patch-Makefile
View File

@ -1,40 +1,39 @@
$OpenBSD: patch-Makefile,v 1.5 2006/07/08 04:16:18 jsg Exp $ $OpenBSD: patch-Makefile,v 1.6 2007/07/07 01:39:47 jsg Exp $
--- Makefile.orig Thu Jun 22 07:11:51 2006 --- Makefile.orig Sun Jun 17 07:00:22 2007
+++ Makefile Sat Jul 8 14:01:11 2006 +++ Makefile Tue Jun 26 22:57:57 2007
@@ -3,9 +3,10 @@ @@ -3,9 +3,10 @@
SRC=. SRC=.
-CC := gcc -CC := gcc
-CXX := g++ -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 +#CC := gcc
+#CXX := g++ +#CXX := g++
+CFLAGS += -Wall -Wno-long-long -Wno-multichar +CFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX
+CXXFLAGS += -Wall -Wno-long-long -Wno-multichar +CXXFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX
# LDFLAGS += # LDFLAGS +=
# Additional warnings # Additional warnings
@@ -28,7 +29,7 @@ TARGETS := \ @@ -29,7 +30,6 @@ TARGETS := \
dekyra$(EXEEXT) \ dekyra$(EXEEXT) \
descumm$(EXEEXT) \ descumm$(EXEEXT) \
desword2$(EXEEXT) \ desword2$(EXEEXT) \
- encode_dxa$(EXEEXT) \ - encode_dxa$(EXEEXT) \
+# encode_dxa$(EXEEXT) \ extract_agos$(EXEEXT) \
extract_kyra$(EXEEXT) \ extract_kyra$(EXEEXT) \
extract_loom_tg16$(EXEEXT) \ extract_loom_tg16$(EXEEXT) \
extract_mm_c64$(EXEEXT) \ @@ -89,7 +89,7 @@ desword2$(EXEEXT): desword2.o util.o
@@ -61,7 +62,7 @@ compress_scumm_bun$(EXEEXT): compress_sc
$(CXX) $(LDFLAGS) -o $@ $+ $(CXX) $(LDFLAGS) -o $@ $+
encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz - $(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 $@ $+ $(CC) $(LDFLAGS) -o $@ $+
@@ -129,7 +130,7 @@ clean: @@ -148,7 +148,7 @@ clean:
rm -f *.o $(TARGETS) rm -f *.o utils/*.o $(TARGETS)
.cpp.o: .cpp.o:
- $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o - $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o

8
games/scummvm-tools/pkg/PLIST
View File

@ -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_kyra
bin/compress_queen bin/compress_queen
bin/compress_saga bin/compress_saga
bin/compress_scumm_bun bin/compress_scumm_bun
bin/compress_scumm_san bin/compress_scumm_san
bin/compress_scumm_sou bin/compress_scumm_sou
bin/compress_simon
bin/compress_sword1 bin/compress_sword1
bin/compress_sword2 bin/compress_sword2
bin/compress_touche
bin/dekyra bin/dekyra
bin/descumm bin/descumm
bin/desword2 bin/desword2
bin/extract_mm_nes
bin/extract_scumm_mac
bin/extract_zak_c64
share/doc/scummvm-tools/ share/doc/scummvm-tools/
share/doc/scummvm-tools/README share/doc/scummvm-tools/README

19
games/scummvm/Makefile
View File

@ -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" .if ${MACHINE_ARCH} == "hppa"
BROKEN= "gcc bug" BROKEN= "gcc bug"
.endif .endif
COMMENT= "graphical adventure game interpreter" COMMENT= "graphical adventure game interpreter"
DISTNAME= scummvm-0.9.1 DISTNAME= scummvm-0.10.0
CATEGORIES= games x11 emulators CATEGORIES= games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@ -61,10 +61,19 @@ CXXFLAGS+= -O1
do-install: do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA_DIR} ${PREFIX}/share/icons
${INSTALL_DATA} ${WRKSRC}/{NEWS,AUTHORS,README} ${PREFIX}/share/doc/scummvm ${INSTALL_DATA_DIR} ${PREFIX}/share/scummvm
${INSTALL_DATA} ${WRKSRC}/icons/scummvm.xpm ${PREFIX}/share/pixmaps ${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_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 ${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
.include <bsd.port.mk> .include <bsd.port.mk>

10
games/scummvm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (scummvm-0.9.1.tar.gz) = dFbJmonpSX+e8/632P/YLw== MD5 (scummvm-0.10.0.tar.gz) = WQFbIKPWcAiOEZCz+89orA==
RMD160 (scummvm-0.9.1.tar.gz) = sF5uKYmLgfBMnojF3C1jRijQQgE= RMD160 (scummvm-0.10.0.tar.gz) = nZgeOCdChaEbkENE4Xo7tcjDA64=
SHA1 (scummvm-0.9.1.tar.gz) = 4xnrXC6wJz8a7ormqeMJkUzXYBw= SHA1 (scummvm-0.10.0.tar.gz) = VSVP6IhSIQKOCIihav30s0Az75Y=
SHA256 (scummvm-0.9.1.tar.gz) = mx9Lh3SoawGiz5AbDceZQz2zh825AokyUPM8zqQYY+s= SHA256 (scummvm-0.10.0.tar.gz) = NwRGw5nyHa5nIt9HfEKfoHh/7CLHucEiZacwr2oXm8U=
SIZE (scummvm-0.9.1.tar.gz) = 5399932 SIZE (scummvm-0.10.0.tar.gz) = 5744317

12
games/scummvm/patches/patch-Makefile
View File

@ -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

20
games/scummvm/patches/patch-common_hashmap_h
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-common_hashmap_h,v 1.1 2006/07/08 04:14:30 jsg Exp $ $OpenBSD: patch-common_hashmap_h,v 1.2 2007/07/07 01:37:53 jsg Exp $
--- common/hashmap.h.orig Sat Jul 8 11:26:46 2006 --- common/hashmap.h.orig Tue Jun 26 21:57:02 2007
+++ common/hashmap.h Sat Jul 8 11:27:50 2006 +++ common/hashmap.h Tue Jun 26 21:57:37 2007
@@ -121,10 +121,7 @@ uint nextTableSize(uint x); @@ -88,10 +88,7 @@ template <class Key, class Val, class HashFunc = Hash<
template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key>, class BaseNodeFunc = BaseNode<Key, Val> >
class HashMap { class HashMap {
friend class const_iterator;
private: private:
-#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__SYMBIAN32__) || defined (PALMOS_MODE) -#if defined (PALMOS_MODE)
-//FIXME evc4, msvc6,msvc7 & GCC 2.9x doesn't like it as private member
public: public:
-#endif -#endif
BaseNodeFunc **_arr; // hashtable of size arrsize. -
uint _arrsize, _nele; typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t;
struct Node {

76
games/scummvm/patches/patch-engines_simon_simon_cpp
View File

@ -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);

22
games/scummvm/patches/patch-engines_simon_simon_h
View File

@ -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<byte *> _itemHeap;
byte *_iconFilePtr;

13
games/scummvm/pkg/PLIST
View File

@ -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 bin/scummvm
@man man/man6/scummvm.6 @man man/man6/scummvm.6
share/applications/
share/applications/scummvm.desktop
share/doc/scummvm/ share/doc/scummvm/
share/doc/scummvm/AUTHORS share/doc/scummvm/AUTHORS
share/doc/scummvm/NEWS share/doc/scummvm/NEWS
share/doc/scummvm/README share/doc/scummvm/README
share/pixmaps/ share/icons/
share/pixmaps/scummvm.xpm share/icons/scummvm.svg
share/icons/scummvm.xpm
share/scummvm/
share/scummvm/classic080.ini
share/scummvm/modern.ini
share/scummvm/modern.zip