[PR PATCH] [WIP] New package: godot-beta

[PR PATCH] [WIP] New package: godot-beta

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

[WIP] New package: godot-beta
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!--
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 4844 bytes --]

From a91409b2e8734bc7cd5b3857e0df8fc0a8f65154 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 16 Jan 2023 09:02:40 +0100
Subject: [PATCH] New package: godot-beta

---
 common/shlibs                                |  1 +
 srcpkgs/godot-beta/files/godot-beta.desktop  |  9 ++++
 srcpkgs/godot-beta/patches/10-fix-musl.patch | 13 +++++
 srcpkgs/godot-beta/template                  | 51 ++++++++++++++++++++
 srcpkgs/godot-beta/update                    |  1 +
 5 files changed, 75 insertions(+)
 create mode 100644 srcpkgs/godot-beta/files/godot-beta.desktop
 create mode 100644 srcpkgs/godot-beta/patches/10-fix-musl.patch
 create mode 100644 srcpkgs/godot-beta/template
 create mode 100644 srcpkgs/godot-beta/update

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..28d069e9e7a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2391,6 +2391,7 @@ libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libembree.so.3 embree-3.12.2_1
+libembree3.so.3 embree-3.12.2_1
 libtbb_debug.so.2 tbb-4.3_1
 libtbb.so.2 tbb-4.3_1
 libtbbmalloc_debug.so.2 tbb-4.3_1
diff --git a/srcpkgs/godot-beta/files/godot-beta.desktop b/srcpkgs/godot-beta/files/godot-beta.desktop
new file mode 100644
index 000000000000..acce6dd12c93
--- /dev/null
+++ b/srcpkgs/godot-beta/files/godot-beta.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Godot(Beta)
+Comment=Application for making games
+Exec=/usr/bin/godot-beta %U
+Icon=godot-beta
+Terminal=false
+Type=Application
+Categories=Utility;Game;
+
diff --git a/srcpkgs/godot-beta/patches/10-fix-musl.patch b/srcpkgs/godot-beta/patches/10-fix-musl.patch
new file mode 100644
index 000000000000..42e6111c6afe
--- /dev/null
+++ b/srcpkgs/godot-beta/patches/10-fix-musl.patch
@@ -0,0 +1,13 @@
+--- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
+@@ -42,6 +42,10 @@
+ #include <libudev.h>
+ #endif
+
++#if !defined(__GLIBC__)
++#include <byteswap.h>
++#endif
++
+ #define LONG_BITS (sizeof(long) * 8)
+ #define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
+ #define NBITS(x) ((((x)-1) / LONG_BITS) + 1)
diff --git a/srcpkgs/godot-beta/template b/srcpkgs/godot-beta/template
new file mode 100644
index 000000000000..b75f97e0786d
--- /dev/null
+++ b/srcpkgs/godot-beta/template
@@ -0,0 +1,51 @@
+# Template file for 'godot-beta'
+pkgname=godot-beta
+version=4.0
+_betaver=beta12
+revision=1
+archs="x86_64* i686* aarch64* armv7* ppc64*"
+build_style=scons
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ optimize=size deprecated=no builtin_embree=false builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=false
+ builtin_miniupnpc=false builtin_pcre2=false builtin_zlib=false
+ builtin_zstd=false"
+hostmakedepends="pkg-config clang"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel embree-devel harfbuzz-devel libzstd-devel"
+short_desc="Multiplatform 2D and 3D engine"
+maintainer="dataCobra <datacobra@thinkbot.de>"
+license="MIT"
+homepage="https://www.godotengine.org/"
+distfiles="https://downloads.tuxfamily.org/godotengine/${version}/${_betaver}/godot-${version}-${_betaver}.tar.xz"
+checksum=747f2e368ac735b3da56e2552ba04ccc9972210451a5b9607401ae9800fdff03
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
+
+post_extract() {
+	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
+}
+
+pre_build() {
+	export CXXFLAGS=" $CXXFLAGS "
+}
+
+do_install() {
+	vlicense LICENSE.txt
+	vinstall ${FILESDIR}/godot-beta.desktop 644 /usr/share/applications/
+	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/godot-beta.png
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot-beta;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot-beta;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot-beta;;
+	esac
+}
diff --git a/srcpkgs/godot-beta/update b/srcpkgs/godot-beta/update
new file mode 100644
index 000000000000..6aa1db057e86
--- /dev/null
+++ b/srcpkgs/godot-beta/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'

Re: [WIP] New package: godot-beta

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1383644309

Comment:
> We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

betas wouldn't be accepted anyways

Re: [PR PATCH] [Updated] [WIP] Draft for change from Godot 3 to 4.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

[WIP] Draft for change from Godot 3 to 4.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 4845 bytes --]

From 11dc4c7cc59dde8d7940cd41dbb2815b48add712 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 18 Jan 2023 09:59:07 +0100
Subject: [PATCH] New package: godot-beta

