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

Update to 0.9.0

Browse Source
This commit is contained in:
jsg 2006-07-08 04:14:30 +00:00
parent cd6c387f38
commit d3588d09d0
11 changed files with 186 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/scummvm-tools/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2005/11/03 10:17:10 jsg Exp $
# $OpenBSD: Makefile,v 1.9 2006/07/08 04:16:18 jsg Exp $
# XXX hardcoded endian list
COMMENT= "collection of various tools for scummvm"
DISTNAME= scummvm-tools-0.8.0
DISTNAME= scummvm-tools-0.9.0
PKGNAME= ${DISTNAME}
WRKDIST= ${WRKDIR}/${DISTNAME:S/scummvm-//}
CATEGORIES= games
@ -38,10 +38,10 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm-tools
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools
${INSTALL_PROGRAM} \
${WRKBUILD}/compress_{queen,san,scumm_bun,scumm_sou} \
${WRKBUILD}/compress_{simon,sword1,sword2} \
${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \
${WRKBUILD}/compress_{scumm_sou,simon,sword1,sword2} \
${WRKBUILD}/de{kyra,scumm,sword2} \
${WRKBUILD/extract_{mm_nes,scumm_mac,zak_c64} \
${WRKBUILD/extract_{kyra,mm_nes,scumm_mac,zak_c64} \
${PREFIX}/bin
.include <bsd.port.mk>

8
games/scummvm-tools/distinfo
View File

@ -1,4 +1,4 @@
MD5 (scummvm-tools-0.8.0.tar.gz) = d6898dcd806b6290f9956e8fa72f06ce
RMD160 (scummvm-tools-0.8.0.tar.gz) = 6f06e7c2e1abfba1c230a6d4aab817e4cd92dc38
SHA1 (scummvm-tools-0.8.0.tar.gz) = e8c00464d9dc2b2af6f4452d669b5be83bf66e7a
SIZE (scummvm-tools-0.8.0.tar.gz) = 109751
MD5 (scummvm-tools-0.9.0.tar.gz) = 5129d30986aef8cdd5485af33ceac1c8
RMD160 (scummvm-tools-0.9.0.tar.gz) = 02ea05bdcd5d21e6bbd50ed4b86464f4b0386796
SHA1 (scummvm-tools-0.9.0.tar.gz) = 54a3ffdfe796ba24ffb93eb812c4e4aa29aec159
SIZE (scummvm-tools-0.9.0.tar.gz) = 139404

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

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.4 2005/11/03 10:17:10 jsg Exp $
--- Makefile.orig Thu Nov 3 20:59:51 2005
+++ Makefile Thu Nov 3 21:01:53 2005
@@ -1,8 +1,9 @@
$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
@@ -3,9 +3,10 @@
SRC=.
-CC := gcc
@ -14,7 +15,25 @@ $OpenBSD: patch-Makefile,v 1.4 2005/11/03 10:17:10 jsg Exp $
# LDFLAGS +=
# Additional warnings
@@ -101,7 +102,7 @@ clean:
@@ -28,7 +29,7 @@ TARGETS := \
dekyra$(EXEEXT) \
descumm$(EXEEXT) \
desword2$(EXEEXT) \
- encode_dxa$(EXEEXT) \
+# encode_dxa$(EXEEXT) \
extract_kyra$(EXEEXT) \
extract_loom_tg16$(EXEEXT) \
extract_mm_c64$(EXEEXT) \
@@ -61,7 +62,7 @@ compress_scumm_bun$(EXEEXT): compress_sc
$(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 $@ $+
extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
$(CC) $(LDFLAGS) -o $@ $+
@@ -129,7 +130,7 @@ clean:
rm -f *.o $(TARGETS)
.cpp.o:

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

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2005/11/03 10:17:10 jsg Exp $
@comment $OpenBSD: PLIST,v 1.6 2006/07/08 04:16:18 jsg Exp $
bin/compress_kyra
bin/compress_queen
bin/compress_san
bin/compress_saga
bin/compress_scumm_bun
bin/compress_scumm_san
bin/compress_scumm_sou
bin/compress_simon
bin/compress_sword1

14
games/scummvm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2006/02/07 23:20:39 jsg Exp $
# $OpenBSD: Makefile,v 1.21 2006/07/08 04:14:30 jsg Exp $
.if ${MACHINE_ARCH} == "hppa"
BROKEN= "gcc bug"
.endif
COMMENT= "graphical adventure game interpreter"
DISTNAME= scummvm-0.8.2
DISTNAME= scummvm-0.9.0
CATEGORIES= games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@ -49,16 +49,22 @@ USE_X11= Yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
# XXX gcc3 compiling compact.cpp with -O2 gobbles 800MB
# ICE on sparc with >= -O1
.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
CXXFLAGS+= -O0
.endif
# prevent ICE
.if ${MACHINE_ARCH} == "arm"
CXXFLAGS+= -O1
.endif
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}/scummvm.xpm ${PREFIX}/share/pixmaps
${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
${INSTALL_DATA} ${WRKSRC}/icons/scummvm.xpm ${PREFIX}/share/pixmaps
${INSTALL_MAN} ${WRKSRC}/dists/scummvm.6 ${PREFIX}/man/man6
${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
.include <bsd.port.mk>

8
games/scummvm/distinfo
View File

@ -1,4 +1,4 @@
MD5 (scummvm-0.8.2.tar.gz) = 36cd1e2d4b88dba49131f0b3681e5d5b
RMD160 (scummvm-0.8.2.tar.gz) = af3dd9a76c7ed05add38d5d4900fea929457d68c
SHA1 (scummvm-0.8.2.tar.gz) = 5348bdedcf02c51bdf0820947a71ebd8d120aee7
SIZE (scummvm-0.8.2.tar.gz) = 3199395
MD5 (scummvm-0.9.0.tar.gz) = 0b3de955474d9d97aec95da4b79afbfc
RMD160 (scummvm-0.9.0.tar.gz) = d1daae2e8e996fc91eda2db6b38672b8a6fccb84
SHA1 (scummvm-0.9.0.tar.gz) = 4a75a0b18e3b9ec8c23d511dca98dccb5b891f5c
SIZE (scummvm-0.9.0.tar.gz) = 5234765

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

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.7 2005/01/06 00:29:48 jsg Exp $
--- Makefile.orig Tue Dec 21 08:06:22 2004
+++ Makefile Fri Dec 31 12:42:15 2004
@@ -22,7 +22,7 @@ include config.mak
# CXXFLAGS+= -Werror
$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

14
games/scummvm/patches/patch-common_hashmap_h Normal file
View File

@ -0,0 +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 Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key>, class BaseNodeFunc = BaseNode<Key, Val> >
class HashMap {
private:
-#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__SYMBIAN32__) || defined (PALMOS_MODE)
-//FIXME evc4, msvc6,msvc7 & GCC 2.9x doesn't like it as private member
public:
-#endif
BaseNodeFunc **_arr; // hashtable of size arrsize.
uint _arrsize, _nele;

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

@ -0,0 +1,76 @@
$OpenBSD: patch-engines_simon_simon_cpp,v 1.1 2006/07/08 04:14:30 jsg Exp $
--- engines/simon/simon.cpp.orig Thu Jun 22 07:14:03 2006
+++ engines/simon/simon.cpp Fri Jul 7 18:55:58 2006
@@ -97,10 +97,6 @@ SimonEngine::SimonEngine(OSystem *syst)
_itemArraySize = 0;
_itemArrayInited = 0;
- _itemHeapPtr = 0;
- _itemHeapCurPos = 0;
- _itemHeapSize = 0;
-
_iconFilePtr = 0;
_tblList = 0;
@@ -588,7 +584,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);
@@ -654,16 +655,11 @@ void SimonEngine::paletteFadeOut(byte *p
}
byte *SimonEngine::allocateItem(uint size) {
- byte *org = _itemHeapPtr;
- size = (size + 3) & ~3;
+ byte *item = new byte[size];
- _itemHeapPtr += size;
- _itemHeapCurPos += size;
-
- if (_itemHeapCurPos > _itemHeapSize)
- error("Itemheap overflow");
-
- return org;
+ memset(item, 0, size);
+ _itemHeap.push_back(item);
+ return item;
}
void SimonEngine::setUserFlag(Item *item, int a, int b) {
@@ -728,9 +724,7 @@ Child *SimonEngine::allocateChildBlock(I
}
void SimonEngine::allocItemHeap() {
- _itemHeapSize = 10000;
- _itemHeapCurPos = 0;
- _itemHeapPtr = (byte *)calloc(10000, 1);
+ _itemHeap.clear();
}
void SimonEngine::allocTablesHeap() {
@@ -1961,8 +1955,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 Normal file
View File

@ -0,0 +1,22 @@
$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;

18
games/scummvm/patches/patch-tools_convbdf_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-tools_convbdf_c,v 1.1 2006/07/08 04:14:30 jsg Exp $
--- tools/convbdf.c.orig Sat Jul 8 13:46:02 2006
+++ tools/convbdf.c Sat Jul 8 13:46:30 2006
@@ -810,12 +810,13 @@ int gen_c_source(struct font* pf, char *
width, height, xoff, yoff);
if (gen_map) {
+ int h;
fprintf(ofp, "\n +");
for (x=0; x<width; ++x) fprintf(ofp, "-");
fprintf(ofp, "+\n");
x = 0;
- int h = height;
+ h = height;
while (h > 0) {
if (x == 0) fprintf(ofp, " |");