aboutsummaryrefslogtreecommitdiff
path: root/games/openrct2/files
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2018-03-23 21:25:38 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2018-03-23 21:25:38 +0000
commitf8e03b120b15b3f514493ec342994c8abc37de65 (patch)
treec8d516d7cb139882478ccb99b22ce587c9171dd5 /games/openrct2/files
parentd6285e96d36c37067a7ce5db1746789b1b16aa4b (diff)
downloadports-f8e03b120b15b3f514493ec342994c8abc37de65.tar.gz
ports-f8e03b120b15b3f514493ec342994c8abc37de65.zip
games/openrct2: Update to 0.1.1 -> 0.1.2
Port changes: * Add USES=desktop-file-utils * Add USES=shared-mime-info * Group the USExx section PR: 226803 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> (maintainer)
Notes
Notes: svn path=/head/; revision=465411
Diffstat (limited to 'games/openrct2/files')
-rw-r--r--games/openrct2/files/patch-src_openrct2_config_Config.cpp15
-rw-r--r--games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp14
-rw-r--r--games/openrct2/files/patch-src_openrct2_util_Util.cpp11
3 files changed, 33 insertions, 7 deletions
diff --git a/games/openrct2/files/patch-src_openrct2_config_Config.cpp b/games/openrct2/files/patch-src_openrct2_config_Config.cpp
index ff81e3d573d7..32ff94dab22a 100644
--- a/games/openrct2/files/patch-src_openrct2_config_Config.cpp
+++ b/games/openrct2/files/patch-src_openrct2_config_Config.cpp
@@ -1,11 +1,12 @@
---- src/openrct2/config/Config.cpp.orig 2017-08-09 22:02:59 UTC
+--- src/openrct2/config/Config.cpp.orig 2018-03-18 20:26:14 UTC
+++ src/openrct2/config/Config.cpp
-@@ -591,6 +591,8 @@ namespace Config
+@@ -602,6 +602,9 @@ namespace Config
+ */
+ static std::string FindRCT2Path()
{
++
++ return "%%DATADIR%%";
++
log_verbose("config_find_rct2_path(...)");
-+ return "%%DATADIR%%";
-+
- static const utf8 * searchLocations[] =
- {
- "C:\\GOG Games\\RollerCoaster Tycoon 2 Triple Thrill Pack",
+ static constexpr const utf8 * searchLocations[] =
diff --git a/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp b/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp
new file mode 100644
index 000000000000..abba392a83de
--- /dev/null
+++ b/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp
@@ -0,0 +1,14 @@
+--- src/openrct2/platform/Platform.Linux.cpp.orig 2018-03-18 20:26:14 UTC
++++ src/openrct2/platform/Platform.Linux.cpp
+@@ -16,6 +16,11 @@
+
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__linux__) && !defined(__ANDROID__))
+
++#ifdef __FreeBSD__
++#include <stddef.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif
+ #include <limits.h>
+ #include <pwd.h>
+ #include "../core/Path.hpp"
diff --git a/games/openrct2/files/patch-src_openrct2_util_Util.cpp b/games/openrct2/files/patch-src_openrct2_util_Util.cpp
new file mode 100644
index 000000000000..c71c2046ecc1
--- /dev/null
+++ b/games/openrct2/files/patch-src_openrct2_util_Util.cpp
@@ -0,0 +1,11 @@
+--- src/openrct2/util/Util.cpp.orig 2018-03-18 20:26:14 UTC
++++ src/openrct2/util/Util.cpp
+@@ -222,7 +222,7 @@ bool avx2_available()
+ // https://github.com/gcc-mirror/gcc/commit/132fa33ce998df69a9f793d63785785f4b93e6f1
+ // which causes it to ignore subleafs, but the new function is unavailable on Ubuntu's
+ // prehistoric toolchains
+-#if defined(OpenRCT2_CPUID_GNUC_X86)
++#if defined(OpenRCT2_CPUID_GNUC_X86) && (!defined(__FreeBSD__) || (__FreeBSD__ > 10))
+ return __builtin_cpu_supports("avx2");
+ #else
+ // AVX2 support is declared as the 5th bit of EBX with CPUID(EAX = 7, ECX = 0).