aboutsummaryrefslogtreecommitdiff
path: root/games/openrct2
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
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')
-rw-r--r--games/openrct2/Makefile9
-rw-r--r--games/openrct2/distinfo6
-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
-rw-r--r--games/openrct2/pkg-plist28
6 files changed, 57 insertions, 26 deletions
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index 9f6cfbea790a..d3930514947a 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -3,8 +3,7 @@
PORTNAME= openrct2
DISTVERSIONPREFIX= v
-DISTVERSION= 0.1.1
-PORTREVISION= 2
+DISTVERSION= 0.1.2
CATEGORIES= games
MAINTAINER= pkubaj@anongoth.pl
@@ -21,15 +20,14 @@ LIB_DEPENDS= libpng.so:graphics/png \
libcurl.so:ftp/curl \
libfreetype.so:print/freetype2
+USES= compiler:c++14-lang cmake:outsource desktop-file-utils iconv localbase:ldflags pkgconfig shared-mime-info ssl
USE_GITHUB= yes
GH_ACCOUNT= OpenRCT2
GH_PROJECT= OpenRCT2
-
-INSTALLS_ICONS= yes
-USES= compiler:c++14-lang cmake:outsource iconv localbase:ldflags pkgconfig ssl
USE_GL= gl
USE_LDCONFIG= yes
USE_SDL= sdl2
+INSTALLS_ICONS= yes
SUB_FILES= pkg-message
SUB_LIST= DISTVERSIONPREFIX=${DISTVERSIONPREFIX} \
DISTVERSION=${DISTVERSION} \
@@ -37,6 +35,7 @@ SUB_LIST= DISTVERSIONPREFIX=${DISTVERSIONPREFIX} \
CMAKE_ARGS= -DDOWNLOAD_TITLE_SEQUENCES=OFF
OPTIONS_DEFINE= DOCS
+PORTDOCS= changelog.txt contributors.md licence.txt readme.txt
post-patch:
@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo
index 648f35e54f1a..51c13cbb518d 100644
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509967245
-SHA256 (OpenRCT2-OpenRCT2-v0.1.1_GH0.tar.gz) = 5d7a6c7f3c770e7de506958f86789c438c543c27d312fd096322cde4e89f50ad
-SIZE (OpenRCT2-OpenRCT2-v0.1.1_GH0.tar.gz) = 6284135
+TIMESTAMP = 1521471656
+SHA256 (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 358fc0ceff848734b399dc63c1d7a0c096a54a793afe4522d6f0dd00ba9328c7
+SIZE (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 6769785
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).
diff --git a/games/openrct2/pkg-plist b/games/openrct2/pkg-plist
index b53a61802a29..509ff2f45150 100644
--- a/games/openrct2/pkg-plist
+++ b/games/openrct2/pkg-plist
@@ -1,18 +1,24 @@
bin/openrct2
+bin/openrct2-cli
lib/libopenrct2.a
+man/man6/openrct2.6.gz
+share/applications/openrct2-savegame.desktop
+share/applications/openrct2-scenario.desktop
+share/applications/openrct2-uri.desktop
share/applications/openrct2.desktop
-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/contributors.md
-%%PORTDOCS%%%%DOCSDIR%%/licence.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
share/icons/hicolor/128x128/apps/openrct2.png
share/icons/hicolor/16x16/apps/openrct2.png
+share/icons/hicolor/24x24/apps/openrct2.png
share/icons/hicolor/256x256/apps/openrct2.png
share/icons/hicolor/32x32/apps/openrct2.png
+share/icons/hicolor/48x48/apps/openrct2.png
share/icons/hicolor/64x64/apps/openrct2.png
+share/icons/hicolor/96x96/apps/openrct2.png
share/icons/hicolor/scalable/apps/openrct2.svg
-man/man6/openrct2.6.gz
+share/metainfo/openrct2.appdata.xml
+share/mime/packages/openrct2.xml
%%DATADIR%%/g2.dat
+%%DATADIR%%/language/ar-EG.txt
%%DATADIR%%/language/ca-ES.txt
%%DATADIR%%/language/cs-CZ.txt
%%DATADIR%%/language/de-DE.txt
@@ -33,11 +39,11 @@ man/man6/openrct2.6.gz
%%DATADIR%%/language/sv-SE.txt
%%DATADIR%%/language/zh-CN.txt
%%DATADIR%%/language/zh-TW.txt
-%%DATADIR%%/shaders/copyframebuffer.frag
-%%DATADIR%%/shaders/copyframebuffer.vert
-%%DATADIR%%/shaders/drawimage.frag
-%%DATADIR%%/shaders/drawimage.vert
+%%DATADIR%%/shaders/applypalette.frag
+%%DATADIR%%/shaders/applypalette.vert
+%%DATADIR%%/shaders/applytransparency.frag
+%%DATADIR%%/shaders/applytransparency.vert
%%DATADIR%%/shaders/drawline.frag
%%DATADIR%%/shaders/drawline.vert
-%%DATADIR%%/shaders/fillrect.frag
-%%DATADIR%%/shaders/fillrect.vert
+%%DATADIR%%/shaders/drawrect.frag
+%%DATADIR%%/shaders/drawrect.vert