Attachment #204232 for bug #237761

View | Details | Raw Unified | Return to bug 237761
Collapse All | Expand All

Lines 2-8 Link Here

(-)devel/godot/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 3.1	5	DISTVERSION= 3.1.1
6	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
7	CATEGORIES= devel games	7	CATEGORIES= devel games
8		8

Lines 1-7 Link Here

(-)devel/godot/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1553320527	1	TIMESTAMP = 1556599809
2	SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a	2	SHA256 (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2
3	SIZE (dotnet.glob.2.1.1.nupkg) = 73782	3	SIZE (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 20353131
4	SHA256 (godotengine-godot-3.1-stable_GH0.tar.gz) = cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3
5	SIZE (godotengine-godot-3.1-stable_GH0.tar.gz) = 20400493
6	SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433	4	SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433
7	SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471	5	SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471




--- core/SCsub.orig	2019-05-02 02:03:58 UTC
+++ core/SCsub
@@ -80,7 +80,7 @@ if env['builtin_zlib']:
 	]
 	thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
 
-	env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir])
+	env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir])
 	# Needs to be available in main env too
 	env.Append(CPPPATH=[thirdparty_zlib_dir])
 
@@ -128,7 +128,7 @@ if env['builtin_zstd']:
     ]
     thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
 
-    env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
+    env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
     env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
     env.Append(CPPPATH=thirdparty_zstd_dir)
     # Also needed in main env includes will trigger warnings




--- thirdparty/thekla_atlas/nvcore/Memory.cpp.orig	2017-12-29 15:53:28 UTC
+++ thirdparty/thekla_atlas/nvcore/Memory.cpp
@@ -6,10 +6,6 @@
 
 #include <stdlib.h>
 
-#ifdef NV_OS_LINUX
-#include <malloc.h>
-#endif
-
 #define USE_EFENCE 0
 
 #if USE_EFENCE
@@ -130,7 +126,7 @@ void * nv::aligned_malloc(size_t size, s
 
 #if NV_OS_WIN32 || NV_OS_DURANGO
     return _aligned_malloc(size, alignment);
-#elif NV_OS_DARWIN && !NV_OS_IOS
+#elif (NV_OS_FREEBSD || NV_OS_DARWIN) && !NV_OS_IOS
     void * ptr = NULL;
     posix_memalign(&ptr, alignment, size);
     return ptr;




--- thirdparty/thekla_atlas/nvcore/StdStream.h.orig	2017-12-29 19:15:48 UTC
+++ thirdparty/thekla_atlas/nvcore/StdStream.h
@@ -160,14 +160,14 @@ namespace nv
             nvDebugCheck(m_fp != NULL);
 #if NV_OS_WIN32
             return (uint)_fwrite_nolock(data, 1, len, m_fp);
-#elif NV_OS_LINUX
-            return (uint)fwrite_unlocked(data, 1, len, m_fp);
-#elif NV_OS_DARWIN
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
             // @@ No error checking, always returns len.
             for (uint i = 0; i < len; i++) {
                 putc_unlocked(((char *)data)[i], m_fp);
             }
             return len;
+#elif NV_OS_LINUX
+            return (uint)fwrite_unlocked(data, 1, len, m_fp);
 #else
             return (uint)fwrite(data, 1, len, m_fp);
 #endif
@@ -210,9 +210,7 @@ namespace nv
             nvDebugCheck(m_fp != NULL);
 #if NV_OS_WIN32
             return (uint)_fread_nolock(data, 1, len, m_fp);
-#elif NV_OS_LINUX
-            return (uint)fread_unlocked(data, 1, len, m_fp);
-#elif NV_OS_DARWIN
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
             // This is rather lame. Not sure if it's faster than the locked version.
             for (uint i = 0; i < len; i++) {
                 ((char *)data)[i] = getc_unlocked(m_fp);
@@ -221,6 +219,8 @@ namespace nv
                 }
             }
             return len;
+#elif NV_OS_LINUX
+            return (uint)fread_unlocked(data, 1, len, m_fp);
 #else
             return (uint)fread(data, 1, len, m_fp);
 #endif

