From c1dadc7a7de0b95c7aa1db6da10a5fbcde95ce08 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Thu, 18 May 2023 00:32:40 +0000 Subject: [PATCH] glslang: update to 12.2.0 --- ...02-remove-deprecated-mingw-secure-api.patch | 18 ++++++++++++------ mingw-w64-glslang/PKGBUILD | 12 +++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mingw-w64-glslang/002-remove-deprecated-mingw-secure-api.patch b/mingw-w64-glslang/002-remove-deprecated-mingw-secure-api.patch index 82e1e5e1b2..c0d59a4322 100644 --- a/mingw-w64-glslang/002-remove-deprecated-mingw-secure-api.patch +++ b/mingw-w64-glslang/002-remove-deprecated-mingw-secure-api.patch @@ -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 - #ifndef snprintf - #define snprintf sprintf_s +-#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API +- #include +- #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 + #define UINT_PTR uintptr_t diff --git a/mingw-w64-glslang/PKGBUILD b/mingw-w64-glslang/PKGBUILD index e6e0b8c67a..43141af847 100644 --- a/mingw-w64-glslang/PKGBUILD +++ b/mingw-w64-glslang/PKGBUILD @@ -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=" \