FreeBSD Bugzilla – Attachment 191663 Details for
Bug 226803
games/openrct2: update to 0.1.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
openrct2.patch (text/plain), 6.37 KB, created by
Piotr Kubaj
on 2018-03-20 17:56:37 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Piotr Kubaj
Created:
2018-03-20 17:56:37 UTC
Size:
6.37 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 465087) >+++ Makefile (working copy) >@@ -3,8 +3,7 @@ > > PORTNAME= openrct2 > DISTVERSIONPREFIX= v >-DISTVERSION= 0.1.1 >-PORTREVISION= 2 >+DISTVERSION= 0.1.2 > CATEGORIES= games > > MAINTAINER= pkubaj@anongoth.pl >@@ -37,6 +36,7 @@ > 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}|' \ >Index: distinfo >=================================================================== >--- distinfo (revision 465087) >+++ distinfo (working copy) >@@ -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: files/patch-src_openrct2_config_Config.cpp >=================================================================== >--- files/patch-src_openrct2_config_Config.cpp (revision 465087) >+++ files/patch-src_openrct2_config_Config.cpp (working copy) >@@ -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 "/usr/local/share/openrct2"; >++ > 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: files/patch-src_openrct2_platform_Platform.Linux.cpp >=================================================================== >--- files/patch-src_openrct2_platform_Platform.Linux.cpp (nonexistent) >+++ files/patch-src_openrct2_platform_Platform.Linux.cpp (working copy) >@@ -0,0 +1,18 @@ >+--- src/openrct2/platform/Platform.Linux.cpp.orig 2018-03-18 20:26:14 UTC >++++ src/openrct2/platform/Platform.Linux.cpp >+@@ -146,14 +146,7 @@ namespace Platform >+ { >+ log_fatal("failed to read /proc/self/exe"); >+ } >+-#elif defined(__FreeBSD__) >+- const sint32 mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; >+- auto exeLen = sizeof(exePath); >+- if (sysctl(mib, 4, exePath, &exeLen, nullptr, 0) == -1) >+- { >+- log_fatal("failed to get process path"); >+- } >+-#elif defined(__OpenBSD__) >++#elif defined(__OpenBSD__) || defined(__FreeBSD__) >+ // There is no way to get the path name of a running executable. >+ // If you are not using the port or package, you may have to change this line! >+ strlcpy(exePath, "/usr/local/bin/", sizeof(exePath)); > >Property changes on: 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: files/patch-src_openrct2_util_Util.cpp >=================================================================== >--- files/patch-src_openrct2_util_Util.cpp (nonexistent) >+++ files/patch-src_openrct2_util_Util.cpp (working copy) >@@ -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__) >+ 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: 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: pkg-plist >=================================================================== >--- pkg-plist (revision 465087) >+++ pkg-plist (working copy) >@@ -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 @@ > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 226803
:
191663
|
191667
|
191688
|
191735