---
 common/shlibs                                |  1 +
 srcpkgs/godot-beta/files/godot-beta.desktop  |  9 ++++
 srcpkgs/godot-beta/patches/10-fix-musl.patch | 13 +++++
 srcpkgs/godot-beta/template                  | 51 ++++++++++++++++++++
 srcpkgs/godot-beta/update                    |  1 +
 5 files changed, 75 insertions(+)
 create mode 100644 srcpkgs/godot-beta/files/godot-beta.desktop
 create mode 100644 srcpkgs/godot-beta/patches/10-fix-musl.patch
 create mode 100644 srcpkgs/godot-beta/template
 create mode 100644 srcpkgs/godot-beta/update

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..28d069e9e7a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2391,6 +2391,7 @@ libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libembree.so.3 embree-3.12.2_1
+libembree3.so.3 embree-3.12.2_1
 libtbb_debug.so.2 tbb-4.3_1
 libtbb.so.2 tbb-4.3_1
 libtbbmalloc_debug.so.2 tbb-4.3_1
diff --git a/srcpkgs/godot-beta/files/godot-beta.desktop b/srcpkgs/godot-beta/files/godot-beta.desktop
new file mode 100644
index 000000000000..acce6dd12c93
--- /dev/null
+++ b/srcpkgs/godot-beta/files/godot-beta.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Godot(Beta)
+Comment=Application for making games
+Exec=/usr/bin/godot-beta %U
+Icon=godot-beta
+Terminal=false
+Type=Application
+Categories=Utility;Game;
+
diff --git a/srcpkgs/godot-beta/patches/10-fix-musl.patch b/srcpkgs/godot-beta/patches/10-fix-musl.patch
new file mode 100644
index 000000000000..42e6111c6afe
--- /dev/null
+++ b/srcpkgs/godot-beta/patches/10-fix-musl.patch
@@ -0,0 +1,13 @@
+--- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
+@@ -42,6 +42,10 @@
+ #include <libudev.h>
+ #endif
+
++#if !defined(__GLIBC__)
++#include <byteswap.h>
++#endif
++
+ #define LONG_BITS (sizeof(long) * 8)
+ #define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
+ #define NBITS(x) ((((x)-1) / LONG_BITS) + 1)
diff --git a/srcpkgs/godot-beta/template b/srcpkgs/godot-beta/template
new file mode 100644
index 000000000000..165c714cba8b
--- /dev/null
+++ b/srcpkgs/godot-beta/template
@@ -0,0 +1,51 @@
+# Template file for 'godot-beta'
+pkgname=godot-beta
+version=4.0
+_betaver=beta13
+revision=1
+archs="x86_64* i686* aarch64* armv7* ppc64*"
+build_style=scons
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ optimize=speed deprecated=no builtin_embree=false builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=false
+ builtin_miniupnpc=false builtin_pcre2=false builtin_zlib=false
+ builtin_zstd=false"
+hostmakedepends="pkg-config clang"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel embree-devel harfbuzz-devel libzstd-devel"
+short_desc="Multiplatform 2D and 3D engine"
+maintainer="dataCobra <datacobra@thinkbot.de>"
+license="MIT"
+homepage="https://www.godotengine.org/"
+distfiles="https://downloads.tuxfamily.org/godotengine/${version}/${_betaver}/godot-${version}-${_betaver}.tar.xz"
+checksum=1d3f85c48a644b75a27c8ce4a8b4a7f25a9de703e9efc63cd65d2d714814c144
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
+
+post_extract() {
+	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
+}
+
+pre_build() {
+	export CXXFLAGS=" $CXXFLAGS "
+}
+
+do_install() {
+	vlicense LICENSE.txt
+	vinstall ${FILESDIR}/godot-beta.desktop 644 /usr/share/applications/
+	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/godot-beta.png
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot-beta;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot-beta;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot-beta;;
+	esac
+}
diff --git a/srcpkgs/godot-beta/update b/srcpkgs/godot-beta/update
new file mode 100644
index 000000000000..6aa1db057e86
--- /dev/null
+++ b/srcpkgs/godot-beta/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'

Re: [PR PATCH] [Updated] [WIP] Draft for change from Godot 3 to 4.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

[WIP] Draft for change from Godot 3 to 4.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 4845 bytes --]

From af404e84c881cecb8916f45520cacf436ce1a26c Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 18 Jan 2023 09:59:07 +0100
Subject: [PATCH] New package: godot-beta

---
 common/shlibs                                |  1 +
 srcpkgs/godot-beta/files/godot-beta.desktop  |  9 ++++
 srcpkgs/godot-beta/patches/10-fix-musl.patch | 13 +++++
 srcpkgs/godot-beta/template                  | 51 ++++++++++++++++++++
 srcpkgs/godot-beta/update                    |  1 +
 5 files changed, 75 insertions(+)
 create mode 100644 srcpkgs/godot-beta/files/godot-beta.desktop
 create mode 100644 srcpkgs/godot-beta/patches/10-fix-musl.patch
 create mode 100644 srcpkgs/godot-beta/template
 create mode 100644 srcpkgs/godot-beta/update

