Initial import

6 files changed, 161 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..cf7e0bf6e073
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = maelstrom
+	pkgdesc = Asteroids-type game with sound and 3D objects
+	pkgver = 3.0.6
+	pkgrel = 3
+	url = http://www.libsdl.org/projects/Maelstrom/index.html
+	install = maelstrom.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = sdl_net
+	depends = gcc-libs
+	backup = var/games/Maelstrom.scores
+	source = http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-3.0.6.tar.gz
+	source = maelstrom-3.0.6-64bits.patch
+	source = maelstrom-scores.patch
+	source = Maelstrom.desktop
+	md5sums = 96aa6359538a6bd60b4198a792de578b
+	md5sums = 471ef416576d1ba7dabfa12a4825e271
+	md5sums = 131dc95ec8d23f510cdec2bb10dbb9b4
+	md5sums = 4e9009d8c1b7afd68f54084565135d6c
+	sha1sums = 2036fb814db2263ca44ebe3397dbed66720249b7
+	sha1sums = 3156c1607727b2dcf9b946b60db3053f650dddef
+	sha1sums = b2c49116069f33fefceb56bebe18ded3f31e8e6a
+	sha1sums = 8190cc973ea82ba2b629132931b7164e27643205
+
+pkgname = maelstrom
+
diff --git a/Maelstrom.desktop b/Maelstrom.desktop
new file mode 100644
index 000000000000..74808a3d6f21
--- /dev/null
+++ b/Maelstrom.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=Maelstrom
+Exec=/usr/bin/Maelstrom
+Icon=/usr/share/Maelstrom/icon.xpm
+Name=Maelstrom
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Game;
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..4ef648df823a
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Marcin Skory <armitage at q84fh dot net>
+# Contributor: dale <dale@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=maelstrom
+pkgver=3.0.6
+pkgrel=3
+pkgdesc="Asteroids-type game with sound and 3D objects"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('sdl_net' 'gcc-libs')
+backup=('var/games/Maelstrom.scores')
+install=maelstrom.install
+source=(http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${pkgver}.tar.gz
+	maelstrom-3.0.6-64bits.patch
+	maelstrom-scores.patch
+	Maelstrom.desktop)
+url="http://www.libsdl.org/projects/Maelstrom/index.html"
+md5sums=('96aa6359538a6bd60b4198a792de578b'
+         '471ef416576d1ba7dabfa12a4825e271'
+         '131dc95ec8d23f510cdec2bb10dbb9b4'
+	 '4e9009d8c1b7afd68f54084565135d6c')
+sha1sums=('2036fb814db2263ca44ebe3397dbed66720249b7'
+	 '3156c1607727b2dcf9b946b60db3053f650dddef'
+	 'b2c49116069f33fefceb56bebe18ded3f31e8e6a'
+	 '8190cc973ea82ba2b629132931b7164e27643205')
+
+build() {
+  cd $srcdir/Maelstrom-${pkgver}
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -Np0 -i ../maelstrom-3.0.6-64bits.patch || return 1
+  fi
+  patch -Np0 -i $srcdir/maelstrom-scores.patch || return 1
+  sed -i -e 's/games\/\$PACKAGE/share\/\$PACKAGE/g' configure
+  ./configure --prefix=/usr || return 1
+  make || return 1
+}
+
+package() {
+  cd $srcdir/Maelstrom-${pkgver}
+  
+  make -j1 prefix=$pkgdir/usr install || return 1
+  mkdir -p $pkgdir/usr/share/applications
+  install -m644 $srcdir/Maelstrom.desktop $pkgdir/usr/share/applications/Maelstrom.desktop || return 1
+
+  chown root:games $pkgdir/usr/bin/Maelstrom || return 1
+  chmod 2555 $pkgdir/usr/bin/Maelstrom || return 1
+
+  mkdir -p $pkgdir/var/games
+  mv $pkgdir/usr/share/Maelstrom/Maelstrom-Scores $pkgdir/var/games/Maelstrom.scores || return 1
+  chown root:games $pkgdir/var/games/Maelstrom.scores || return 1
+  chmod 664 $pkgdir/var/games/Maelstrom.scores || return 1
+}
diff --git a/maelstrom-3.0.6-64bits.patch b/maelstrom-3.0.6-64bits.patch
new file mode 100644
index 000000000000..bdf04d3ad30d
--- /dev/null
+++ b/maelstrom-3.0.6-64bits.patch
@@ -0,0 +1,15 @@
+--- screenlib/SDL_FrameBuf.cpp.old	2006-10-25 22:37:21.000000000 +0200
++++ screenlib/SDL_FrameBuf.cpp	2006-10-25 22:38:26.000000000 +0200
+@@ -847,10 +847,8 @@
+ 			/* Update the dirty rectangle map with the new list */
+ 			for ( i=0; i<dirtymaplen; ++i ) {
+ 				if ( dirtymap[i] != NULL ) {
+-					dirtymap[i] = (SDL_Rect *)(
+-					((int)dirtymap[i]-(int)updatelist) +
+-								(int)newlist
+-					);
++					dirtymap[i] = newlist
++						+ (dirtymap[i]-updatelist);
+ 				}
+ 			}
+ 			delete[] updatelist;
diff --git a/maelstrom-scores.patch b/maelstrom-scores.patch
new file mode 100644
index 000000000000..3d76cf55eb85
--- /dev/null
+++ b/maelstrom-scores.patch
@@ -0,0 +1,38 @@
+--- scores.cpp.orig	2007-12-26 19:07:53.000000000 +0000
++++ scores.cpp	2007-12-26 19:08:30.000000000 +0000
+@@ -15,7 +15,7 @@
+ #include "load.h"
+ #include "dialog.h"
+ 
+-#define MAELSTROM_SCORES	"Maelstrom-Scores"
++#define MAELSTROM_SCORES	"/var/games/Maelstrom.scores"
+ #define NUM_SCORES		10		// Do not change this!
+ 
+ /* Everyone can write to scores file if defined to 0 */
+@@ -44,7 +44,7 @@
+ 	}
+ 	memset(&hScores, 0, sizeof(hScores));
+ 
+-	scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "rb");
++	scores_src = SDL_RWFromFile(MAELSTROM_SCORES, "rb");
+ 	if ( scores_src != NULL ) {
+ 		for ( i=0; i<NUM_SCORES; ++i ) {
+ 			SDL_RWread(scores_src, hScores[i].name,
+@@ -72,7 +72,7 @@
+ #ifdef unix
+ 	omask=umask(SCORES_PERMMASK);
+ #endif
+-	scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "wb");
++	scores_src = SDL_RWFromFile(MAELSTROM_SCORES, "wb");
+ 	if ( scores_src != NULL ) {
+ 		for ( i=0; i<NUM_SCORES; ++i ) {
+ 			SDL_RWwrite(scores_src, hScores[i].name,
+@@ -83,7 +83,7 @@
+ 		SDL_RWclose(scores_src);
+ 	} else {
+ 		error("Warning: Couldn't save scores to %s\n",
+-						path.Path(MAELSTROM_SCORES));
++						MAELSTROM_SCORES);
+ 	}
+ #ifdef unix
+ 	umask(omask);
diff --git a/maelstrom.install b/maelstrom.install
new file mode 100644
index 000000000000..e82790929052
--- /dev/null
+++ b/maelstrom.install
@@ -0,0 +1,18 @@
+pre_upgrade() {
+  if [ -f usr/games/Maelstrom-Scores ]; then
+    mv usr/games/Maelstrom-Scores var/games/Maelstrom.scores.old
+  fi
+}
+
+post_upgrade() {
+  if [ -f var/games/Maelstrom.scores.old ]; then
+    mv var/games/Maelstrom.scores.old var/games/Maelstrom.scores
+    chown root:games var/games/Maelstrom.scores
+    chmod 664 var/games/Maelstrom.scores
+  fi
+}
+
+op=$1
+shift
+
+$op $*