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

OpenClonk: bump git revision

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-09-09 00:29:56 +10:00
parent e932d77f9b
commit 8eb75898c9
2 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
games-action/openclonk/openclonk-9.0~git.recipe
View File

@@ -8,10 +8,10 @@ building a mine or fight each other on an arena-like map."
HOMEPAGE="https://www.openclonk.org/"
COPYRIGHT="2009-2019 OpenClonk Team and contributors"
LICENSE="ISC"
REVISION="2"
srcGitRev="d35334a1846a64dfc0c0c9d6dd9b8c77414fb55a"
REVISION="3"
srcGitRev="a080958de3b3f95edcc5756cdd2fe56adb0cf64f"
SOURCE_URI="https://github.com/openclonk/openclonk/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="fca1527b0ae7abace50eb77c8dbd675311e1c59a673bf057aa531498c797f7c9"
CHECKSUM_SHA256="30c0c71f22e586b5c0e2c60aceb210bf39e519c8779b83e495a5791db48a5929"
SOURCE_DIR="openclonk-$srcGitRev"
PATCHES="openclonk-$portVersion.patchset"
ADDITIONAL_FILES="openclonk.rdef.in"
@@ -40,7 +40,7 @@ REQUIRES="
lib:libjpeg$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libreadline$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_image_2.0$secondaryArchSuffix
@@ -65,7 +65,7 @@ BUILD_REQUIRES="
devel:libjpeg$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libSDL2$secondaryArchSuffix
devel:libSDL2_image$secondaryArchSuffix

36
games-action/openclonk/patches/openclonk-9.0~git.patchset
View File

@@ -1,11 +1,11 @@
From 1b8c89f392cbfb9fdaef7d0523de0f3a2b682380 Mon Sep 17 00:00:00 2001
From 9e263bbfa015b600b0dfd7955631057263fcaec7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 24 Nov 2018 15:17:14 +1000
Date: Mon, 9 Sep 2019 00:15:38 +1000
Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aef3ba..faed3f2 100644
index 3aef3ba..443afb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,11 @@ CHECK_INCLUDE_FILE_CXX(sys/timerfd.h HAVE_SYS_TIMERFD_H)
@@ -20,15 +20,6 @@ index 3aef3ba..faed3f2 100644
CHECK_CXX_SOURCE_COMPILES("#include <getopt.h>\nint main(int argc, char * argv[]) { getopt_long(argc, argv, \"\", 0, 0); }" HAVE_GETOPT_H)
############################################################################
@@ -286,7 +290,7 @@ if(NOT HEADLESS_ONLY AND NOT C4GROUP_TOOL_ONLY)
endif()
if(NOT C4GROUP_TOOL_ONLY)
- if(UNIX AND NOT APPLE)
+ if(UNIX AND NOT APPLE AND NOT HAIKU)
FINDLIB(X11_LIBRARIES X11)
set(Backward_DIR thirdparty/backward-cpp)
@@ -1053,9 +1057,12 @@ endif()
if(HAVE_PTHREAD)
target_link_libraries(libmisc pthread)
@@ -137,24 +128,21 @@ index ed44d42..d045723 100644
SCopy("$HOME/.clonk/" C4ENGINENICK, UserDataPath);
#endif
diff --git a/src/game/ClonkMain.cpp b/src/game/ClonkMain.cpp
index a7c69dd..e78478d 100644
index a7c69dd..746cee6 100644
--- a/src/game/ClonkMain.cpp
+++ b/src/game/ClonkMain.cpp
@@ -206,11 +206,28 @@ static void restart(char * argv[])
@@ -206,11 +206,25 @@ static void restart(char * argv[])
int main (int argc, char * argv[])
{
+#ifdef __HAIKU__
+ char abs_exe_path[PATH_MAX];
+ char *ptr;
+ if(!(ptr = strrchr(argv[0], '/'))) {
+ getcwd(abs_exe_path, sizeof(abs_exe_path));
+ } else {
+ *ptr = '\0';
+ chdir(argv[0]);
+ getcwd(abs_exe_path, sizeof(abs_exe_path));
+ char *binpath = realpath(argv[0], NULL);
+ if (binpath != NULL) {
+ char *appdir = strrchr(binpath, '/');
+ *appdir = '\0';
+ chdir(binpath);
+ free(binpath);
+ }
+ chdir(abs_exe_path);
+
+ setenv("MESA_GL_VERSION_OVERRIDE", "3.3", 1);
+ setenv("MESA_GLSL_VERSION_OVERRIDE", "330", 1);
@@ -191,5 +179,5 @@ index 7ff84a8..ddf82ee 100644
return result;
--
2.21.0
2.23.0