diff --git a/common/shlibs b/common/shlibs
index 32b6337a4f92..c08459747b23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2391,6 +2391,7 @@ libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libembree.so.3 embree-3.12.2_1
+libembree3.so.3 embree-3.12.2_1
 libtbb_debug.so.2 tbb-4.3_1
 libtbb.so.2 tbb-4.3_1
 libtbbmalloc_debug.so.2 tbb-4.3_1
diff --git a/srcpkgs/godot-beta/files/godot-beta.desktop b/srcpkgs/godot-beta/files/godot-beta.desktop
new file mode 100644
index 000000000000..acce6dd12c93
--- /dev/null
+++ b/srcpkgs/godot-beta/files/godot-beta.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Godot(Beta)
+Comment=Application for making games
+Exec=/usr/bin/godot-beta %U
+Icon=godot-beta
+Terminal=false
+Type=Application
+Categories=Utility;Game;
+
diff --git a/srcpkgs/godot-beta/patches/10-fix-musl.patch b/srcpkgs/godot-beta/patches/10-fix-musl.patch
new file mode 100644
index 000000000000..42e6111c6afe
--- /dev/null
+++ b/srcpkgs/godot-beta/patches/10-fix-musl.patch
@@ -0,0 +1,13 @@
+--- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
+@@ -42,6 +42,10 @@
+ #include <libudev.h>
+ #endif
+
++#if !defined(__GLIBC__)
++#include <byteswap.h>
++#endif
++
+ #define LONG_BITS (sizeof(long) * 8)
+ #define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
+ #define NBITS(x) ((((x)-1) / LONG_BITS) + 1)
diff --git a/srcpkgs/godot-beta/template b/srcpkgs/godot-beta/template
new file mode 100644
index 000000000000..165c714cba8b
--- /dev/null
+++ b/srcpkgs/godot-beta/template
@@ -0,0 +1,51 @@
+# Template file for 'godot-beta'
+pkgname=godot-beta
+version=4.0
+_betaver=beta13
+revision=1
+archs="x86_64* i686* aarch64* armv7* ppc64*"
+build_style=scons
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ optimize=speed deprecated=no builtin_embree=false builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=false
+ builtin_miniupnpc=false builtin_pcre2=false builtin_zlib=false
+ builtin_zstd=false"
+hostmakedepends="pkg-config clang"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel embree-devel harfbuzz-devel libzstd-devel"
+short_desc="Multiplatform 2D and 3D engine"
+maintainer="dataCobra <datacobra@thinkbot.de>"
+license="MIT"
+homepage="https://www.godotengine.org/"
+distfiles="https://downloads.tuxfamily.org/godotengine/${version}/${_betaver}/godot-${version}-${_betaver}.tar.xz"
+checksum=1d3f85c48a644b75a27c8ce4a8b4a7f25a9de703e9efc63cd65d2d714814c144
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
+
+post_extract() {
+	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
+}
+
+pre_build() {
+	export CXXFLAGS=" $CXXFLAGS "
+}
+
+do_install() {
+	vlicense LICENSE.txt
+	vinstall ${FILESDIR}/godot-beta.desktop 644 /usr/share/applications/
+	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/godot-beta.png
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot-beta;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot-beta;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot-beta;;
+	esac
+}
diff --git a/srcpkgs/godot-beta/update b/srcpkgs/godot-beta/update
new file mode 100644
index 000000000000..6aa1db057e86
--- /dev/null
+++ b/srcpkgs/godot-beta/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'

Re: [WIP] Draft for change from Godot 3 to 4.

[lun-4]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by lun-4 on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450526271

Comment:
Now that [Godot 4 is released](https://godotengine.org/article/godot-4-0-sets-sail/), maybe we can work on revitalizing this PR?

Re: [WIP] Draft for change from Godot 3 to 4.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450555086

Comment:
Definitly I'll work on this. :+1:

Re: [WIP] Draft for change from Godot 3 to 4.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450555086

Comment:
Definitly, I'll work on this. :+1:

Re: [PR PATCH] [Updated] [WIP] Draft for change from Godot 3 to 4.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

[WIP] Draft for change from Godot 3 to 4.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7031 bytes --]

From 8d2154f483d832fe835735f6861f5039ad089a98 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 1 Mar 2023 19:17:28 +0100
Subject: [PATCH] godot: update to 4.0.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 40 +++++-------
 3 files changed, 19 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..79278349b8d6 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,32 +1,28 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ optimize=speed deprecated=no builtin_embree=false builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_libogg=false builtin_libpng=false builtin_libtheora=false
+ builtin_libvorbis=false builtin_libwebp=false builtin_mbedtls=false
+ builtin_miniupnpc=false builtin_pcre2=false builtin_zlib=false
+ builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel embree-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
@@ -34,7 +30,7 @@ LDFLAGS+=" -pie"
 
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -47,8 +43,8 @@ do_install() {
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7042 bytes --]

