glslang: Update to 6.2.2596

This commit is contained in:
Alexey Pavlov
2018-05-16 13:21:32 +03:00
parent 9871d230ca
commit 03ba49ed89
2 changed files with 16 additions and 16 deletions

View File

@@ -2,10 +2,11 @@ diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index 2a9a3c47..e3d46595 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -45,3 +45,6 @@ install(TARGETS glslangValidator
@@ -45,4 +45,7 @@ install(TARGETS glslangValidator
install(TARGETS spirv-remap
RUNTIME DESTINATION bin)
install(TARGETS spirv-remap
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(TARGETS glslang-default-resource-limits
+ RUNTIME DESTINATION bin)
+ install(TARGETS glslang-default-resource-limits
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif(ENABLE_GLSLANG_INSTALL)

View File

@@ -4,22 +4,21 @@
_realname=glslang
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_gitver=714e58b
pkgver=3.0.git2.${_gitver}
pkgrel=2
pkgver=6.2.2596
pkgrel=1
pkgdesc='An OpenGL and OpenGL ES shader front end and validator (mingw-w64)'
arch=('any')
url='https://github.com/KhronosGroup/glslang'
license=('BSD')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "git")
source=("git+https://github.com/KhronosGroup/glslang.git#commit=${_gitver}"
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
source=(${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
001-install-missing-dll.patch)
sha256sums=('SKIP'
'0c456169144deef1e6ba06984e8417405d218b77cc3a8c122d9ea60f16df31b1')
sha256sums=('fce7ec22e66043fb59e4a3c369445ea8c57f2631a04b6a0015f19a7bc954567e'
'5c138ffe335fa47aba10130197dbad0bb5558163f1cf7695e1f95ba764fdb6f3')
prepare() {
cd ${srcdir}/${_realname}
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-install-missing-dll.patch
}
@@ -40,12 +39,12 @@ build() {
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DBUILD_SHARED_LIBS=ON \
"${srcdir}/${_realname}"
../${_realname}-${pkgver}
make
}
package() {
cd "${srcdir}"/build-${CARCH}
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build-${CARCH}
make DESTDIR="${pkgdir}" install
}