diff --git a/games-action/openclonk/openclonk-9.0~git.recipe b/games-action/openclonk/openclonk-9.0~git.recipe index 73e0e9905..f2356d726 100644 --- a/games-action/openclonk/openclonk-9.0~git.recipe +++ b/games-action/openclonk/openclonk-9.0~git.recipe @@ -9,9 +9,9 @@ HOMEPAGE="https://www.openclonk.org/" COPYRIGHT="2009-2018 OpenClonk Team and contributors" LICENSE="ISC" REVISION="1" -srcGitRev="11cfcdd9103c039175a503419d3b658ffb6b4002" +srcGitRev="d35334a1846a64dfc0c0c9d6dd9b8c77414fb55a" SOURCE_URI="https://github.com/openclonk/openclonk/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="6afe1a4af0b7a28fac6bb558e207c684262685cfca9a6ddfd838947d35d1a6ab" +CHECKSUM_SHA256="fca1527b0ae7abace50eb77c8dbd675311e1c59a673bf057aa531498c797f7c9" SOURCE_DIR="openclonk-$srcGitRev" PATCHES="openclonk-$portVersion.patchset" ADDITIONAL_FILES="openclonk.rdef.in" @@ -23,6 +23,7 @@ PROVIDES=" openclonk$secondaryArchSuffix = $portVersion app:OpenClonk$secondaryArchSuffix cmd:c4group$secondaryArchSuffix + cmd:openclonk_server$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix @@ -33,16 +34,18 @@ REQUIRES=" lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix lib:libgthread_2.0$secondaryArchSuffix - lib:libgl$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libglew$secondaryArchSuffix - lib:libglu$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libopenal$secondaryArchSuffix lib:libpng$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libSDL2_image_2.0$secondaryArchSuffix lib:libSDL2_mixer_2.0$secondaryArchSuffix + lib:libtinyxml$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -58,14 +61,16 @@ BUILD_REQUIRES=" devel:libgthread_2.0$secondaryArchSuffix devel:libgl$secondaryArchSuffix devel:libglew$secondaryArchSuffix - devel:libglu$secondaryArchSuffix + devel:libGLU$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libopenal$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libSDL2_2.0$secondaryArchSuffix - devel:libSDL2_image_2.0$secondaryArchSuffix - devel:libSDL2_mixer_2.0$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libSDL2$secondaryArchSuffix + devel:libSDL2_image$secondaryArchSuffix + devel:libSDL2_mixer$secondaryArchSuffix + devel:libtinyxml$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/games-action/openclonk/patches/openclonk-9.0~git.patchset b/games-action/openclonk/patches/openclonk-9.0~git.patchset index 208909b08..4674f25b8 100644 --- a/games-action/openclonk/patches/openclonk-9.0~git.patchset +++ b/games-action/openclonk/patches/openclonk-9.0~git.patchset @@ -1,14 +1,14 @@ -From b89921768ca5c1a33602bcbb2e55f8146a5cc38e Mon Sep 17 00:00:00 2001 +From 1b8c89f392cbfb9fdaef7d0523de0f3a2b682380 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 24 Nov 2018 15:17:14 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index b52f29a..f0b278e 100644 +index 3aef3ba..faed3f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -224,7 +224,11 @@ CHECK_INCLUDE_FILE_CXX(sys/timerfd.h HAVE_SYS_TIMERFD_H) +@@ -205,7 +205,11 @@ CHECK_INCLUDE_FILE_CXX(sys/timerfd.h HAVE_SYS_TIMERFD_H) CHECK_INCLUDE_FILE_CXX(sys/socket.h HAVE_SYS_SOCKET_H) CHECK_INCLUDE_FILE_CXX(sys/eventfd.h HAVE_SYS_EVENTFD_H) CHECK_INCLUDE_FILE_CXX(sys/file.h HAVE_SYS_FILE_H) @@ -20,7 +20,7 @@ index b52f29a..f0b278e 100644 CHECK_CXX_SOURCE_COMPILES("#include \nint main(int argc, char * argv[]) { getopt_long(argc, argv, \"\", 0, 0); }" HAVE_GETOPT_H) ############################################################################ -@@ -305,7 +309,7 @@ if(NOT HEADLESS_ONLY AND NOT C4GROUP_TOOL_ONLY) +@@ -286,7 +290,7 @@ if(NOT HEADLESS_ONLY AND NOT C4GROUP_TOOL_ONLY) endif() if(NOT C4GROUP_TOOL_ONLY) @@ -29,7 +29,7 @@ index b52f29a..f0b278e 100644 FINDLIB(X11_LIBRARIES X11) set(Backward_DIR thirdparty/backward-cpp) -@@ -1064,9 +1068,12 @@ endif() +@@ -1053,9 +1057,12 @@ endif() if(HAVE_PTHREAD) target_link_libraries(libmisc pthread) endif() @@ -44,10 +44,10 @@ index b52f29a..f0b278e 100644 add_library(libc4script STATIC src/C4Include.cpp diff --git a/config.h.cmake b/config.h.cmake -index 7bd3460..b690e89 100644 +index e2cec4c..cfe20bb 100644 --- a/config.h.cmake +++ b/config.h.cmake -@@ -122,7 +122,11 @@ +@@ -107,7 +107,11 @@ /* Path to data directory */ #ifdef WITH_APPDIR_INSTALLATION @@ -60,10 +60,10 @@ index 7bd3460..b690e89 100644 #define OC_SYSTEM_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/games/openclonk" #endif diff --git a/src/config/C4Config.cpp b/src/config/C4Config.cpp -index 95a5da5..1c6417e 100644 +index ed44d42..d045723 100644 --- a/src/config/C4Config.cpp +++ b/src/config/C4Config.cpp -@@ -113,8 +113,8 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp) +@@ -110,8 +110,8 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp) { pComp->Value(mkNamingAdapt(ResX, "ResolutionX", -1 ,false, true)); pComp->Value(mkNamingAdapt(ResY, "ResolutionY", -1 ,false, true)); @@ -74,7 +74,7 @@ index 95a5da5..1c6417e 100644 pComp->Value(mkNamingAdapt(RefreshRate, "RefreshRate", 0 )); pComp->Value(mkNamingAdapt(SplitscreenDividers, "SplitscreenDividers", 1 )); pComp->Value(mkNamingAdapt(ShowStartupMessages, "ShowStartupMessages", 1 ,false, true)); -@@ -124,14 +124,14 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp) +@@ -121,14 +121,14 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp) pComp->Value(mkNamingAdapt(ShowClock, "ShowClock", 0 ,false, true)); pComp->Value(mkNamingAdapt(ShowCrewNames, "ShowCrewNames", 1 ,false, true)); pComp->Value(mkNamingAdapt(ShowCrewCNames, "ShowCrewCNames", 0 ,false, true)); @@ -91,16 +91,18 @@ index 95a5da5..1c6417e 100644 pComp->Value(mkNamingAdapt(AutoFrameSkip, "AutoFrameSkip", 1 )); pComp->Value(mkNamingAdapt(MouseCursorSize, "MouseCursorSize", 50 )); } -@@ -212,6 +212,8 @@ void C4ConfigSecurity::CompileFunc(StdCompiler *pComp) +@@ -209,7 +209,9 @@ void C4ConfigSecurity::CompileFunc(StdCompiler *pComp) pComp->Value(mkNamingAdapt(s(KeyPath), "KeyPath", R"(%APPDATA%\)" C4ENGINENAME, false, true)); #elif defined(__linux__) pComp->Value(mkNamingAdapt(s(KeyPath), "KeyPath", "$HOME/.clonk/" C4ENGINENICK, false, true)); +-#elif defined(__APPLE__) +#elif defined(__HAIKU__) + pComp->Value(mkNamingAdapt(s(KeyPath), "KeyPath", "$HOME/config/settings/" C4ENGINENICK, false, true)); - #elif defined(__APPLE__) ++#elif defined(__APPLE__)#elif defined(__APPLE__) pComp->Value(mkNamingAdapt(s(KeyPath), "KeyPath", "$HOME/Library/Application Support/" C4ENGINENAME, false, true)); #endif -@@ -304,6 +306,8 @@ void C4Config::GetConfigFileName(StdStrBuf &filename, const char *szConfigFile) + } +@@ -301,6 +303,8 @@ void C4Config::GetConfigFileName(StdStrBuf &filename, const char *szConfigFile) filename.Copy(home); #ifdef __APPLE__ filename += "Library/Preferences/" C4ENGINEID ".config"; @@ -109,7 +111,7 @@ index 95a5da5..1c6417e 100644 #else filename += ".clonk/" C4ENGINENICK "/config"; #endif -@@ -343,6 +347,15 @@ bool C4Config::Load(const char *szConfigFile) +@@ -340,6 +344,15 @@ bool C4Config::Load(const char *szConfigFile) filename += ".clonk/" C4ENGINENICK; CreatePath(filename.getData()); } @@ -125,7 +127,7 @@ index 95a5da5..1c6417e 100644 #endif // Buggy StdCompiler crashes when compiling a Null-StdStrBuf buf.Ref(" "); -@@ -503,6 +516,8 @@ void C4ConfigGeneral::DeterminePaths() +@@ -500,6 +513,8 @@ void C4ConfigGeneral::DeterminePaths() SCopy(R"(%APPDATA%\)" C4ENGINENAME, UserDataPath); #elif defined(__APPLE__) SCopy("$HOME/Library/Application Support/" C4ENGINENAME, UserDataPath); @@ -189,5 +191,5 @@ index 7ff84a8..ddf82ee 100644 return result; -- -2.19.1 +2.21.0