From bb6149b3d96f5000238b615d59ab90e9e529661f Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 1 Mar 2023 20:16:04 +0100
Subject: [PATCH] godot: update to 4.0.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 40 +++++-------
 3 files changed, 19 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..36f5cd1af113 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,32 +1,28 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel embree-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
@@ -34,7 +30,7 @@ LDFLAGS+=" -pie"
 
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -47,8 +43,8 @@ do_install() {
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450722289

Comment:
Everyone who is willing to test the building and try out the PR please let me know if everything works as expected.

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

To check which changes to the template need to be made for Godot 4 to work.
I created the new package godot-beta which can exist beside the regular package.

First and foremost, this PR is about testing. Since the package only can be build on native architectures. We could consider adding this PR to Void but since beta will be obsolete with Godot 4 release I wouldn't recommend it.

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7029 bytes --]

From 76acccb1d5b1d9b59979643b685bb310e437e012 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 1 Mar 2023 20:19:43 +0100
Subject: [PATCH] godot: update to 4.0.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 40 +++++-------
 3 files changed, 19 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..c273b8bb4052 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,32 +1,28 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
@@ -34,7 +30,7 @@ LDFLAGS+=" -pie"
 
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -47,8 +43,8 @@ do_install() {
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450726363

Comment:
For me it works on x86_64-glibc

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1450727777

Comment:
For some currently unknown reason the new version of embree is no longer working with Godot.

Because of this I've changed the configuration so it fallsback to builtin embree for now.

Re: Upgrade Godot from 3 to 4

[jstnas]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by jstnas on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1455186894

Comment:
Tested this on `x86_64-musl` and it does work, but I had to add `libexecinfo-devel` to the `makedepends`

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7168 bytes --]

From e0e4626da80748c6ac5fe515c0da51d29807fb53 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 8 Mar 2023 07:29:00 +0100
Subject: [PATCH] godot: update to 4.0.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 45 ++++++-------
 3 files changed, 24 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..8b5c8fa3e743 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,40 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +46,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1459613134

Comment:
Hey @jstnas,

thank you for testing the PR.

Can you please test again?

I've now added `libexecinfo-devel` for all __*-musl__ architectures.

Re: Upgrade Godot from 3 to 4

[jstnas]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by jstnas on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1460668967

Comment:
I've rebuilt the package and everything's working as expected.

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1461537005

Comment:
Thanks for testing @jstnas :+1:

Re: Upgrade Godot from 3 to 4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1477122263

Comment:
4.01 is out

Re: Upgrade Godot from 3 to 4

[jstnas]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by jstnas on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1477795044

Comment:
testing 4.0.1, Godot crashed when built without `speech-dispatcher-devel`

Re: Upgrade Godot from 3 to 4

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1477853588

Comment:
I tested 4.0.1 on x86_64-glibc and everything seems to be working fine.

Re: Upgrade Godot from 3 to 4

[jstnas]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by jstnas on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1477795044

Comment:
testing 4.0.1 on x86_64-musl, Godot crashed when built without `speech-dispatcher-devel`

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7197 bytes --]

From 483e205ed342084a4cc338d37f73b39f93431c37 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 23 Mar 2023 07:22:44 +0100
Subject: [PATCH] godot: update to 4.0.1.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 45 ++++++-------
 3 files changed, 24 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..c27c582ad7d0 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,40 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.1
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +46,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1480661872

Comment:
I've pushed the new template for 4.0.1 taking the dependency for musl into account.

Can you please test the package again?

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1480666428

Comment:
I forgot to change the checksum...

Will push again. ^^

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7197 bytes --]

From 65aa8920173ea68411b852473f00f887426313fb Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 23 Mar 2023 07:33:32 +0100
Subject: [PATCH] godot: update to 4.0.1.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 45 ++++++-------
 3 files changed, 24 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..3eca61d66c9b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,40 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.1
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=676068f3279ff8f5cea18e3f16a8bbf2fd76b2c22eded3a550d25457bdf4f6cd
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +46,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1480667784

Comment:
Alright, now with the correct checksum. :+1:

Re: Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1481219014

Comment:
I've tested at least building successful for x86_64, i686, x86_64-musl. :slightly_smiling_face:

Re: Upgrade Godot from 3 to 4

[fgietzen]

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New comment by fgietzen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1481545157

Comment:
Seems to work for me as well on x86_64. I was able to open and run a small test project without any problems.

Re: Upgrade Godot from 3 to 4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1482139346

Comment:
Tested on x64 glibc

just update PR name to be same as commit message..
 And LGTM..

Re: Upgrade Godot from 3 to 4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1482139346

Comment:
Tested on x64 glibc

Just rebase from master and
 update PR name to be same as commit message..
 And LGTM..

Re: Upgrade Godot from 3 to 4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1482139346

Comment:
Tested on x64 glibc

Just rebase from master and
 update PR name to be same as commit message..

 And LGTM..

Re: Upgrade Godot from 3 to 4

[Newchair2644]

