mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
arx_libertatis, revbump, dump python requirement (#13505)
add some build fixes
This commit is contained in:
@@ -8,15 +8,16 @@ porting the game to new systems as well as eliminating bugs and limitations."
|
||||
HOMEPAGE="https://arx-libertatis.org/"
|
||||
COPYRIGHT="2012-2021 Arx-Libertatis team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="4"
|
||||
REVISION="5"
|
||||
SOURCE_URI="https://github.com/arx/ArxLibertatis/releases/download/$portVersion/arx-libertatis-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="bacf7768c4e21c9166c7ea57083d4f20db0deb8f0ee7d96b5f2829e73a75ad0c"
|
||||
SOURCE_DIR="arx-libertatis-$portVersion"
|
||||
PATCHES="arx_libertatis-$portVersion.patchset"
|
||||
srcGitRev2="68b5907feff0dda72fe5435e1108ccd2ad7e8ed5"
|
||||
SOURCE_URI_2="https://github.com/EXL/BeGameLauncher/archive/$srcGitRev2.tar.gz"
|
||||
CHECKSUM_SHA256_2="e564291d665ad3c9bb329e6849ab399d1ce0cbc59bd47bcc15a22f3c6e9345a1"
|
||||
SOURCE_DIR_2="BeGameLauncher-$srcGitRev2"
|
||||
PATCHES="arx_libertatis-$portVersion.patchset"
|
||||
PATCHES_2="arx_libertatis-$portVersion-source2.patchset"
|
||||
ADDITIONAL_FILES="arx_libertatis.rdef"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -58,7 +59,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:python
|
||||
# cmd:python
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -87,7 +88,8 @@ BUILD()
|
||||
-DBUILD_CRASHREPORTER=OFF \
|
||||
-DBUILD_PROFILER=OFF \
|
||||
-DBUILD_TESTS=OFF \
|
||||
-DUNITY_BUILD=OFF
|
||||
-DUNITY_BUILD=OFF \
|
||||
-Wno-dev
|
||||
make $jobArgs
|
||||
|
||||
cd $sourceDir2
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
From 5a1c2448028f6b1fc3da896704554af84dc7aff9 Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Sat, 27 Dec 2025 16:34:46 +0100
|
||||
Subject: Fix cmake requirement
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3e2568a..61a078d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -22,7 +22,7 @@
|
||||
## SOFTWARE.
|
||||
##########################################################################################
|
||||
|
||||
-cmake_minimum_required(VERSION 3.1)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(BeGameLauncher CXX)
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 23af82c2a4a458ef8d0bbbfbe8cda2305f85a3b1 Mon Sep 17 00:00:00 2001
|
||||
From 622f3ea109115eb5bc56a7968b821aeef6b4fbe7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 7 Sep 2021 15:06:51 +1000
|
||||
Subject: Fix build for Haiku
|
||||
@@ -301,5 +301,28 @@ index b9432e4..dee2d87 100644
|
||||
} // extern "C"
|
||||
#endif
|
||||
--
|
||||
2.30.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 746a53df035aca2cc1d9aaa3d8fb1b5e669db53e Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Sat, 27 Dec 2025 16:31:29 +0100
|
||||
Subject: build fix
|
||||
|
||||
|
||||
diff --git a/src/platform/Thread.cpp b/src/platform/Thread.cpp
|
||||
index f217491..206e149 100644
|
||||
--- a/src/platform/Thread.cpp
|
||||
+++ b/src/platform/Thread.cpp
|
||||
@@ -136,7 +136,7 @@ void * Thread::entryPoint(void * param) {
|
||||
Thread & thread = *static_cast<Thread *>(param);
|
||||
|
||||
// Set the thread name.
|
||||
- #if ARX_HAVE_PTHREAD_SETNAME_NP && ARX_PLATFORM != ARX_PLATFORM_MACOS
|
||||
+ #if ARX_HAVE_PTHREAD_SETNAME_NP && ARX_PLATFORM != ARX_PLATFORM_MACOS && ARX_PLATFORM != ARX_PLATFORM_HAIKU
|
||||
// Linux
|
||||
pthread_setname_np(thread.m_thread, thread.m_threadName.c_str());
|
||||
#elif ARX_HAVE_PTHREAD_SETNAME_NP && ARX_PLATFORM == ARX_PLATFORM_MACOS
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user