From b07ea387d51b26160807ab100f6fb929cd05a0b5 Mon Sep 17 00:00:00 2001 From: Rodrigo Hernandez Cordoba Date: Fri, 26 Sep 2025 13:04:07 -0600 Subject: [PATCH] glslang: Update to 16.0.0 (#25715) closes #25598 --- mingw-w64-glslang/003-standalone-no-import.patch | 12 ------------ mingw-w64-glslang/PKGBUILD | 12 ++++-------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 mingw-w64-glslang/003-standalone-no-import.patch diff --git a/mingw-w64-glslang/003-standalone-no-import.patch b/mingw-w64-glslang/003-standalone-no-import.patch deleted file mode 100644 index 05437e9fec..0000000000 --- a/mingw-w64-glslang/003-standalone-no-import.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- glslang-15.3.0/StandAlone/CMakeLists.txt.orig 2025-05-10 14:11:32.843423700 +0200 -+++ glslang-15.3.0/StandAlone/CMakeLists.txt 2025-05-10 14:11:48.267679900 +0200 -@@ -53,6 +53,9 @@ - elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NOT MSVC) - target_compile_options(glslang-standalone PRIVATE -Wshorten-64-to-32) - endif() -+if(WIN32) -+ target_compile_definitions(glslang-standalone PRIVATE "GLSLANG_EXPORTING=1") -+endif() - set_property(TARGET glslang-standalone PROPERTY FOLDER tools) - set_property(TARGET glslang-standalone PROPERTY OUTPUT_NAME glslang) - glslang_set_link_args(glslang-standalone) diff --git a/mingw-w64-glslang/PKGBUILD b/mingw-w64-glslang/PKGBUILD index 333f6f5220..2172c98f59 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=15.3.0 +pkgver=16.0.0 pkgrel=1 pkgdesc='An OpenGL and OpenGL ES shader front end and validator (mingw-w64)' arch=('any') @@ -21,18 +21,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python") source=(https://github.com/KhronosGroup/glslang/archive/${pkgver}/${_realname}-${pkgver}.tar.gz - 002-remove-deprecated-mingw-secure-api.patch - 003-standalone-no-import.patch) -sha256sums=('c6c21fe1873c37e639a6a9ac72d857ab63a5be6893a589f34e09a6c757174201' - 'c0a1b75449fa7ab6448b38b3d55bff1c150c2083894063cb95ad5b165bf79fe0' - '934933c5c6ae107b6b78ffe94167579ec26342ba0ef24680c8fa19ff41e9fa16') + 002-remove-deprecated-mingw-secure-api.patch) +sha256sums=('172385478520335147d3b03a1587424af0935398184095f24beab128a254ecc7' + 'c0a1b75449fa7ab6448b38b3d55bff1c150c2083894063cb95ad5b165bf79fe0') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/002-remove-deprecated-mingw-secure-api.patch" - # Not quite sure if this is correct: - patch -Np1 -i "${srcdir}/003-standalone-no-import.patch" } build() {