in the meantime the 3.3.2 was released. the comments about the patch still holds.
Omar Polo <[email protected]> writes: > Hello, > > yesterday Godot received a maintenance release. It should be backward > compatible and contain only bugfixes. > > A third-party bundled dependency, entree, was introduced/update and it > needed some patching to compile. I'd be glad if someone with a better > C++ knowledge could take a look at > patch-thirdparty_embree_common_math_math_h. it triggered an error about > an ambiguous call, via range.intersect, of max/min (ssize_t, ssize_t). > > Otherwise, lightly tested on amd64 and everything seems to work. > > > Cheers, > > Omar Polo > > > Index: Makefile > =================================================================== > RCS file: /home/cvs/ports/games/godot/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 3 May 2021 19:10:24 -0000 1.18 > +++ Makefile 19 May 2021 05:56:56 -0000 > @@ -2,7 +2,7 @@ > > COMMENT = 2D and 3D game engine > > -V = 3.3 > +V = 3.3.1 > DISTNAME = godot-${V}-stable > PKGNAME = godot-${V} > CATEGORIES = games > Index: distinfo > =================================================================== > RCS file: /home/cvs/ports/games/godot/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 3 May 2021 19:10:24 -0000 1.6 > +++ distinfo 19 May 2021 05:57:18 -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.1-stable.tar.xz) = > 5Z9AUFeLIm+BgrNY5ebtaBf4/g/3CO7BR3Xp7kD1cgw= > +SIZE (godot-3.3.1-stable.tar.xz) = 20619376 > Index: patches/patch-platform_x11_detect_py > =================================================================== > RCS file: /home/cvs/ports/games/godot/patches/patch-platform_x11_detect_py,v > retrieving revision 1.4 > diff -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 19 May 2021 11:18:56 -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 19 May 2021 > 16:51:38 -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 19 May 2021 > 16:21:44 -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
