On Sun, Aug 04 2019, "Callahan, Brian Robert" <call...@rpi.edu> wrote:
> (Excuse the top posting... traveling and on my phone)
>
> Please don't mark it broken. The __sync functions can be trivially
> replaced by the __atomic functions, as the __sync functions are
> implemented in terms of the __atomic functions, which are supported on
> everything with ports-gcc. See
> https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
>
> If you don't want to do this conversion, I'll do it when I'm back
> (probably Tuesday night or Wednesday). These __sync functions are
> a general sticking point of mine, as they needlessly prevent ports from
> building and working on hppa.
Ah ha, so just sticking -latomic somewhere would not be enough. Thanks
for pointing that out.
Here's a diff with proper comments which I deem desirable. Charlene,
Thomas, others: ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:46:19 -0000 1.7
+++ Makefile 5 Aug 2019 10:01:21 -0000
@@ -8,7 +8,7 @@ PKGNAME = godot-${V}
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Thomas Frohwein <t...@openbsd.org>
-REVISION = 1
+REVISION = 2
# MIT
PERMIT_PACKAGE = Yes
Index: patches/patch-servers_visual_shader_language_cpp
===================================================================
RCS file: patches/patch-servers_visual_shader_language_cpp
diff -N patches/patch-servers_visual_shader_language_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-servers_visual_shader_language_cpp 5 Aug 2019 10:01:21
-0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix error with ports-gcc:
+ error: converting to 'bool' from 'std::nullptr_t' requires
direct-initialization [-fpermissive]
+
+Index: servers/visual/shader_language.cpp
+--- servers/visual/shader_language.cpp.orig
++++ servers/visual/shader_language.cpp
+@@ -1869,11 +1869,11 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::b
+
+ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, OperatorNode
*p_func, DataType *r_ret_type) {
+
+- ERR_FAIL_COND_V(p_func->op != OP_CALL && p_func->op != OP_CONSTRUCT,
NULL);
++ ERR_FAIL_COND_V(p_func->op != OP_CALL && p_func->op != OP_CONSTRUCT,
false);
+
+ Vector<DataType> args;
+
+- ERR_FAIL_COND_V(p_func->arguments[0]->type != Node::TYPE_VARIABLE,
NULL);
++ ERR_FAIL_COND_V(p_func->arguments[0]->type != Node::TYPE_VARIABLE,
false);
+
+ StringName name = static_cast<VariableNode
*>(p_func->arguments[0])->name.operator String();
+
Index: patches/patch-thirdparty_thekla_atlas_nvcore_nvcore_h
===================================================================
RCS file: patches/patch-thirdparty_thekla_atlas_nvcore_nvcore_h
diff -N patches/patch-thirdparty_thekla_atlas_nvcore_nvcore_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-thirdparty_thekla_atlas_nvcore_nvcore_h 5 Aug 2019
10:01:21 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Overzealous #error, the code builds fine even if the CPU isn't known.
+
+Index: thirdparty/thekla_atlas/nvcore/nvcore.h
+--- thirdparty/thekla_atlas/nvcore/nvcore.h.orig
++++ thirdparty/thekla_atlas/nvcore/nvcore.h
+@@ -115,7 +115,7 @@
+ #elif defined POSH_CPU_STRONGARM
+ # define NV_CPU_ARM 1
+ #else
+-# error "Unsupported CPU"
++//# error "Unsupported CPU"
+ #endif
+
+
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
