glslang: update to 12.2.0

This commit is contained in:
Mehdi Chinoune
2023-05-18 00:32:40 +00:00
committed by مهدي شينون (Mehdi Chinoune)
parent 365973bc33
commit c1dadc7a7d
2 changed files with 17 additions and 13 deletions

View File

@@ -1,11 +1,17 @@
--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -66,7 +66,7 @@
@@ -67,13 +67,7 @@
}
#endif
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API)
+#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
#include <basetsd.h>
#ifndef snprintf
#define snprintf sprintf_s
-#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API
- #include <basetsd.h>
- #ifndef snprintf
- #define snprintf sprintf_s
- #endif
- #define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
-#elif defined (solaris)
+#if defined (solaris)
#define safe_vsprintf(buf,max,format,args) vsnprintf((buf), (max), (format), (args))
#include <sys/int_types.h>
#define UINT_PTR uintptr_t

View File

@@ -4,7 +4,7 @@
_realname=glslang
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=12.1.0
pkgver=12.2.0
pkgrel=1
pkgdesc='An OpenGL and OpenGL ES shader front end and validator (mingw-w64)'
arch=('any')
@@ -13,14 +13,14 @@ url='https://github.com/KhronosGroup/glslang'
license=('spdx:BSD-3-Clause')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-spirv-tools")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-python")
source=(${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
002-remove-deprecated-mingw-secure-api.patch)
sha256sums=('1515e840881d1128fb6d831308433f731808f818f2103881162f3ffd47b15cd5'
'5ad147a559d97616cc04d94f2f6adcc4f768d5253c5a272c86d85a3451d548a1')
sha256sums=('870d17030fda7308c1521fb2e01a9e93cbe4b130bc8274e90d00e127432ab6f6'
'c0a1b75449fa7ab6448b38b3d55bff1c150c2083894063cb95ad5b165bf79fe0')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
@@ -37,7 +37,6 @@ build() {
fi
echo "Building static library"
[[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -52,7 +51,6 @@ build() {
${MINGW_PREFIX}/bin/cmake.exe --build ./
echo "Building shared library"
[[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \