aboutsummaryrefslogtreecommitdiff
path: root/games/colobot/files
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2021-12-04 19:54:49 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2021-12-04 19:57:13 +0000
commitbb8f1127a412e69f9fd9295f75a8f16160ba55bf (patch)
treeb66b18fbc160546decba70261addf2b26ccaac5c /games/colobot/files
parentde775f189edd6af3112d6a2c409e66eec227e2c7 (diff)
downloadports-bb8f1127a412e69f9fd9295f75a8f16160ba55bf.tar.gz
ports-bb8f1127a412e69f9fd9295f75a8f16160ba55bf.zip
games/colobot: update to 0.2.0-alpha
Remove stale patch.
Diffstat (limited to 'games/colobot/files')
-rw-r--r--games/colobot/files/patch-CMakeLists.txt21
-rw-r--r--games/colobot/files/patch-src_common_config.h.cmake10
-rw-r--r--games/colobot/files/patch-src_common_system_system.cpp20
-rw-r--r--games/colobot/files/patch-src_common_system_system__linux.cpp11
-rw-r--r--games/colobot/files/patch-src_object_task_taskgoto.h11
5 files changed, 59 insertions, 14 deletions
diff --git a/games/colobot/files/patch-CMakeLists.txt b/games/colobot/files/patch-CMakeLists.txt
index 2e7b482c273c..f0f2a9ddd173 100644
--- a/games/colobot/files/patch-CMakeLists.txt
+++ b/games/colobot/files/patch-CMakeLists.txt
@@ -1,6 +1,17 @@
---- CMakeLists.txt.orig 2021-12-03 18:38:49 UTC
+--- CMakeLists.txt.orig 2021-08-21 20:57:34 UTC
+++ CMakeLists.txt
-@@ -135,15 +135,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+@@ -115,8 +115,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+
+ # Platform-dependent implementation of system.h
+ # On FreeBSD we can use *_other
+- set(SYSTEM_CPP_MODULE "system_other.cpp")
+- set(SYSTEM_H_MODULE "system_other.h")
++ set(SYSTEM_CPP_MODULE "system_linux.cpp")
++ set(SYSTEM_H_MODULE "system_linux.h")
+ # To avoid CMake warning
+ set(CMAKE_MACOSX_RPATH 1)
+ else()
+@@ -155,15 +155,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message(STATUS "Detected GCC version 4.7+")
@@ -17,10 +28,14 @@
set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -153,10 +146,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -173,14 +166,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang version 3.1+")
+- if (${PLATFORM_FREEBSD})
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
+- endif()
+-
- set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- set(RELEASE_CXX_FLAGS "-O2")
diff --git a/games/colobot/files/patch-src_common_config.h.cmake b/games/colobot/files/patch-src_common_config.h.cmake
new file mode 100644
index 000000000000..2817a913d30b
--- /dev/null
+++ b/games/colobot/files/patch-src_common_config.h.cmake
@@ -0,0 +1,10 @@
+--- src/common/config.h.cmake.orig 2021-12-03 23:29:13 UTC
++++ src/common/config.h.cmake
+@@ -2,6 +2,7 @@
+
+ // Macros set by CMake
+ #cmakedefine PLATFORM_WINDOWS @PLATFORM_WINDOWS@
++#cmakedefine PLATFORM_FREEBSD @PLATFORM_FREEBSD@
+ #cmakedefine PLATFORM_LINUX @PLATFORM_LINUX@
+ #cmakedefine PLATFORM_GNU @PLATFORM_GNU@
+ #cmakedefine PLATFORM_MACOSX @PLATFORM_MACOSX@
diff --git a/games/colobot/files/patch-src_common_system_system.cpp b/games/colobot/files/patch-src_common_system_system.cpp
new file mode 100644
index 000000000000..88d93b0e2ee7
--- /dev/null
+++ b/games/colobot/files/patch-src_common_system_system.cpp
@@ -0,0 +1,20 @@
+--- src/common/system/system.cpp.orig 2021-08-21 20:57:34 UTC
++++ src/common/system/system.cpp
+@@ -24,7 +24,7 @@
+
+ #if defined(PLATFORM_WINDOWS)
+ #include "common/system/system_windows.h"
+-#elif defined(PLATFORM_LINUX)
++#elif defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD)
+ #include "common/system/system_linux.h"
+ #elif defined(PLATFORM_MACOSX)
+ #include "common/system/system_macosx.h"
+@@ -43,7 +43,7 @@ std::unique_ptr<CSystemUtils> CSystemUtils::Create()
+ std::unique_ptr<CSystemUtils> instance;
+ #if defined(PLATFORM_WINDOWS)
+ instance = MakeUnique<CSystemUtilsWindows>();
+-#elif defined(PLATFORM_LINUX)
++#elif defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD)
+ instance = MakeUnique<CSystemUtilsLinux>();
+ #elif defined(PLATFORM_MACOSX)
+ instance = MakeUnique<CSystemUtilsMacOSX>();
diff --git a/games/colobot/files/patch-src_common_system_system__linux.cpp b/games/colobot/files/patch-src_common_system_system__linux.cpp
new file mode 100644
index 000000000000..f8c50217d45b
--- /dev/null
+++ b/games/colobot/files/patch-src_common_system_system__linux.cpp
@@ -0,0 +1,11 @@
+--- src/common/system/system_linux.cpp.orig 2021-12-03 22:35:25 UTC
++++ src/common/system/system_linux.cpp
+@@ -98,7 +98,7 @@ void CSystemUtilsLinux::InterpolateTimeStamp(SystemTim
+
+ void CSystemUtilsLinux::GetCurrentTimeStamp(SystemTimeStamp *stamp)
+ {
+- clock_gettime(CLOCK_MONOTONIC_RAW, &stamp->clockTime);
++ clock_gettime(CLOCK_MONOTONIC, &stamp->clockTime);
+ }
+
+ long long CSystemUtilsLinux::TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after)
diff --git a/games/colobot/files/patch-src_object_task_taskgoto.h b/games/colobot/files/patch-src_object_task_taskgoto.h
deleted file mode 100644
index 1ed370fc0815..000000000000
--- a/games/colobot/files/patch-src_object_task_taskgoto.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/object/task/taskgoto.h.orig 2019-10-18 08:14:46 UTC
-+++ src/object/task/taskgoto.h
-@@ -147,7 +147,7 @@ class CTaskGoto : public CForegroundTask (protected)
- int m_bmTotal = 0; // number of points in m_bmPoints
- int m_bmIndex = 0; // index in m_bmPoints
- Math::Vector m_bmPoints[MAXPOINTS+2];
-- char m_bmIter[MAXPOINTS+2] = {};
-+ signed char m_bmIter[MAXPOINTS+2] = {};
- int m_bmIterCounter = 0;
- CObject* m_bmCargoObject = nullptr;
- float m_bmFinalMove = 0.0f; // final advance distance