[-- Attachment #1: Type: text/plain, Size: 2262 bytes --]

New comment by Newchair2644 on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1484152445

Comment:
Just tested for x64 glibc on sway and I am getting this error when godot crashes trying to launch a project from the project selector.

``` err
Godot Engine v4.0.1.stable.custom_build - https://godotengine.org
xkbcommon: ERROR: couldn't find a Compose file for locale "en_US.utf-8" (mapped to "en_US.utf-8")
libspeechd.so.2: cannot open shared object file: No such file or directory
OpenGL API 3.3 (Core Profile) Mesa 22.3.5 - Compatibility - Using Device: Intel - Mesa Intel(R) HD Graphics 3000 (SNB GT2)
 
Editing project: /home/newchair/Code/games/hi
Godot Engine v4.0.1.stable.custom_build - https://godotengine.org
xkbcommon: ERROR: couldn't find a Compose file for locale "en_US.utf-8" (mapped to "en_US.utf-8")
libspeechd.so.2: cannot open shared object file: No such file or directory
ERROR: Required extension VK_KHR_surface not found, is a driver installed?
   at: _initialize_instance_extensions (drivers/vulkan/vulkan_context.cpp:468)
ERROR: Could not initialize Vulkan
   at: DisplayServerX11 (platform/linuxbsd/x11/display_server_x11.cpp:5465)
Your video card drivers seem not to support the required Vulkan version.

If possible, consider updating your video card drivers or using the OpenGL 3 driver.

You can enable the OpenGL 3 driver by starting the engine from the
command line with the command:

    "godot" --rendering-driver opengl3

If you recently updated your video card drivers, try rebooting.
ERROR: Unable to create DisplayServer, all display drivers failed.
   at: setup2 (main/main.cpp:2017)
ERROR: Pages in use exist at exit in PagedAllocator: N7Variant5Pools11BucketLargeE
   at: ~PagedAllocator (./core/templates/paged_allocator.h:140)
ERROR: Pages in use exist at exit in PagedAllocator: N7Variant5Pools12BucketMediumE
   at: ~PagedAllocator (./core/templates/paged_allocator.h:140)
ERROR: Pages in use exist at exit in PagedAllocator: N7Variant5Pools11BucketSmallE
   at: ~PagedAllocator (./core/templates/paged_allocator.h:140)
ERROR: BUG: Unreferenced static string to 0: interface_added
   at: unref (core/string/string_name.cpp:131)
   ```

Re: Upgrade Godot from 3 to 4

[Newchair2644]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New comment by Newchair2644 on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1484153200

Comment:
Getting the same error when testing the 4.0 binary on the godot website so its not an issue with this package.

Re: Upgrade Godot from 3 to 4

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1486555165

Comment:
This error seems to be related to your system's locale

    xkbcommon: ERROR: couldn't find a Compose file for locale "en_US.utf-8" (mapped to "en_US.utf-8")

Maybe your should set `LANG=en_US.UTF-8` in `/etc/locale.conf`[^1], and see if that solves it.

[^1]: https://docs.voidlinux.org/config/locales.html#setting-the-system-locale

---

Perhaps `speech-dispatcher` should be explicitly added as a runtime dependency. If I uninstall it from my system I also get this message:

    libspeechd.so.2: cannot open shared object file: No such file or directory

---

Either your graphics card is old and does not support Vulkan or your drivers are outdated. If your GPU does support Vulkan then try updating your drivers.

    ERROR: Required extension VK_KHR_surface not found, is a driver installed?
    at: _initialize_instance_extensions (drivers/vulkan/vulkan_context.cpp:468)
    ERROR: Could not initialize Vulkan
    at: DisplayServerX11 (platform/linuxbsd/x11/display_server_x11.cpp:5465)
    Your video card drivers seem not to support the required Vulkan version.

Re: Upgrade Godot from 3 to 4

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1486555165

Comment:
This error seems to be related to your system's locale

    xkbcommon: ERROR: couldn't find a Compose file for locale "en_US.utf-8" (mapped to "en_US.utf-8")

Maybe you should set `LANG=en_US.UTF-8` in `/etc/locale.conf`[^1], and see if that solves it.

[^1]: https://docs.voidlinux.org/config/locales.html#setting-the-system-locale

---

Perhaps `speech-dispatcher` should be explicitly added as a runtime dependency. If I uninstall it from my system I also get this message:

    libspeechd.so.2: cannot open shared object file: No such file or directory

---

Either your graphics card is old and does not support Vulkan or your drivers are outdated. If your GPU does support Vulkan then try updating your drivers.

    ERROR: Required extension VK_KHR_surface not found, is a driver installed?
    at: _initialize_instance_extensions (drivers/vulkan/vulkan_context.cpp:468)
    ERROR: Could not initialize Vulkan
    at: DisplayServerX11 (platform/linuxbsd/x11/display_server_x11.cpp:5465)
    Your video card drivers seem not to support the required Vulkan version.

Re: Upgrade Godot from 3 to 4

[Newchair2644]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by Newchair2644 on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1487873968

Comment:
You are 100% percent correct, my poor old intel hd 3000 igpu does not support vulkan. I apologize for adding irrelevant information to this PR. Thanks!

Re: Upgrade Godot from 3 to 4

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1488514506

Comment:
@Newchair2644 Your contribution brought up a dependency issue and provided insight on old hardware, so for me it's very much appreciated.

There is currently an open issue for this problem, upstream, if you want to follow: https://github.com/godotengine/godot/issues/58927

It's also worth noting that not all features are supported yet by the OpenGL 3 renderer[^1], as they're being worked on for version 4.1[^2], so you might want to stick with Godot 3 for now.

---

On that note, perhaps we should add an install message, like:

    If your graphics card does not support Vulkan, you need to use
    the OpenGL 3 renderer:
    
    $ godot --rendering-driver opengl3
    
    More details: https://github.com/godotengine/godot/issues/58927

[^1]: https://godotengine.org/article/status-of-opengl-renderer/
[^2]: https://github.com/orgs/godotengine/projects/33/views/1

Re: [PR PATCH] [Updated] Upgrade Godot from 3 to 4

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

Upgrade Godot from 3 to 4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7197 bytes --]

