This updates scummvm to the latest major version.
Testing on zaurus appreciated to make sure tremor
support isn't busted.
Tested on amd64/sparc64 thus far.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 2 Nov 2006 07:48:59 -0000 1.23
+++ Makefile 29 Jun 2007 05:11:20 -0000
@@ -5,7 +5,7 @@ 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 <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/scummvm/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 5 Apr 2007 15:38:11 -0000 1.15
+++ distinfo 29 Jun 2007 05:11:20 -0000
@@ -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
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 8 Jul 2006 04:14:30 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-common_hashmap_h
===================================================================
RCS file: /cvs/ports/games/scummvm/patches/patch-common_hashmap_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-common_hashmap_h
--- patches/patch-common_hashmap_h 8 Jul 2006 04:14:30 -0000 1.1
+++ patches/patch-common_hashmap_h 29 Jun 2007 05:11:20 -0000
@@ -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 Key, class Val, class HashFunc = Hash<Key>, class EqualFunc =
EqualTo<Key>, class BaseNodeFunc = BaseNode<Key, Val> >
+--- 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 <class Key, class Val, class HashFunc = Hash<
class HashMap {
+ friend class const_iterator;
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
+-#if defined (PALMOS_MODE)
public:
-#endif
- BaseNodeFunc **_arr; // hashtable of size arrsize.
- uint _arrsize, _nele;
-
+-
+ typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t;
+
+ struct Node {
Index: patches/patch-engines_simon_simon_cpp
===================================================================
RCS file: patches/patch-engines_simon_simon_cpp
diff -N patches/patch-engines_simon_simon_cpp
--- patches/patch-engines_simon_simon_cpp 2 Nov 2006 07:48:59 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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);
Index: patches/patch-engines_simon_simon_h
===================================================================
RCS file: patches/patch-engines_simon_simon_h
diff -N patches/patch-engines_simon_simon_h
--- patches/patch-engines_simon_simon_h 8 Jul 2006 04:14:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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;
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/scummvm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 3 Nov 2005 09:35:31 -0000 1.4
+++ pkg/PLIST 29 Jun 2007 05:11:20 -0000
@@ -1,9 +1,16 @@
@comment $OpenBSD: PLIST,v 1.4 2005/11/03 09:35:31 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
