maelstrom, fix reference to libSDL* (#3970)

This commit is contained in:
Schrijvers Luc
2019-07-08 23:52:59 +02:00
committed by waddlesplash
parent 9a63f93b31
commit 53f6ca5ea5
2 changed files with 36 additions and 10 deletions

View File

@@ -16,7 +16,7 @@ home..."
HOMEPAGE="http://www.libsdl.org/projects/Maelstrom"
COPYRIGHT="1996-2005 Sam Lantinga"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-$portVersion.tar.gz"
CHECKSUM_SHA256="e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b46"
SOURCE_DIR="Maelstrom-$portVersion"
@@ -27,15 +27,16 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
maelstrom = $portVersion
app:Maelstrom
cmd:Maelstrom_netd$secondaryArchSuffix
"
REQUIRES="
haiku
lib:libsdl
lib:libSDL_1.2
lib:libSDL_net_1.2
"
BUILD_REQUIRES="
devel:libsdl
devel:libSDL
devel:libSDL_net
"
BUILD_PREREQUIRES="
@@ -64,11 +65,11 @@ BUILD()
INSTALL()
{
mkdir -p $binDir
make install
rm -rf $appsDir
mv $prefix/games $appsDir
cp Maelstrom Maelstrom-netd $appsDir/Maelstrom
cp Maelstrom $appsDir/Maelstrom/
cp Maelstrom-netd $binDir
addAppDeskbarSymlink $appsDir/Maelstrom/Maelstrom
}

View File

@@ -1,4 +1,4 @@
From f7c5c2d9e10abc77c0978577398157df7ee004b3 Mon Sep 17 00:00:00 2001
From 0480996a4935c9ca94dbfa94f26ee5cc51d77324 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,10 +20,10 @@ index 0170f4b..4f99f3f 100644
MATHLIB=""
INETLIB=""
--
2.19.1
2.21.0
From 3afd629bbde11de44e9cce91793f014674654c8e Mon Sep 17 00:00:00 2001
From 9bfb5d370173ffe6eb641b6d077e42aa0b4b7c17 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
@@ -47,5 +47,30 @@ index d1e087f..01bb13a 100644
}
delete[] updatelist;
--
2.19.1
2.21.0
From fe0aa7eef21afd8c95e33514ae873125eb904114 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 8 Jul 2019 21:44:51 +0200
Subject: Fix install path
diff --git a/configure.in b/configure.in
index 4f99f3f..b7e4942 100644
--- a/configure.in
+++ b/configure.in
@@ -108,6 +108,10 @@ case "$target" in
ac_default_prefix=/boot/beos
GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
;;
+ *-*-haiku*)
+ ac_default_prefix=/system
+ GAME_INSTALLDIR="\$(prefix)/apps/$PACKAGE"
+ ;;
*)
GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
;;
--
2.21.0