From 0e12e795933fea3da319b46ad903fa401822a1b2 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 12 Apr 2023 10:07:14 +0200
Subject: [PATCH] godot: update to 4.0.2.

---
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 45 ++++++-------
 3 files changed, 24 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..1cb5ad1f326e 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,40 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.2
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.0.0
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=d978282597c5e3a398ad3ade8b5a68d351178c82b197fa6a64045f4abc37e5a6
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +46,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1504851167

Comment:
Hey @eljamm,

should I add `speech-dispatcher` as a default runtime dependency for all architectures?

Do you know how I add an install message to the package? I haven't done this before.

Re: godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1504851643

Comment:
I updated the title and the package to godot 4.0.2. :+1:

Re: godot: update to 4.0.2.

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1505228896

Comment:
@dataCobra

Since it's not automatically detected, I think it should manually be added as a runtime dependency.
It's used by godot for TTS[^1], so not having it installed would leave this feature missing.

For the install message, you just have to put it inside an `INSTALL.msg` file[^2].

[^1]: https://docs.godotengine.org/en/stable/tutorials/audio/text_to_speech.html#requirements-for-functionality
[^2]: https://github.com/void-linux/void-packages/blob/master/Manual.md#installmsg-and-removemsg-files

Re: [PR PATCH] [Updated] godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From 69493fcc9acf39d131aae6cd100730754cbd3625 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 14 May 2023 09:32:46 +0200
Subject: [PATCH] godot: update to 4.0.2.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..3832da213acc 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.2
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=d978282597c5e3a398ad3ade8b5a68d351178c82b197fa6a64045f4abc37e5a6
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1547220857

Comment:
Hey everyone,

I've changed all the necessary stuff and added speech-dispatcher as a dependency.

I think we're good to go. Could others please test the PR one more time so we can confirm a working package?

Re: [PR PATCH] [Updated] godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From a4d4d5cef94b805e454dd21590fa5aaf02cb5a61 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 25 May 2023 17:10:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..d5cd18ad7225 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: godot: update to 4.0.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1563122066

Comment:
Hello everyone,

I've updated the package to version 4.0.3 of godot game engine.

Re: godot: update to 4.0.3.

[bilebucket]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by bilebucket on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1565631776

Comment:
I had a brief test and the package indeed seems to work just fine.

Re: godot: update to 4.0.3.

[eljamm]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by eljamm on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1566140328

Comment:
Everything seems good to me as well.

Re: godot: update to 4.0.3.

[obunden]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by obunden on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1573685830

Comment:
Would you guys say that this is ready for merging? Or is something untested?

Re: godot: update to 4.0.3.

[bilebucket]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

New comment by bilebucket on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1575456577

Comment:
I'd say that it's good to merge. I've worked on a 2D project of mine with this package for some 7 hours, no instability or crashes occurred. I also briefly tested some of the available 3D demos and they seem to work well too. @dataCobra thank you for maintaining the Godot package!

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From b6f57e2147a4b223198ea6bfd4ccae871dd72953 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 25 May 2023 17:10:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..d5cd18ad7225 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From 34dbf1df16bce82a751d3d71028b858b5469cba2 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 25 May 2023 17:10:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..d5cd18ad7225 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR REVIEW] godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1232140954

Comment:
Why is speech-dispatcher-devel only needed on musl?

Why is libexecinfo needed when the crash handler is disabled below?

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1232146817

Comment:
That is a good question. I'll try building without `libexecinfo-devel` and add `speech-dispatcher-devel` to the make dependencies.

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From 82b9f717e04ec8dec49f65e39bd329e7cae98396 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 25 May 2023 17:10:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..d5cd18ad7225 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]

From 390d47712e7bd6ae18100cd6ac6cad050d44b9b4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 25 May 2023 17:10:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 46 ++++++-------
 4 files changed, 31 insertions(+), 110 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..d5cd18ad7225 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,40 +1,41 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel speech-dispatcher-devel";;
