瀏覽代碼

package/python-glslang: bump to version 15.3.0

See changelog:
https://github.com/KhronosGroup/glslang/blob/15.3.0/CHANGES.md

Fixes build issue: error: ‘uint32_t’ has not been declared, encountered
on GCC v15, caused by cstdint not being implicitly included.

https://bugs.gentoo.org/937261

This commit also adds host-spriv-tools in _DEPENDENCIES to use the
version packaged in Buildroot. It also adds
ALLOW_EXTERNAL_SPIRV_TOOLS=ON in _CONF_OPTS, which was added in upstream
commit [1], introduced in version 13.0.0.

Also, when trying to build this python-glslang version 15.3.0 on a host
providing cmake < 3.26, the configuration fails with the error message:

    CMake Error at CMakeLists.txt:345 (add_test):
      Error evaluating generator expression:

        $<TARGET_RUNTIME_DLL_DIRS:spirv-remap>

      Expression did not evaluate to a known generator expression

This happens in the Buildroot docker reference image, which provides a
cmake version 3.25. To workaround this issue which happen in glslang
testing code, this commit disable those tests by adding
GLSLANG_TESTS=OFF in _CONF_OPTS.

[1] https://github.com/KhronosGroup/glslang/commit/3805888a57c07904b6bbdec639bfe5f078e26342

Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
[Julien:
 - resolve merge conflict
 - update changelog link to use version tag
 - disable glslang tests
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
Joseph Kogut 1 月之前
父節點
當前提交
53076f0eba
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 1 1
      package/python-glslang/python-glslang.hash
  2. 6 2
      package/python-glslang/python-glslang.mk

+ 1 - 1
package/python-glslang/python-glslang.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162  python-glslang-11.13.0.tar.gz
+sha256  c6c21fe1873c37e639a6a9ac72d857ab63a5be6893a589f34e09a6c757174201  python-glslang-15.3.0.tar.gz
 sha256  adb783e734e906d1f46db5df29991dbde84bdb0ceab502ac2febb44fe3c2b5f4  LICENSE.txt

+ 6 - 2
package/python-glslang/python-glslang.mk

@@ -4,10 +4,14 @@
 #
 ################################################################################
 
-PYTHON_GLSLANG_VERSION = 11.13.0
+PYTHON_GLSLANG_VERSION = 15.3.0
 PYTHON_GLSLANG_SITE = $(call github,KhronosGroup,glslang,$(PYTHON_GLSLANG_VERSION))
 PYTHON_GLSLANG_LICENSE = BSD-3-Clause
 PYTHON_GLSLANG_LICENSE_FILES = LICENSE.txt
-HOST_PYTHON_GLSLANG_DEPENDENCIES = host-python3
+HOST_PYTHON_GLSLANG_DEPENDENCIES = host-python3 host-spirv-tools
+
+HOST_PYTHON_GLSLANG_CONF_OPTS += \
+	-DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
+	-DGLSLANG_TESTS=OFF
 
 $(eval $(host-cmake-package))