From 9592e2cea2436c801cc678e24c7aa0be71324a19 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 25 Feb 2023 15:02:30 +0100 Subject: [PATCH] glslang: rebuild for vulkan updates, do not use precompiled headers --- glslang/.signature | 4 ++-- glslang/Pkgfile | 3 ++- .../glslang-11.13.0-cmake_include_dirs.patch | 24 ------------------- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 glslang/glslang-11.13.0-cmake_include_dirs.patch diff --git a/glslang/.signature b/glslang/.signature index fab31e41d..0c5f8c3d5 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bC+07yGMXMvUpWaVH+FfWE2sgApIlKynhomhqcBKtaZLjZnWkudnpuLllYsbFjIvvnTIyZybqqWHIY0FJosMA8= -SHA256 (Pkgfile) = afde953b8c13af62575d9fca68bec43e4a8383567bc0944eaf8d8feb72f8abde +RWSE3ohX2g5d/XnpD6pxBruwMYt2+b0hDwPgsmVDmKxWCXkmskdSotyoMkwTnE81C21u6Ltaxa7ILw0u1BHyOQGx1r8lX8Di9gs= +SHA256 (Pkgfile) = a3fde557ae11db435aaa553918c2a9572707bb7830deb790f813b5fa7f5f409d SHA256 (.footprint) = e2176f9a9b59930496fa28f3ddc18f31f531655b35024b98ac4637effc8045d8 SHA256 (glslang-sdk-12.0.0.tar.gz) = 7cb45842ec1d4b6ea775d624c3d2d8ba9450aa416b0482b0cc7e4fdd399c3d75 SHA256 (0001-pkg-config-compatibility.patch) = 23e3ffa56bf9f710a5a4ba496eb7413ca06c5e5d25b666b1b0269983a6bf8e03 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 37aeba782..b3830fd8e 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -5,7 +5,7 @@ name=glslang version=12.0.0 -release=1 +release=2 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-sdk-$version.tar.gz 0001-pkg-config-compatibility.patch) @@ -19,6 +19,7 @@ build() { -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=yes + -D ENABLE_PCH=OFF -Wno-dev" cmake -B build-static $config $PKGMK_GLSLANG \ diff --git a/glslang/glslang-11.13.0-cmake_include_dirs.patch b/glslang/glslang-11.13.0-cmake_include_dirs.patch deleted file mode 100644 index f9bf8fb95..000000000 --- a/glslang/glslang-11.13.0-cmake_include_dirs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt ---- a/SPIRV/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 -+++ b/SPIRV/CMakeLists.txt 2022-12-16 12:15:03.231070779 +0100 -@@ -100,7 +100,7 @@ - target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC - $ -- $) -+ ) - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif() -diff -ruN a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt ---- a/StandAlone/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 -+++ b/StandAlone/CMakeLists.txt 2022-12-16 12:15:20.527812776 +0100 -@@ -83,7 +83,7 @@ - target_link_libraries(glslangValidator ${LIBRARIES}) - target_include_directories(glslangValidator PUBLIC - $ -- $) -+) - - if(ENABLE_OPT) - target_include_directories(glslangValidator