Charlene Wendling <juliana...@posteo.jp> writes:
> Hi,
>
> On Mon, 07 Jun 2021 18:44:45 +0200
> Omar Polo <o...@omarpolo.com> wrote:
>
>> friendly ping!
>
> It builds and works fine on amd64 with my AMD RX560. On macppc
> it builds but the UI is totally blank with my ATI 9600.
> I'm proposing to mark it BROKEN there.
>
> Obviously, ok cwen@
Thanks for testing!
I'm fine with marking it BROKEN for powerpc, I'm just surprised that a
bugfix release broke it :/
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/godot/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- Makefile 3 May 2021 19:10:24 -0000 1.18
> +++ Makefile 8 Jun 2021 15:40:08 -0000
> @@ -1,8 +1,10 @@
> # $OpenBSD: Makefile,v 1.18 2021/05/03 19:10:24 thfr Exp $
>
> +BROKEN-powerpc = fails at runtime, the UI is totally blank
> +
> COMMENT = 2D and 3D game engine
>
> -V = 3.3
> +V = 3.3.2
> DISTNAME = godot-${V}-stable
> PKGNAME = godot-${V}
> CATEGORIES = games
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/godot/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 3 May 2021 19:10:24 -0000 1.6
> +++ distinfo 8 Jun 2021 15:40:08 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (godot-3.3-stable.tar.xz) =
> /LvGqqsWBZ5mIkgsM1jVgJjTTtUeCZyFTsCtefRm1VU=
> -SIZE (godot-3.3-stable.tar.xz) = 20581028
> +SHA256 (godot-3.3.2-stable.tar.xz) =
> dpPE71QbgV+lA18Taq91GHow8OqNFc9O8FQzwcJGwtg=
> +SIZE (godot-3.3.2-stable.tar.xz) = 20619728
> Index: patches/patch-platform_x11_detect_py
> ===================================================================
> RCS file: /cvs/ports/games/godot/patches/patch-platform_x11_detect_py,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-platform_x11_detect_py
> --- patches/patch-platform_x11_detect_py 3 May 2021 19:10:25 -0000
> 1.4
> +++ patches/patch-platform_x11_detect_py 8 Jun 2021 15:40:08 -0000
> @@ -33,7 +33,7 @@ Index: platform/x11/detect.py
> elif env["target"] == "debug":
> env.Prepend(CCFLAGS=["-ggdb"])
> env.Prepend(CCFLAGS=["-g3"])
> -@@ -318,6 +301,10 @@ def configure(env):
> +@@ -325,6 +308,10 @@ def configure(env):
> env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
> else:
> print("ALSA libraries not found, disabling driver")
> Index: patches/patch-thirdparty_embree_common_math_math_h
> ===================================================================
> RCS file: patches/patch-thirdparty_embree_common_math_math_h
> diff -N patches/patch-thirdparty_embree_common_math_math_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-thirdparty_embree_common_math_math_h 8 Jun 2021
> 15:40:08 -0000
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +add an implementation for max for long (ssize_t are long typedef'ed).
> +Otherwise it will fail in parallel_partition.h:185 due to an ambiguous
> +call.
> +
> +Index: thirdparty/embree/common/math/math.h
> +--- thirdparty/embree/common/math/math.h.orig
> ++++ thirdparty/embree/common/math/math.h
> +@@ -242,6 +242,7 @@ namespace embree
> + __forceinline T twice(const T& a) { return a+a; }
> +
> + __forceinline int min(int a, int b) { return a<b ? a:b; }
> ++ __forceinline long min(long a, long b) { return a<b ? a:b; }
> + __forceinline unsigned min(unsigned a, unsigned b) { return a<b ? a:b; }
> + __forceinline int64_t min(int64_t a, int64_t b) { return a<b ? a:b; }
> + __forceinline float min(float a, float b) { return a<b ? a:b; }
> +@@ -259,6 +260,7 @@ namespace embree
> + template<typename T> __forceinline T mini(const T& a, const T& b, const
> T& c, const T& d, const T& e) { return mini(mini(mini(a,b),mini(c,d)),e); }
> +
> + __forceinline int max(int a, int b) { return a<b ? b:a; }
> ++ __forceinline long max(long a, long b) { return a<b ? b:a; }
> + __forceinline unsigned max(unsigned a, unsigned b) { return a<b ? b:a; }
> + __forceinline int64_t max(int64_t a, int64_t b) { return a<b ? b:a; }
> + __forceinline float max(float a, float b) { return a<b ? b:a; }
> Index: patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
> ===================================================================
> RCS file: patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
> diff -N patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-thirdparty_embree_common_sys_sysinfo_cpp 8 Jun 2021
> 15:40:08 -0000
> @@ -0,0 +1,45 @@
> +$OpenBSD$
> +
> +1. we don't seem to have pthread_getaffinity_np in pthread_np.h; use sysctl
> + like macos and android then.
> +2. just fake getExecutableFileName and get{Virtual,Resident}MemoryBytes
> +
> +Index: thirdparty/embree/common/sys/sysinfo.cpp
> +--- thirdparty/embree/common/sys/sysinfo.cpp.orig
> ++++ thirdparty/embree/common/sys/sysinfo.cpp
> +@@ -595,6 +595,26 @@ namespace embree
> +
> + #endif
> +
> ++#if defined(__OpenBSD__)
> ++namespace embree
> ++{
> ++ std::string getExecutableFileName()
> ++ {
> ++ return "";
> ++ }
> ++
> ++ size_t getVirtualMemoryBytes()
> ++ {
> ++ return 0;
> ++ };
> ++
> ++ size_t getResidentMemoryBytes()
> ++ {
> ++ return 0;
> ++ };
> ++}
> ++#endif
> ++
> +
> ////////////////////////////////////////////////////////////////////////////////
> + /// Mac OS X Platform
> +
> ////////////////////////////////////////////////////////////////////////////////
> +@@ -643,7 +663,7 @@ namespace embree
> + static int nThreads = -1;
> + if (nThreads != -1) return nThreads;
> +
> +-#if defined(__MACOSX__) || defined(__ANDROID__)
> ++#if defined(__MACOSX__) || defined(__ANDROID__) || defined(__OpenBSD__)
> + nThreads = sysconf(_SC_NPROCESSORS_ONLN); // does not work in Linux LXC
> container
> + assert(nThreads);
> + #else