+esac
+
 post_extract() {
 	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
+		-i platform/linuxbsd/crash_handler_linuxbsd.cpp
 }
 
 pre_build() {
@@ -46,9 +47,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1243351559

Comment:
I don't know why the crash handler was disabled in the first place. Older commits don't explain this change.

If it's okay for you I would remove the crash handler change and move speech-dispatcher-devel and libexecinfo-devel to make_depends.

Note: I tested building with musl with the crash handler change still in place. musl does indeed need libexecinfo-devel and glibc doesn't need it for unknown reasons.

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1243352532

Comment:
I've already tested building without the crash handler change successfully for musl and glibc.

Re: [PR REVIEW] godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1244023976

Comment:
> glibc doesn't need it for unknown reasons.

Well glibc implements this internally.

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7678 bytes --]

From 951b51ed9638bc768b43be85227ca6c6489fe6e3 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 27 Jun 2023 20:39:04 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 48 +++++++-------
 4 files changed, 30 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..7b9a58d1c139 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,38 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel ";;
+esac
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +43,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1244196372

Comment:
I've now changed the template and did the following:

1. Get rid of the crash handler change.
2. Only `libexecinfo-devel` will now only be used for musl builds. (Only needed for musl)
3. `speech-dispatcher-devel` is now a dependency for all architectures.

I've successfully build natively x86, x86_64 and x86_64-musl with these changes.

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7678 bytes --]

From 997537e90f9732d69b75cdcb8f708f5aaffbcf32 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 27 Jun 2023 20:39:04 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 48 +++++++-------
 4 files changed, 30 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..7b9a58d1c139 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,38 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel ";;
+esac
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +43,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1613166388

Comment:
Please rebase and push so we can run CI for once. (I'm not 100% sure libexecinfo is picked up.)

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.


A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 7678 bytes --]

From f2c0b9c318ead33630d0a5c9777b7c2c3dfafeb5 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 29 Jun 2023 15:45:24 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 48 +++++++-------
 4 files changed, 30 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..7b9a58d1c139 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,38 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel ";;
+esac
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +43,10 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*|aarch64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
+		*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
 	esac
 }

Re: godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1613213141

Comment:
> Please rebase and push so we can run CI for once. (I'm not 100% sure libexecinfo is picked up.)

CI is now running. :)

I hope we get a good outcome.

Re: godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1613223897

Comment:
Well i686 fails but I don't quite understand what the problem is.

The system should be building x86 and not x86_64 but compliance about x86_64 not build? 

Re: godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1613223897

Comment:
Well i686 fails but I don't quite understand what the problem is.

The system should be building x86 and not x86_64 but compliance about x86_64 not build?

As said before, building here natively x86 did work.

Re: godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]

New comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1615546981

Comment:
> Well i686 fails but I don't quite understand what the problem is.
> 
> The system should be building x86 and not x86_64 but compliance about x86_64 not build?
> 
> As said before, building here natively x86 did work.

https://docs.godotengine.org/en/stable/contributing/development/compiling/introduction_to_the_buildsystem.html#architecture

> # Architecture
> The `arch` option is meant to control the CPU or OS version intended to run the binaries. It is focused mostly on desktop platforms and ignored everywhere else.
>
> Supported values for the arch option are **auto**, **x86_32**, **x86_64**, **arm32**, **arm64**, **rv64**, **ppc32**, **ppc64** and **wasm32**.
>
> ```
> scons platform=<platform> arch={auto|x86_32|x86_64|arm32|arm64|rv64|ppc32|ppc64|wasm32}
> ```
>
> This flag appends the value of `arch` to resulting binaries when relevant. The default value `arch=auto` detects the architecture that matches the host platform.

I don't know if i686 is a supported built target.

Re: godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]

New comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1615546981

Comment:
> Well i686 fails but I don't quite understand what the problem is.
> 
> The system should be building x86 and not x86_64 but compliance about x86_64 not build?
> 
> As said before, building here natively x86 did work.

https://docs.godotengine.org/en/stable/contributing/development/compiling/introduction_to_the_buildsystem.html#architecture

> # Architecture
> The `arch` option is meant to control the CPU or OS version intended to run the binaries. It is focused mostly on desktop platforms and ignored everywhere else.
>
> Supported values for the arch option are **auto**, **x86_32**, **x86_64**, **arm32**, **arm64**, **rv64**, **ppc32**, **ppc64** and **wasm32**.
>
> ```
> scons platform=<platform> arch={auto|x86_32|x86_64|arm32|arm64|rv64|ppc32|ppc64|wasm32}
> ```
>
> This flag appends the value of `arch` to resulting binaries when relevant. The default value `arch=auto` detects the architecture that matches the host platform.

In theory, specifying `arch=x86_32` would work, no?

Re: [PR REVIEW] godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

New review comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248570041

Comment:
Since this is targeting the libc, specifically, wouldn't `XBPS_TARGET_LIBC` be more accurate? Something like:

```sh
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
    makedepends +=" libexecinfo-devel"
fi
```

Re: [PR REVIEW] godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248572574

Comment:
For targeting i686, I might try:

