| 1 |
commit: badc538a3013607d16632ca551697b3eb462bd74 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 2 06:56:01 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 2 07:32:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badc538a |
| 7 |
|
| 8 |
dev-games/godot: switch to bundled glslang+vulkan-headers |
| 9 |
|
| 10 |
Similarly to pcsx2, this uses part of the glslang private API |
| 11 |
and can break easily with the system's copy. Also use bundled |
| 12 |
vulkan-headers given mismatching with glslang is also volatile. |
| 13 |
|
| 14 |
Revbump given it could've built with the old glslang and possibly |
| 15 |
have ill effects after updating it. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/879111 |
| 18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 19 |
|
| 20 |
...godot-4.0_beta4.ebuild => godot-4.0_beta4-r1.ebuild} | 17 ++++++----------- |
| 21 |
1 file changed, 6 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-games/godot/godot-4.0_beta4.ebuild b/dev-games/godot/godot-4.0_beta4-r1.ebuild |
| 24 |
similarity index 95% |
| 25 |
rename from dev-games/godot/godot-4.0_beta4.ebuild |
| 26 |
rename to dev-games/godot/godot-4.0_beta4-r1.ebuild |
| 27 |
index 9a915964766b..b790692736f4 100644 |
| 28 |
--- a/dev-games/godot/godot-4.0_beta4.ebuild |
| 29 |
+++ b/dev-games/godot/godot-4.0_beta4-r1.ebuild |
| 30 |
@@ -43,7 +43,6 @@ RDEPEND=" |
| 31 |
sys-libs/zlib:= |
| 32 |
fontconfig? ( media-libs/fontconfig ) |
| 33 |
gui? ( |
| 34 |
- dev-util/glslang |
| 35 |
media-libs/alsa-lib |
| 36 |
media-libs/libglvnd[X] |
| 37 |
media-libs/vulkan-loader[X] |
| 38 |
@@ -66,10 +65,7 @@ RDEPEND=" |
| 39 |
webp? ( media-libs/libwebp:= )" |
| 40 |
DEPEND=" |
| 41 |
${RDEPEND} |
| 42 |
- gui? ( |
| 43 |
- dev-util/vulkan-headers |
| 44 |
- x11-base/xorg-proto |
| 45 |
- ) |
| 46 |
+ gui? ( x11-base/xorg-proto ) |
| 47 |
tools? ( test? ( dev-cpp/doctest ) )" |
| 48 |
BDEPEND="virtual/pkgconfig" |
| 49 |
|
| 50 |
@@ -91,9 +87,9 @@ src_prepare() { |
| 51 |
|
| 52 |
# use of builtin_ switches can be messy (see below), delete to be sure |
| 53 |
local unbundle=( |
| 54 |
- doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng |
| 55 |
- libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation |
| 56 |
- volk vulkan/include wslay zlib zstd |
| 57 |
+ doctest embree freetype graphite harfbuzz icu4c libogg |
| 58 |
+ libpng libtheora libvorbis libwebp mbedtls miniupnpc |
| 59 |
+ pcre2 recastnavigation volk wslay zlib zstd |
| 60 |
# certs: unused by generated header, but scons panics if not found |
| 61 |
) |
| 62 |
rm -r "${unbundle[@]/#/thirdparty/}" || die |
| 63 |
@@ -138,7 +134,7 @@ src_compile() { |
| 64 |
builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast))) |
| 65 |
builtin_enet=yes # bundled copy is patched for IPv6+DTLS support |
| 66 |
builtin_freetype=no |
| 67 |
- builtin_glslang=$(usex !gui) |
| 68 |
+ builtin_glslang=yes #879111 |
| 69 |
builtin_graphite=no |
| 70 |
builtin_harfbuzz=no |
| 71 |
builtin_icu=no |
| 72 |
@@ -162,11 +158,10 @@ src_compile() { |
| 73 |
# amd-fsr, basis_universal, cvtt, etcpak, fonts, glad, |
| 74 |
# jpeg-compressor, meshoptimizer, minimp3, minizip (patched to |
| 75 |
# seek in archives), noise, oidn, openxr, spirv-reflect, thorvg, |
| 76 |
- # tinyexr, vhacd, vulkan (minus include/) and the misc directory. |
| 77 |
+ # tinyexr, vhacd, vulkan, and the misc directory. |
| 78 |
|
| 79 |
# modules with optional dependencies, "possible" to disable more but |
| 80 |
# gets messy and breaks all sorts of features (expected enabled) |
| 81 |
- module_glslang_enabled=$(usex gui) |
| 82 |
module_gridmap_enabled=$(usex deprecated) # fails without deprecated |
| 83 |
module_mono_enabled=no # unhandled |
| 84 |
# note raycast is only enabled on amd64+arm64, see raycast/config.py |
Archives