(Partially) fix compilation for OpenBSD

Author: MBCX

core/variant/variant.h

@@ -61,6 +61,8 @@
 #include "core/variant/callable.h"
 #include "core/variant/dictionary.h"
 
+#include <type_traits>
+
 class Object;
 class RefCounted;
 
@@ -488,6 +490,20 @@ class Variant {
 	Object *get_validated_object() const;
 	Object *get_validated_object_with_check(bool &r_previously_freed) const;
 
+	// Template constructor for integral types.
+	// _should_ maintain platform compatibility _and_ fix
+	// OpenBSD's "ambiguous" conversion errors.
+	template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
+	Variant(T p_val) {
+		if constexpr (std::is_same<T, bool>::value) {
+			type = BOOL;
+			_data._bool = p_val;
+		} else {
+			type = INT;
+			_data._int = static_cast<int64_t>(p_val);
+		}
+	}
+
 	Variant(bool p_bool);
 	Variant(int64_t p_int64);
 	Variant(int32_t p_int32);

modules/camera/config.py

@@ -1,7 +1,8 @@
 def can_build(env, platform):
     import sys
 
-    if sys.platform.startswith("freebsd"):
+    # Camera module not supported on BSDs
+    if "bsd" in sys.platform.lower():
         return False
     return platform == "macos" or platform == "windows" or platform == "linuxbsd"
 

modules/openxr/SCsub

@@ -31,8 +31,8 @@ elif env["platform"] == "linuxbsd":
         env_openxr.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_EGL"])
 
     # FIXME: Review what needs to be set for Android and macOS.
-    # FreeBSD uses non-standard getenv functions.
-    if not sys.platform.startswith("freebsd"):
+    # BSDs use non-standard getenv functions.
+    if "bsd" not in sys.platform.lower():
         env_openxr.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"])
 elif env["platform"] == "windows":
     env_openxr.AppendUnique(CPPDEFINES=["XR_OS_WINDOWS", "NOMINMAX", "XR_USE_PLATFORM_WIN32"])

modules/raycast/config.py

@@ -1,7 +1,12 @@
 def can_build(env, platform):
+    import sys
+
     # Supported architectures and platforms depend on the Embree library.
     if env["arch"] == "arm64" and platform == "windows" and env.msvc:
         return False
+    # OpenBSD doesn't have the required headers.
+    if sys.platform.startswith("openbsd"):
+        return False
     if env["arch"] in ["x86_64", "arm64", "wasm32"]:
         return True
     if env["arch"] == "x86_32" and platform == "windows":

platform/linuxbsd/wayland/detect_prime_egl.cpp

@@ -38,6 +38,12 @@
 
 #include <stdlib.h>
 
+#ifdef __OpenBSD__
+// Map `quick_exit` to `_Exit`
+// See reason in: GH-92130#issuecomment-2127135908
+#define quick_exit _Exit
+#endif
+
 #include <cstring>
 
 #include <sys/types.h>

platform/linuxbsd/wayland/wayland_thread.cpp

@@ -32,12 +32,7 @@
 
 #ifdef WAYLAND_ENABLED
 
-#ifdef __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#else
-// Assume Linux.
-#include <linux/input-event-codes.h>
-#endif
+#include "thirdparty/linuxbsd_headers/linux/input-event-codes.h"
 
 // For the actual polling thread.
 #include <poll.h>

platform/linuxbsd/x11/detect_prime_x11.cpp

@@ -47,6 +47,13 @@
 #endif
 
 #include <stdlib.h>
+
+#ifdef __OpenBSD__
+// Map `quick_exit` to `_Exit`
+// See reason in: GH-92130#issuecomment-2127135908
+#define quick_exit _Exit
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>

thirdparty/jolt_physics/Jolt/Core/Core.h

@@ -85,6 +85,8 @@
 	#define JPH_PLATFORM_LINUX
 #elif defined(__FreeBSD__)
 	#define JPH_PLATFORM_FREEBSD
+#elif defined(__OpenBSD__)
+	#define JPH_PLATFORM_OPENBSD
 #elif defined(__APPLE__)
 	#include <TargetConditionals.h>
 	#if defined(TARGET_OS_IPHONE) && !TARGET_OS_IPHONE
@@ -390,7 +392,7 @@
 	// Creating one should only be a couple of minutes of work if you have the documentation for the platform
 	// (you only need to define JPH_BREAKPOINT, JPH_PLATFORM_BLUE_GET_TICKS, JPH_PLATFORM_BLUE_MUTEX*, JPH_PLATFORM_BLUE_RWLOCK* and include the right header).
 	#include <Jolt/Core/PlatformBlue.h>
-#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS) || defined(JPH_PLATFORM_FREEBSD)
+#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS) || defined(JPH_PLATFORM_FREEBSD) || defined(JPH_PLATFORM_OPENBSD)
 	#if defined(JPH_CPU_X86)
 		#define JPH_BREAKPOINT	__asm volatile ("int $0x3")
 	#elif defined(JPH_CPU_ARM) || defined(JPH_CPU_RISCV) || defined(JPH_CPU_E2K) || defined(JPH_CPU_PPC) || defined(JPH_CPU_LOONGARCH)

thirdparty/linuxbsd_headers/README.md

@@ -35,6 +35,13 @@ Patches in the `patches` directory should be re-applied after updates.
 - License: MIT
 
 
+## linux
+
+- Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+- Version: 5.15
+- License: GPL-2
+
+
 ## pulse
 
 - Upstream: http://pulseaudio.org/
@@ -66,7 +73,7 @@ Patches in the `patches` directory should be re-applied after updates.
 ## X11
 
 - Upstream: https://x.org/wiki/
-- Version: 
+- Version:
   * Xcursor: 1.2.0
   * Xext: 1.3.5
   * Xinerama: 1.1.4