```sh
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
    make_build_args+=" arch=x86_32"
fi
```

Re: [PR REVIEW] godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

New review comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248581500

Comment:
Covering all cases could look like:

```sh
case "$XBPS_TARGET_MACHINE" in
    x86) arch="x86_32" ;;
    x86_64*) arch="x86_64" ;;
    armv7*) arch="arm64" ;;
    ppc*) arch="ppc64" ;;
   #.
   #.
   #.
   # etc
esac

make_build_args+=" arch=$arch"
```

Re: [PR REVIEW] godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248862416

Comment:
This sounds wrong to me...

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248863420

Comment:
What do you mean with this sounds wrong?

I don't see an issue here?

Re: [PR REVIEW] godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248864885

Comment:
Why would the arm64 binary be called x86_64?

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1248866782

Comment:
Oh now I see what you mean...

Yeah well that is indeed a problem.

I'll change it. Thank you for bringing that to my attention. :)

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1249297781

Comment:
Thank you for the help.

I've changed this in the new commit.

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1249299658

Comment:
Fixed in the new commit.

Re: [PR REVIEW] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1249299925

Comment:
I've decided to use the second method to make sure everything is covered correct.

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.


A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 8042 bytes --]

From 832367743ad7f7d56dbcbce1d6976df744d1b217 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 2 Jul 2023 09:08:40 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 61 ++++++++++-------
 4 files changed, 43 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..25cbc3cd3b08 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,49 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel ";;
+	depends+=" libexecinfo ";;
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+    i686*) arch="x86_32" ;;
+    x86_64*) arch="x86_64" ;;
+    aarch64*) arch="arm64" ;;
+    armv7*) arch="arm32" ;;
+    ppc64*) arch="ppc64" ;;
+esac
+
+make_build_args+=" arch=$arch"
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +54,12 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		i686*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
+		aarch64*) vbin bin/godot.linuxbsd.editor.arm64 godot;;
+		armv7*) vbin bin/godot.linuxbsd.editor.arm32 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
 	esac
 }

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.


A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 8027 bytes --]

From 534ec0f6950d6e339a005ae8f053a27a2a968090 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 2 Jul 2023 09:12:08 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 61 ++++++++++-------
 4 files changed, 43 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..3c17b204cfee 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,49 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel ";;
+	depends+=" libexecinfo ";;
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) arch="x86_32" ;;
+	x86_64*) arch="x86_64" ;;
+	aarch64*) arch="arm64" ;;
+	armv7*) arch="arm32" ;;
+	ppc64*) arch="ppc64" ;;
+esac
+
+make_build_args+=" arch=$arch"
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +54,12 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		i686*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
+		aarch64*) vbin bin/godot.linuxbsd.editor.arm64 godot;;
+		armv7*) vbin bin/godot.linuxbsd.editor.arm32 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
 	esac
 }

Re: [PR PATCH] [Updated] godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot-beta
https://github.com/void-linux/void-packages/pull/41675

godot: update to 4.0.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.


A patch file from https://github.com/void-linux/void-packages/pull/41675.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-beta-41675.patch --]
[-- Type: text/x-diff, Size: 8021 bytes --]

From 55e3f3c2f860cddea54c7b3a2b1f2526ed0f9889 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 2 Jul 2023 09:17:28 +0200
Subject: [PATCH] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 61 ++++++++++-------
 4 files changed, 43 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..956fe154b59d 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,49 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel"
+	depends+=" libexecinfo"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) arch="x86_32" ;;
+	x86_64*) arch="x86_64" ;;
+	aarch64*) arch="arm64" ;;
+	armv7*) arch="arm32" ;;
+	ppc64*) arch="ppc64" ;;
+esac
+
+make_build_args+=" arch=$arch"
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +54,12 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		i686*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
+		aarch64*) vbin bin/godot.linuxbsd.editor.arm64 godot;;
+		armv7*) vbin bin/godot.linuxbsd.editor.arm32 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
 	esac
 }

Re: godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1616463549

Comment:
It seems like with all the great help we've a functioning update.

If you stumble upon any other issues please let me know. Otherwise I would say we're finally ready for merge. :slightly_smiling_face: 

Re: godot: update to 4.0.3.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#issuecomment-1616463549

Comment:
It seems like with all the great help we've a functioning update.

If you stumble upon any other issues please let me know. Otherwise I would say we're finally ready for merge. :slightly_smiling_face: 

Thanks a lot to all of you.

Re: [PR PATCH] [Merged]: godot: update to 4.0.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

There's a merged pull request on the void-packages repository

godot: update to 4.0.3.
https://github.com/void-linux/void-packages/pull/41675

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

**Godot 4.0 is released!**

Please test the PR on different architectures and give feedback here about the usability.

Re: [PR REVIEW] godot: update to 4.0.3.

[astralchan]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New review comment by astralchan on void-packages repository

https://github.com/void-linux/void-packages/pull/41675#discussion_r1251451708

Comment:
If `nocross` is not empty, why even bother trying to set things for cross build?