Attachment #191663 for bug #226803

Lines 3-10 Link Here

(-)Makefile (-2 / +2 lines)
3		3
4	PORTNAME= openrct2	4	PORTNAME= openrct2
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 0.1.1	6	DISTVERSION= 0.1.2
7	PORTREVISION= 2
8	CATEGORIES= games	7	CATEGORIES= games
9		8
10	MAINTAINER= pkubaj@anongoth.pl	9	MAINTAINER= pkubaj@anongoth.pl
Lines 37-42 Link Here
37	CMAKE_ARGS= -DDOWNLOAD_TITLE_SEQUENCES=OFF	36	CMAKE_ARGS= -DDOWNLOAD_TITLE_SEQUENCES=OFF
38		37
39	OPTIONS_DEFINE= DOCS	38	OPTIONS_DEFINE= DOCS
		39	PORTDOCS= changelog.txt contributors.md licence.txt readme.txt
40		40
41	post-patch:	41	post-patch:
42	@${REINPLACE_CMD} -e 's\|%%DATADIR%%\|${DATADIR}\|' \	42	@${REINPLACE_CMD} -e 's\|%%DATADIR%%\|${DATADIR}\|' \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1509967245	1	TIMESTAMP = 1521471656
2	SHA256 (OpenRCT2-OpenRCT2-v0.1.1_GH0.tar.gz) = 5d7a6c7f3c770e7de506958f86789c438c543c27d312fd096322cde4e89f50ad	2	SHA256 (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 358fc0ceff848734b399dc63c1d7a0c096a54a793afe4522d6f0dd00ba9328c7
3	SIZE (OpenRCT2-OpenRCT2-v0.1.1_GH0.tar.gz) = 6284135	3	SIZE (OpenRCT2-OpenRCT2-v0.1.2_GH0.tar.gz) = 6769785

Lines 1-11 Link Here

(-)files/patch-src_openrct2_config_Config.cpp (-7 / +8 lines)
1	--- src/openrct2/config/Config.cpp.orig 2017-08-09 22:02:59 UTC	1	--- src/openrct2/config/Config.cpp.orig 2018-03-18 20:26:14 UTC
2	+++ src/openrct2/config/Config.cpp	2	+++ src/openrct2/config/Config.cpp
3	@@ -591,6 +591,8 @@ namespace Config	3	@@ -602,6 +602,9 @@ namespace Config
		4	*/
		5	static std::string FindRCT2Path()
4	{	6	{
		7	+
		8	+ return "/usr/local/share/openrct2";
		9	+
5	log_verbose("config_find_rct2_path(...)");	10	log_verbose("config_find_rct2_path(...)");
6		11
7	+ return "%%DATADIR%%";	12	static constexpr const utf8 * searchLocations[] =
8	+
9	static const utf8 * searchLocations[] =
10	{
11	"C:\\GOG Games\\RollerCoaster Tycoon 2 Triple Thrill Pack",




--- 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));

Line 0 Link Here

(-)files/patch-src_openrct2_util_Util.cpp (+11 lines)
	1	--- src/openrct2/util/Util.cpp.orig 2018-03-18 20:26:14 UTC
	2	+++ src/openrct2/util/Util.cpp
	3	@@ -222,7 +222,7 @@ bool avx2_available()
	4	// https://github.com/gcc-mirror/gcc/commit/132fa33ce998df69a9f793d63785785f4b93e6f1
	5	// which causes it to ignore subleafs, but the new function is unavailable on Ubuntu's
	6	// prehistoric toolchains
	7	-#if defined(OpenRCT2_CPUID_GNUC_X86)
	8	+#if defined(OpenRCT2_CPUID_GNUC_X86) && !defined(__FreeBSD__)
	9	return __builtin_cpu_supports("avx2");
	10	#else
	11	// AVX2 support is declared as the 5th bit of EBX with CPUID(EAX = 7, ECX = 0).




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
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/sv-SE.txt
%%DATADIR%%/language/zh-CN.txt
%%DATADIR%%/language/zh-TW.txt
%%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/drawrect.frag
%%DATADIR%%/shaders/drawrect.vert

Return to bug 226803

Line 0 Link Here

(-)files/patch-src_openrct2_platform_Platform.Linux.cpp (+18 lines)
	1	--- src/openrct2/platform/Platform.Linux.cpp.orig 2018-03-18 20:26:14 UTC
	2	+++ src/openrct2/platform/Platform.Linux.cpp
	3	@@ -146,14 +146,7 @@ namespace Platform
	4	{
	5	log_fatal("failed to read /proc/self/exe");
	6	}
	7	-#elif defined(__FreeBSD__)
	8	- const sint32 mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
	9	- auto exeLen = sizeof(exePath);
	10	- if (sysctl(mib, 4, exePath, &exeLen, nullptr, 0) == -1)
	11	- {
	12	- log_fatal("failed to get process path");
	13	- }
	14	-#elif defined(__OpenBSD__)
	15	+#elif defined(__OpenBSD__) \|\| defined(__FreeBSD__)
	16	// There is no way to get the path name of a running executable.
	17	// If you are not using the port or package, you may have to change this line!
	18	strlcpy(exePath, "/usr/local/bin/", sizeof(exePath));

Lines 1-18 Link Here

(-)pkg-plist (-11 / +17 lines)
1	bin/openrct2	1	bin/openrct2
		2	bin/openrct2-cli
2	lib/libopenrct2.a	3	lib/libopenrct2.a
		4	man/man6/openrct2.6.gz
		5	share/applications/openrct2-savegame.desktop
		6	share/applications/openrct2-scenario.desktop
		7	share/applications/openrct2-uri.desktop
3	share/applications/openrct2.desktop	8	share/applications/openrct2.desktop
4	%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
5	%%PORTDOCS%%%%DOCSDIR%%/contributors.md
6	%%PORTDOCS%%%%DOCSDIR%%/licence.txt
7	%%PORTDOCS%%%%DOCSDIR%%/readme.txt
8	share/icons/hicolor/128x128/apps/openrct2.png	9	share/icons/hicolor/128x128/apps/openrct2.png
9	share/icons/hicolor/16x16/apps/openrct2.png	10	share/icons/hicolor/16x16/apps/openrct2.png
		11	share/icons/hicolor/24x24/apps/openrct2.png
10	share/icons/hicolor/256x256/apps/openrct2.png	12	share/icons/hicolor/256x256/apps/openrct2.png
11	share/icons/hicolor/32x32/apps/openrct2.png	13	share/icons/hicolor/32x32/apps/openrct2.png
		14	share/icons/hicolor/48x48/apps/openrct2.png
12	share/icons/hicolor/64x64/apps/openrct2.png	15	share/icons/hicolor/64x64/apps/openrct2.png
		16	share/icons/hicolor/96x96/apps/openrct2.png
13	share/icons/hicolor/scalable/apps/openrct2.svg	17	share/icons/hicolor/scalable/apps/openrct2.svg
14	man/man6/openrct2.6.gz	18	share/metainfo/openrct2.appdata.xml
		19	share/mime/packages/openrct2.xml
15	%%DATADIR%%/g2.dat	20	%%DATADIR%%/g2.dat
		21	%%DATADIR%%/language/ar-EG.txt
16	%%DATADIR%%/language/ca-ES.txt	22	%%DATADIR%%/language/ca-ES.txt
17	%%DATADIR%%/language/cs-CZ.txt	23	%%DATADIR%%/language/cs-CZ.txt
18	%%DATADIR%%/language/de-DE.txt	24	%%DATADIR%%/language/de-DE.txt
Lines 33-43 Link Here
33	%%DATADIR%%/language/sv-SE.txt	39	%%DATADIR%%/language/sv-SE.txt
34	%%DATADIR%%/language/zh-CN.txt	40	%%DATADIR%%/language/zh-CN.txt
35	%%DATADIR%%/language/zh-TW.txt	41	%%DATADIR%%/language/zh-TW.txt
36	%%DATADIR%%/shaders/copyframebuffer.frag	42	%%DATADIR%%/shaders/applypalette.frag
37	%%DATADIR%%/shaders/copyframebuffer.vert	43	%%DATADIR%%/shaders/applypalette.vert
38	%%DATADIR%%/shaders/drawimage.frag	44	%%DATADIR%%/shaders/applytransparency.frag
39	%%DATADIR%%/shaders/drawimage.vert	45	%%DATADIR%%/shaders/applytransparency.vert
40	%%DATADIR%%/shaders/drawline.frag	46	%%DATADIR%%/shaders/drawline.frag
41	%%DATADIR%%/shaders/drawline.vert	47	%%DATADIR%%/shaders/drawline.vert
42	%%DATADIR%%/shaders/fillrect.frag	48	%%DATADIR%%/shaders/drawrect.frag
43	%%DATADIR%%/shaders/fillrect.vert	49	%%DATADIR%%/shaders/drawrect.vert