From owner-svn-ports-all@freebsd.org Fri Mar 23 21:25:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD248F4A5F9; Fri, 23 Mar 2018 21:25:39 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 707A38DC8B; Fri, 23 Mar 2018 21:25:39 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6ADF425563; Fri, 23 Mar 2018 21:25:39 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2NLPd2P053271; Fri, 23 Mar 2018 21:25:39 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NLPc9i053265; Fri, 23 Mar 2018 21:25:38 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201803232125.w2NLPc9i053265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 23 Mar 2018 21:25:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465411 - in head/games/openrct2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/games/openrct2: . files X-SVN-Commit-Revision: 465411 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 21:25:40 -0000 Author: yuri Date: Fri Mar 23 21:25:38 2018 New Revision: 465411 URL: https://svnweb.freebsd.org/changeset/ports/465411 Log: 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 (maintainer) Added: head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp (contents, props changed) head/games/openrct2/files/patch-src_openrct2_util_Util.cpp (contents, props changed) Modified: head/games/openrct2/Makefile head/games/openrct2/distinfo head/games/openrct2/files/patch-src_openrct2_config_Config.cpp head/games/openrct2/pkg-plist Modified: head/games/openrct2/Makefile ============================================================================== --- head/games/openrct2/Makefile Fri Mar 23 21:24:03 2018 (r465410) +++ head/games/openrct2/Makefile Fri Mar 23 21:25:38 2018 (r465411) @@ -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}|' \ Modified: head/games/openrct2/distinfo ============================================================================== --- head/games/openrct2/distinfo Fri Mar 23 21:24:03 2018 (r465410) +++ head/games/openrct2/distinfo Fri Mar 23 21:25:38 2018 (r465411) @@ -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 Modified: head/games/openrct2/files/patch-src_openrct2_config_Config.cpp ============================================================================== --- head/games/openrct2/files/patch-src_openrct2_config_Config.cpp Fri Mar 23 21:24:03 2018 (r465410) +++ head/games/openrct2/files/patch-src_openrct2_config_Config.cpp Fri Mar 23 21:25:38 2018 (r465411) @@ -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[] = Added: head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openrct2/files/patch-src_openrct2_platform_Platform.Linux.cpp Fri Mar 23 21:25:38 2018 (r465411) @@ -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" Added: head/games/openrct2/files/patch-src_openrct2_util_Util.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openrct2/files/patch-src_openrct2_util_Util.cpp Fri Mar 23 21:25:38 2018 (r465411) @@ -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). Modified: head/games/openrct2/pkg-plist ============================================================================== --- head/games/openrct2/pkg-plist Fri Mar 23 21:24:03 2018 (r465410) +++ head/games/openrct2/pkg-plist Fri Mar 23 21:25:38 2018 (r465411) @@ -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