Index: head/games/openrct2/Makefile =================================================================== --- head/games/openrct2/Makefile (revision 465410) +++ head/games/openrct2/Makefile (revision 465411) @@ -1,45 +1,44 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= openrct2 DISTVERSIONPREFIX= v -DISTVERSION= 0.1.1 -PORTREVISION= 2 +DISTVERSION= 0.1.2 CATEGORIES= games MAINTAINER= pkubaj@anongoth.pl COMMENT= Open source re-implementation of RollerCoaster Tycoon 2 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/licence.txt LIB_DEPENDS= libpng.so:graphics/png \ libjansson.so:devel/jansson \ libzip.so:archivers/libzip \ libspeexdsp.so:audio/speexdsp \ libfontconfig.so:x11-fonts/fontconfig \ 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} \ PORTNAME=${PORTNAME} 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}|' \ ${WRKSRC}/src/openrct2/config/Config.cpp .include Index: head/games/openrct2/distinfo =================================================================== --- head/games/openrct2/distinfo (revision 465410) +++ head/games/openrct2/distinfo (revision 465411) @@ -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 Index: head/games/openrct2/files/patch-src_openrct2_config_Config.cpp =================================================================== --- head/games/openrct2/files/patch-src_openrct2_config_Config.cpp (revision 465410) +++ head/games/openrct2/files/patch-src_openrct2_config_Config.cpp (revision 465411) @@ -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[] = Index: head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp =================================================================== --- head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp (nonexistent) +++ head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp (revision 465411) @@ -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 ++#include ++#include ++#endif + #include + #include + #include "../core/Path.hpp" Property changes on: head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/openrct2/files/patch-src_openrct2_util_Util.cpp =================================================================== --- head/games/openrct2/files/patch-src_openrct2_util_Util.cpp (nonexistent) +++ head/games/openrct2/files/patch-src_openrct2_util_Util.cpp (revision 465411) @@ -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). Property changes on: head/games/openrct2/files/patch-src_openrct2_util_Util.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/openrct2/pkg-plist =================================================================== --- head/games/openrct2/pkg-plist (revision 465410) +++ head/games/openrct2/pkg-plist (revision 465411) @@ -1,43 +1,49 @@ 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 %%DATADIR%%/language/en-GB.txt %%DATADIR%%/language/en-US.txt %%DATADIR%%/language/es-ES.txt %%DATADIR%%/language/fi-FI.txt %%DATADIR%%/language/fr-FR.txt %%DATADIR%%/language/hu-HU.txt %%DATADIR%%/language/it-IT.txt %%DATADIR%%/language/ja-JP.txt %%DATADIR%%/language/ko-KR.txt %%DATADIR%%/language/nb-NO.txt %%DATADIR%%/language/nl-NL.txt %%DATADIR%%/language/pl-PL.txt %%DATADIR%%/language/pt-BR.txt %%DATADIR%%/language/ru-RU.txt %%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