From fa6401cd6328f24931482e4d7cbf4dfd01017014 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 25 Dec 2025 12:26:01 +0100
Subject: [PATCH] glsl-optimizer: remove -git suffix (#27026)

and fix the build
---
 .../0002-tests-MinGW-w64-Fix-build.patch             |  0
 ...3-Win64-long-is-32-bit-use-intptr_t-instead.patch |  0
 ...GW-w64-Use-find_package-OpenGL-in-CMakeList.patch |  0
 .../0006-CMake-Handle-installation.patch             |  0
 .../PKGBUILD                                         | 12 ++++++++----
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename {mingw-w64-glsl-optimizer-git => mingw-w64-glsl-optimizer}/0002-tests-MinGW-w64-Fix-build.patch (100%)
 rename {mingw-w64-glsl-optimizer-git => mingw-w64-glsl-optimizer}/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch (100%)
 rename {mingw-w64-glsl-optimizer-git => mingw-w64-glsl-optimizer}/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch (100%)
 rename {mingw-w64-glsl-optimizer-git => mingw-w64-glsl-optimizer}/0006-CMake-Handle-installation.patch (100%)
 rename {mingw-w64-glsl-optimizer-git => mingw-w64-glsl-optimizer}/PKGBUILD (87%)

diff --git a/mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch b/mingw-w64-glsl-optimizer/0002-tests-MinGW-w64-Fix-build.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch
rename to mingw-w64-glsl-optimizer/0002-tests-MinGW-w64-Fix-build.patch
diff --git a/mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch b/mingw-w64-glsl-optimizer/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
rename to mingw-w64-glsl-optimizer/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
diff --git a/mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch b/mingw-w64-glsl-optimizer/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
rename to mingw-w64-glsl-optimizer/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
diff --git a/mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch b/mingw-w64-glsl-optimizer/0006-CMake-Handle-installation.patch
similarity index 100%
rename from mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch
rename to mingw-w64-glsl-optimizer/0006-CMake-Handle-installation.patch
diff --git a/mingw-w64-glsl-optimizer-git/PKGBUILD b/mingw-w64-glsl-optimizer/PKGBUILD
similarity index 87%
rename from mingw-w64-glsl-optimizer-git/PKGBUILD
rename to mingw-w64-glsl-optimizer/PKGBUILD
index 51214c8cb6..dcd27e4ad5 100644
--- a/mingw-w64-glsl-optimizer-git/PKGBUILD
+++ b/mingw-w64-glsl-optimizer/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=glsl-optimizer
-pkgbase=mingw-w64-${_realname}-git
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=r66913.d78c3d2f24
 _commit=d78c3d2f249aa870368ad320905bc954c47704f6
 pkgrel=1
@@ -18,8 +18,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "git")
-provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-git=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
+replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 options=('!strip' '!emptydirs')
 source=("${_realname}"::"git+https://github.com/aras-p/glsl-optimizer.git#commit=$_commit"
         0002-tests-MinGW-w64-Fix-build.patch
@@ -48,9 +49,12 @@ prepare() {
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  CXXFLAGS+=" -std=gnu++11"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ../${_realname}