* update glslang to 13.1.1-3

This commit is contained in:
Alexander Baldeck 2023-12-19 14:09:57 +01:00
parent 964430473c
commit 35d2aac4f6
2 changed files with 9 additions and 27 deletions

View File

@ -13,7 +13,7 @@
# spriv-tools system package and only then building glslang against that.
pkgname=glslang
pkgver=13.1.1
pkgrel=2
pkgrel=3
pkgdesc='OpenGL and OpenGL ES shader front end and validator'
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url='https://github.com/KhronosGroup/glslang'
@ -21,9 +21,15 @@ license=('BSD')
depends=('gcc-libs' 'spirv-tools')
makedepends=('cmake' 'ninja' 'spirv-headers' 'python')
options=('staticlibs')
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
sha256sums=('1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66')
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
${pkgname}-3420.patch::https://github.com/KhronosGroup/glslang/pull/3420.patch)
sha256sums=('1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66'
'8930d3829bae4e0cd911bf63728d4d49d736d261af1e2cef912b769e6fa8373f')
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 -i "${srcdir}"/${pkgname}-3420.patch
}
build() {
cd ${pkgname}-${pkgver}

View File

@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+ )
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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+)
if(ENABLE_OPT)
target_include_directories(glslangValidator