haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Maelstrom: enable x86_64

Browse Source
This commit is contained in:
Sergei Reznikov
2018-12-05 14:02:49 +03:00
parent 18d77f09e1
commit 8c279fca00
2 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
games-action/maelstrom/maelstrom-3.0.6.recipe
View File

@@ -1,8 +1,7 @@
SUMMARY="Blast the Asteroids!"
DESCRIPTION="
You pilot your ship through the dreaded \"Maelstrom\" asteroid belt -- suddenly
your best friend thrusts towards you and fires, directly at your cockpit. You
raise your shields just in time, and the battle is joined.
DESCRIPTION="You pilot your ship through the dreaded \"Maelstrom\" asteroid \
belt -- suddenly your best friend thrusts towards you and fires, directly at \
your cockpit. You raise your shields just in time, and the battle is joined.
The deadliest stretch of space known to mankind has just gotten deadlier.
Everywhere massive asteroids jostle for a chance to crush your ship, and deadly
@@ -23,28 +22,27 @@ CHECKSUM_SHA256="e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b4
SOURCE_DIR="Maelstrom-$portVersion"
PATCHES="maelstrom-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
maelstrom$secondaryArchSuffix = $portVersion
maelstrom = $portVersion
app:Maelstrom
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libSDL_net_1.2$secondaryArchSuffix
haiku
lib:libsdl
lib:libSDL_net_1.2
"
BUILD_REQUIRES="
devel:libsdl$secondaryArchSuffix
devel:libSDL_net$secondaryArchSuffix
devel:libsdl
devel:libSDL_net
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
haiku_devel
cmd:autom4te
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
cmd:nasm
@@ -70,7 +68,7 @@ INSTALL()
rm -rf $appsDir
mv $prefix/games $appsDir
cp Maelstrom Maelstrom-netd $appsDir/Maelstrom/
cp Maelstrom Maelstrom-netd $appsDir/Maelstrom
addAppDeskbarSymlink $appsDir/Maelstrom/Maelstrom Maelstrom
addAppDeskbarSymlink $appsDir/Maelstrom/Maelstrom
}

31
games-action/maelstrom/patches/maelstrom-3.0.6.patchset
View File

@@ -1,4 +1,4 @@
From 0aac53a13823ba5d1025006650115865a75944d4 Mon Sep 17 00:00:00 2001
From f7c5c2d9e10abc77c0978577398157df7ee004b3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 12 Jan 2014 13:27:13 +0100
Subject: Add haiku support to configure script.
@@ -20,5 +20,32 @@ index 0170f4b..4f99f3f 100644
MATHLIB=""
INETLIB=""
--
1.8.3.4
2.19.1
From 3afd629bbde11de44e9cce91793f014674654c8e Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 5 Dec 2018 14:00:48 +0300
Subject: Fix build on x86_64
diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp
index d1e087f..01bb13a 100644
--- a/screenlib/SDL_FrameBuf.cpp
+++ b/screenlib/SDL_FrameBuf.cpp
@@ -847,10 +847,8 @@ FrameBuf:: AddDirtyRect(SDL_Rect *rect)
/* 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;
--
2.19.1