From d7f543682f60a2e86d4aae5b3e6acb70faabbb74 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Thu, 3 Oct 2024 17:01:22 +0200 Subject: [PATCH] godot: use glslang package --- srcpkgs/godot/patches/fix-glslang.patch | 23 +++++++++++++++++++++++ srcpkgs/godot/template | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/godot/patches/fix-glslang.patch diff --git a/srcpkgs/godot/patches/fix-glslang.patch b/srcpkgs/godot/patches/fix-glslang.patch new file mode 100644 index 00000000000..0f37d38811d --- /dev/null +++ b/srcpkgs/godot/patches/fix-glslang.patch @@ -0,0 +1,23 @@ +From 4323f8cd47121df428b0394c6ba2a8da1f93a396 Mon Sep 17 00:00:00 2001 +From: Sertonix +Date: Sat, 22 Jun 2024 17:14:11 +0000 +Subject: [PATCH] Fix missing lib with builtin_glslang=false + +The `GetDefaultResource` function is in separate library file. +--- + platform/linuxbsd/detect.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py +index 303a88ab2611..0e24370d8a38 100644 +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -480,7 +480,7 @@ def configure(env: "SConsEnvironment"): + env.ParseConfig("pkg-config vulkan --cflags --libs") + if not env["builtin_glslang"]: + # No pkgconfig file so far, hardcode expected lib name. +- env.Append(LIBS=["glslang", "SPIRV"]) ++ env.Append(LIBS=["glslang", "SPIRV", "glslang-default-resource-limits"]) + + if env["opengl3"]: + env.Append(CPPDEFINES=["GLES3_ENABLED"]) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 837142ec1d3..618d8a77a18 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,11 +1,11 @@ # Template file for 'godot' pkgname=godot version=4.3 -revision=6 +revision=7 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=scons make_build_args="platform=linuxbsd target=editor progress=no production=yes - lto=auto builtin_brotli=false builtin_enet=false + lto=auto builtin_brotli=false builtin_enet=false builtin_glslang=false builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false builtin_icu4c=false builtin_libogg=false builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false @@ -17,7 +17,7 @@ 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 mbedtls2-devel miniupnpc-devel pcre2-devel - pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel + pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel glslang-devel speech-dispatcher-devel brotli-devel icu-devel wayland-devel" depends="speech-dispatcher" short_desc="Multiplatform 2D and 3D engine"