haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

homeworld_sdl, fix references for lib:libsdl, fix build (#8957)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-07-04 11:10:09 +02:00
committed by GitHub
parent 54860a3d43
commit e84d66f12a
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
View File

@@ -7,12 +7,13 @@ released the source code to the public under license."
HOMEPAGE="https://gitlab.com/ThibaultLemaire/HomeworldSDL/"
COPYRIGHT="1999-2000 Sierra On-Line, Inc."
LICENSE="RE-INC-EULA"
REVISION="3"
REVISION="4"
SOURCE_URI="https://bitbucket.org/extrowerk/homeworld-sdl-haiku/get/e80d5e8c7a73.tar.gz"
CHECKSUM_SHA256="f098c3f713eca5718433ffb4bc9a7ad71eb7d584cbf9fe9eb3a1266363843bd1"
SOURCE_DIR="extrowerk-homeworld-sdl-haiku-e80d5e8c7a73"
PATCHES="homeworld_sdl-$portVersion.patchset"
ARCHITECTURES="all"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -22,15 +23,15 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglu$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgl$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libGLU$secondaryArchSuffix
devel:libSDL_1.2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
@@ -38,7 +39,7 @@ BUILD_PREREQUIRES="
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:libtool$secondaryArchSuffix
cmd:make
cmd:unzip
cmd:yacc$secondaryArchSuffix
@@ -49,8 +50,10 @@ BUILD()
cd Haiku
echo "Bootstrapping Homewold_SDL"
bash ./bootstrap
echo "Configuring Homeworld_SDL"
runConfigure ../configure -C --bindir=$appsDir/Homeworld_SDL
echo "Building Homeworld_SDL"
make $jobArgs
}
@@ -60,14 +63,18 @@ INSTALL()
cd Haiku/src
echo "Striping debug symbols"
strip homeworld
echo "Creating bin directory for packaging Homeworld_SDL"
mkdir -p $appsDir/Homeworld_SDL
echo "Moving binary into the bin directory"
cp homeworld $appsDir/Homeworld_SDL/homeworld_sdl
cd ..
unzip -o ./Haiku_Extra/Homeworld_Haiku_Start.sh.zip
cp Homeworld_Haiku_Start.sh $appsDir/Homeworld_SDL/Start_Homeworld_SDL.sh
echo "Adding Homeworld_SDL to the Deskbar"
addAppDeskbarSymlink $appsDir/Homeworld_SDL/Start_Homeworld_SDL.sh \
Homeworld_SDL
}

24
games-strategy/homeworld_sdl/patches/homeworld_sdl-0.6.patchset Normal file
View File

@@ -0,0 +1,24 @@
From d59caec94dd6a1fc9bc40e8da0ce02358e4b2f57 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Tue, 4 Jul 2023 10:59:58 +0000
Subject: Fix multiple definitions of *mGameCreationState*
diff --git a/src/SDL/TitanInterfaceC.h b/src/SDL/TitanInterfaceC.h
old mode 100755
new mode 100644
index caef1af..cc3e4b8
--- a/src/SDL/TitanInterfaceC.h
+++ b/src/SDL/TitanInterfaceC.h
@@ -322,7 +322,7 @@ void titanLeaveGame(int shutdown);
#define REQUEST_RECV_CB_JUSTDENY 0
#define REQUEST_RECV_CB_ACCEPT 1
-enum { GAME_NOT_STARTED, GAME_STARTING, GAME_STARTED } mGameCreationState;
+extern enum { GAME_NOT_STARTED, GAME_STARTING, GAME_STARTED } mGameCreationState;
signed long titanRequestReceivedCB(Address *address,const void *blob,unsigned short bloblen);
--
2.37.3