wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 14:43:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

godot: use glslang package

Browse source
This commit is contained in:
dataCobra 2024-10-03 17:01:22 +02:00 • committed by classabbyamp
parent 6fba27a0cb
commit d7f543682f
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
srcpkgs/godot/patches/fix-glslang.patch Normal file
View file

@ -0,0 +1,23 @@
From 4323f8cd47121df428b0394c6ba2a8da1f93a396 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
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"])

6
srcpkgs/godot/template
View file

@ -1,11 +1,11 @@
# Template file for 'godot' # Template file for 'godot'
pkgname=godot pkgname=godot
version=4.3 version=4.3
revision=6 revision=7
archs="x86_64* i686* aarch64* armv7* ppc64*" archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons build_style=scons
make_build_args="platform=linuxbsd target=editor progress=no production=yes 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_freetype=false builtin_graphite=false builtin_harfbuzz=false
builtin_icu4c=false builtin_libogg=false builtin_libpng=false builtin_icu4c=false builtin_libogg=false builtin_libpng=false
builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=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 libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-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" speech-dispatcher-devel brotli-devel icu-devel wayland-devel"
depends="speech-dispatcher" depends="speech-dispatcher"
short_desc="Multiplatform 2D and 3D engine" short_desc="Multiplatform 2D and 3D engine"