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

Update to 0.9.1

Browse Source
This commit is contained in:
jsg 2006-11-02 07:48:59 +00:00
parent a62699c8bc
commit 1870699743
4 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/scummvm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2006/08/01 10:50:19 espie Exp $
# $OpenBSD: Makefile,v 1.23 2006/11/02 07:48:59 jsg Exp $
.if ${MACHINE_ARCH} == "hppa"
BROKEN= "gcc bug"
.endif
COMMENT= "graphical adventure game interpreter"
DISTNAME= scummvm-0.9.0
DISTNAME= scummvm-0.9.1
CATEGORIES= games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}

8
games/scummvm/distinfo
View File

@ -1,4 +1,4 @@
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
MD5 (scummvm-0.9.1.tar.gz) = 7456c99a89e9497f9ef3feb7d8ffd82f
RMD160 (scummvm-0.9.1.tar.gz) = b05e6e29898b81f04c9e88c5dc2d634628d04201
SHA1 (scummvm-0.9.1.tar.gz) = e319eb5c2eb0273f1aee8ae6a9e309914cd7601c
SIZE (scummvm-0.9.1.tar.gz) = 5399932

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

@ -1,6 +1,6 @@
$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
$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;
@ -12,7 +12,7 @@ $OpenBSD: patch-engines_simon_simon_cpp,v 1.1 2006/07/08 04:14:30 jsg Exp $
_iconFilePtr = 0;
_tblList = 0;
@@ -588,7 +584,12 @@ SimonEngine::~SimonEngine() {
@@ -587,7 +583,12 @@ SimonEngine::~SimonEngine() {
midi.close();
@ -26,28 +26,28 @@ $OpenBSD: patch-engines_simon_simon_cpp,v 1.1 2006/07/08 04:14:30 jsg Exp $
free(_tablesHeapPtr - _tablesHeapCurPos);
free(_gameOffsetsPtr);
@@ -654,16 +655,11 @@ void SimonEngine::paletteFadeOut(byte *p
@@ -653,16 +654,10 @@ 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");
- 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) {
@@ -728,9 +724,7 @@ Child *SimonEngine::allocateChildBlock(I
@@ -727,9 +722,7 @@ Child *SimonEngine::allocateChildBlock(I
}
void SimonEngine::allocItemHeap() {
@ -58,7 +58,7 @@ $OpenBSD: patch-engines_simon_simon_cpp,v 1.1 2006/07/08 04:14:30 jsg Exp $
}
void SimonEngine::allocTablesHeap() {
@@ -1961,8 +1955,13 @@ void SimonEngine::shutdown() {
@@ -1961,8 +1954,13 @@ void SimonEngine::shutdown() {
free(_stringTabPtr);
free(_itemArrayPtr);

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

@ -1,18 +0,0 @@
$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, " |");