Return to bug 237761

Line 0 Link Here

(-)devel/godot/files/patch-core_SCsub (+20 lines)
	1	--- core/SCsub.orig 2019-05-02 02:03:58 UTC
	2	+++ core/SCsub
	3	@@ -80,7 +80,7 @@ if env['builtin_zlib']:
	4	]
	5	thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
	6
	7	- env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir])
	8	+ env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir])
	9	# Needs to be available in main env too
	10	env.Append(CPPPATH=[thirdparty_zlib_dir])
	11
	12	@@ -128,7 +128,7 @@ if env['builtin_zstd']:
	13	]
	14	thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
	15
	16	- env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
	17	+ env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
	18	env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
	19	env.Append(CPPPATH=thirdparty_zstd_dir)
	20	# Also needed in main env includes will trigger warnings

Lines 1-22 Link Here

(-)devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp (-22 lines)
1	--- thirdparty/thekla_atlas/nvcore/Memory.cpp.orig 2017-12-29 15:53:28 UTC
2	+++ thirdparty/thekla_atlas/nvcore/Memory.cpp
3	@@ -6,10 +6,6 @@
4
5	#include <stdlib.h>
6
7	-#ifdef NV_OS_LINUX
8	-#include <malloc.h>
9	-#endif
10	-
11	#define USE_EFENCE 0
12
13	#if USE_EFENCE
14	@@ -130,7 +126,7 @@ void * nv::aligned_malloc(size_t size, s
15
16	#if NV_OS_WIN32 \|\| NV_OS_DURANGO
17	return _aligned_malloc(size, alignment);
18	-#elif NV_OS_DARWIN && !NV_OS_IOS
19	+#elif (NV_OS_FREEBSD \|\| NV_OS_DARWIN) && !NV_OS_IOS
20	void * ptr = NULL;
21	posix_memalign(&ptr, alignment, size);
22	return ptr;

Lines 1-40 Link Here

(-)devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h (-40 lines)
1	--- thirdparty/thekla_atlas/nvcore/StdStream.h.orig 2017-12-29 19:15:48 UTC
2	+++ thirdparty/thekla_atlas/nvcore/StdStream.h
3	@@ -160,14 +160,14 @@ namespace nv
4	nvDebugCheck(m_fp != NULL);
5	#if NV_OS_WIN32
6	return (uint)_fwrite_nolock(data, 1, len, m_fp);
7	-#elif NV_OS_LINUX
8	- return (uint)fwrite_unlocked(data, 1, len, m_fp);
9	-#elif NV_OS_DARWIN
10	+#elif NV_OS_DARWIN \|\| NV_OS_FREEBSD \|\| NV_OS_OPENBSD
11	// @@ No error checking, always returns len.
12	for (uint i = 0; i < len; i++) {
13	putc_unlocked(((char *)data)[i], m_fp);
14	}
15	return len;
16	+#elif NV_OS_LINUX
17	+ return (uint)fwrite_unlocked(data, 1, len, m_fp);
18	#else
19	return (uint)fwrite(data, 1, len, m_fp);
20	#endif
21	@@ -210,9 +210,7 @@ namespace nv
22	nvDebugCheck(m_fp != NULL);
23	#if NV_OS_WIN32
24	return (uint)_fread_nolock(data, 1, len, m_fp);
25	-#elif NV_OS_LINUX
26	- return (uint)fread_unlocked(data, 1, len, m_fp);
27	-#elif NV_OS_DARWIN
28	+#elif NV_OS_DARWIN \|\| NV_OS_FREEBSD \|\| NV_OS_OPENBSD
29	// This is rather lame. Not sure if it's faster than the locked version.
30	for (uint i = 0; i < len; i++) {
31	((char *)data)[i] = getc_unlocked(m_fp);
32	@@ -221,6 +219,8 @@ namespace nv
33	}
34	}
35	return len;
36	+#elif NV_OS_LINUX
37	+ return (uint)fread_unlocked(data, 1, len, m_fp);
38	#else
39	return (uint)fread(data, 1, len, m_fp);
40	#endif