diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2021-09-08 13:32:35 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-09-08 16:00:30 +0200 |
| commit | 0af33a4d2ec7467d12fc2355549d0b79d95263c8 (patch) | |
| tree | 72597e0be18e7e54d3be1f41fd59202bc146fac7 | |
| parent | aae9ebe8deab13bb29e562a63d88d81d2c727da5 (diff) | |
| download | ptxdist-0af33a4d2ec7467d12fc2355549d0b79d95263c8.tar.gz ptxdist-0af33a4d2ec7467d12fc2355549d0b79d95263c8.tar.xz | |
glslang: version bump 11.5.0 -> 11.6.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20210908113236.15651-5-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/glslang.make | 17 | ||||
| -rw-r--r-- | rules/host-glslang.make | 14 |
2 files changed, 17 insertions, 14 deletions
diff --git a/rules/glslang.make b/rules/glslang.make index 76ee41ba4..3c1908bff 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION := 11.5.0 -GLSLANG_MD5 := 6c86e1a5d65815a707af3bead744804c +GLSLANG_VERSION := 11.6.0 +GLSLANG_MD5 := 37918eefd58acd7309faf96fb83ab4ce GLSLANG := glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) @@ -32,18 +32,19 @@ GLSLANG_CONF_TOOL := cmake GLSLANG_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DBUILD_SHARED_LIBS=ON \ -DBUILD_EXTERNAL=OFF \ - -DSKIP_GLSLANG_INSTALL=OFF \ - -DENABLE_SPVREMAPPER=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_CTEST=OFF \ + -DENABLE_EXCEPTIONS=OFF \ -DENABLE_GLSLANG_BINARIES=ON \ -DENABLE_GLSLANG_JS=OFF \ -DENABLE_HLSL=OFF \ - -DENABLE_RTTI=OFF \ -DENABLE_OPT=ON \ -DENABLE_PCH=ON \ - -DENABLE_CTEST=OFF + -DENABLE_RTTI=OFF \ + -DENABLE_SPVREMAPPER=ON \ + -DSKIP_GLSLANG_INSTALL=OFF \ + -DUSE_CCACHE=OFF # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-glslang.make b/rules/host-glslang.make index 2aaf3909a..1718562d1 100644 --- a/rules/host-glslang.make +++ b/rules/host-glslang.make @@ -19,17 +19,19 @@ HOST_GLSLANG_CONF_TOOL := cmake HOST_GLSLANG_CONF_OPT := \ $(HOST_CMAKE_OPT) \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DBUILD_SHARED_LIBS=OFF \ -DBUILD_EXTERNAL=OFF \ - -DSKIP_GLSLANG_INSTALL=OFF \ - -DENABLE_SPVREMAPPER=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CTEST=OFF \ + -DENABLE_EXCEPTIONS=OFF \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DENABLE_GLSLANG_BINARIES=ON \ -DENABLE_GLSLANG_JS=OFF \ -DENABLE_HLSL=OFF \ - -DENABLE_RTTI=OFF \ -DENABLE_OPT=ON \ -DENABLE_PCH=ON \ - -DENABLE_CTEST=OFF + -DENABLE_RTTI=OFF \ + -DENABLE_SPVREMAPPER=ON \ + -DSKIP_GLSLANG_INSTALL=OFF \ + -DUSE_CCACHE=OFF # vim: syntax=make |