update colobot to 0.12.0 and switch to python3

ok bentley@
This commit is contained in:
daniel 2021-03-07 01:28:21 +00:00
parent 41d5224dd2
commit 555be0c04b
10 changed files with 800 additions and 21 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.3 2021/03/07 01:28:21 daniel Exp $
V ?= 0.1.11.1
V ?= 0.1.12
CATEGORIES ?= games

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2019/05/20 22:15:09 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2021/03/07 01:28:21 daniel Exp $
COMMENT = programming-focused real-time strategy game
DISTNAME = colobot-$V
REVISION = 1
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL GLEW GLU SDL2 SDL2_image SDL2_ttf boost_filesystem-mt

View File

@ -1,2 +1,2 @@
SHA256 (colobot-0.1.11.1.tar.gz) = jle4TxCc6Rzy0xHDh3L5Ieyxozb/r96nhFXlrFgkzkA=
SIZE (colobot-0.1.11.1.tar.gz) = 1451861
SHA256 (colobot-0.1.12.tar.gz) = OOAab7jGcCA7huehAMee1KtKmk3MAf0mpqV/QPoai1w=
SIZE (colobot-0.1.12.tar.gz) = 1468594

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/09/25 08:53:04 bentley Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2021/03/07 01:28:21 daniel Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -132,14 +132,13 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -135,14 +135,13 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message(STATUS "Detected GCC version 4.7+")
@ -18,7 +18,7 @@ Index: CMakeLists.txt
set(DEBUG_CXX_FLAGS "-g -O0")
set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
@@ -150,9 +149,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -153,9 +152,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang version 3.1+")

View File

@ -1,15 +1,15 @@
$OpenBSD: patch-src_common_system_system_cpp,v 1.1.1.1 2018/09/25 08:53:04 bentley Exp $
$OpenBSD: patch-src_common_system_system_cpp,v 1.2 2021/03/07 01:28:21 daniel Exp $
Pull XDG directory code from system_linux.cpp.
Index: src/common/system/system.cpp
--- src/common/system/system.cpp.orig
+++ src/common/system/system.cpp
@@ -190,5 +190,26 @@ std::string CSystemUtils::GetLangPath()
@@ -188,5 +188,26 @@ std::string CSystemUtils::GetLangPath()
std::string CSystemUtils::GetSaveDir()
{
- return std::string("saves");
- return "./saves";
+ std::string savegameDir;
+
+ // Determine savegame dir according to XDG Base Directory Specification

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/09/25 08:53:04 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/03/07 01:28:21 daniel Exp $
@bin bin/colobot
lib/colobot/
lib/colobot/libCBot.so
@so lib/colobot/libCBot.so
share/colobot/shaders/
share/colobot/shaders/gl21/
share/colobot/shaders/gl21/fs_interface.glsl
@ -21,4 +21,5 @@ share/locale/cs/LC_MESSAGES/colobot.mo
share/locale/de/LC_MESSAGES/colobot.mo
share/locale/fr/LC_MESSAGES/colobot.mo
share/locale/pl/LC_MESSAGES/colobot.mo
share/locale/pt/LC_MESSAGES/colobot.mo
share/locale/ru/LC_MESSAGES/colobot.mo

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2021/02/23 19:39:22 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2021/03/07 01:28:21 daniel Exp $
PKG_ARCH = *
@ -12,7 +12,7 @@ GH_PROJECT = colobot-data
MODULES = devel/cmake \
lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_SETUPUTILS = No
MODPY_RUNDEP = No

View File

@ -1,2 +1,2 @@
SHA256 (colobot-data-0.1.11.1.tar.gz) = Xl5ccho8yJ/+1KkKy44GTGiOL6vD2lTJq31J0Zm3P2Y=
SIZE (colobot-data-0.1.11.1.tar.gz) = 54160035
SHA256 (colobot-data-0.1.12.tar.gz) = butTFJr4rcm30gdZoXakGFd5UjcbIOyY/M8MX/JZHqk=
SIZE (colobot-data-0.1.12.tar.gz) = 54732267

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
SHA256 (colobot-music_ogg_0.1.11.1-alpha.tar.gz) = VeidJE8fY+JGfvcSU8qIHuMSefAqrJrEcG7ybEZjBuk=
SIZE (colobot-music_ogg_0.1.11.1-alpha.tar.gz) = 55596353
SHA256 (colobot-music_ogg_0.1.12-alpha.tar.gz) = VeidJE8fY+JGfvcSU8qIHuMSefAqrJrEcG7ybEZjBuk=
SIZE (colobot-music_ogg_0.1.12-alpha.tar.gz) = 55596353