Attachment 204232 Details for Bug 237761 – maintainer update devel/godot

[patch] maintainer update devel/godot

godot.patch (text/plain), 5.26 KB, created by Shane on 2019-05-06 03:54:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2019-05-06 03:54:46 UTC

Size: 5.26 KB

patch

obsolete

>diff -Nru devel/godot.orig/Makefile devel/godot/Makefile
>--- devel/godot.orig/Makefile	2019-05-05 12:53:31.568695000 +0930
>+++ devel/godot/Makefile	2019-05-05 12:53:12.042562000 +0930
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	3.1
>+DISTVERSION=	3.1.1
> DISTVERSIONSUFFIX=	-stable
> CATEGORIES=	devel games
> 
>diff -Nru devel/godot.orig/distinfo devel/godot/distinfo
>--- devel/godot.orig/distinfo	2019-05-05 12:53:31.568610000 +0930
>+++ devel/godot/distinfo	2019-05-05 11:59:18.230916000 +0930
>@@ -1,7 +1,5 @@
>-TIMESTAMP = 1553320527
>-SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
>-SIZE (dotnet.glob.2.1.1.nupkg) = 73782
>-SHA256 (godotengine-godot-3.1-stable_GH0.tar.gz) = cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3
>-SIZE (godotengine-godot-3.1-stable_GH0.tar.gz) = 20400493
>+TIMESTAMP = 1556599809
>+SHA256 (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2
>+SIZE (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 20353131
> SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433
> SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471
>diff -Nru devel/godot.orig/files/patch-core_SCsub devel/godot/files/patch-core_SCsub
>--- devel/godot.orig/files/patch-core_SCsub	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-core_SCsub	2019-05-05 11:59:18.253017000 +0930
>@@ -0,0 +1,20 @@
>+--- 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
>diff -Nru devel/godot.orig/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp
>--- devel/godot.orig/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp	2019-05-05 12:53:31.567776000 +0930
>+++ devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,22 +0,0 @@
>---- 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;
>diff -Nru devel/godot.orig/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h
>--- devel/godot.orig/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h	2019-05-05 12:53:31.567857000 +0930
>+++ devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h	1970-01-01 09:30:00.000000000 +0930
>@@ -1,40 +0,0 @@
>---- 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

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 237761: 204232