diff --git a/mingw-w64-glbinding/PKGBUILD b/mingw-w64-glbinding/PKGBUILD
index 14d4b19b5f..a7ae508e59 100644
--- a/mingw-w64-glbinding/PKGBUILD
+++ b/mingw-w64-glbinding/PKGBUILD
@@ -5,14 +5,15 @@ pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 conflicts=("${MINGW_PACKAGE_PREFIX}-angleproject")
 pkgver=3.1.0
-pkgrel=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://github.com/cginternals/glbinding'
 pkgdesc="A C++ binding for the OpenGL API, generated using the gl.xml specification (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
              # "${MINGW_PACKAGE_PREFIX}-doxygen"
 license=('MIT')
 options=('strip' 'staticlibs' 'docs')
@@ -38,16 +39,14 @@ build() {
     BUILD_TYPE="Debug"
   fi
 
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_C_COMPILER=${MINGW_CHOST}-gcc \
-    -DCMAKE_CXX_COMPILER=${MINGW_CHOST}-g++ \
     -DOPTION_BUILD_EXAMPLES=OFF \
     -DOPTION_BUILD_TOOLS=OFF \
     -DOPTION_BUILD_TESTS=OFF \
@@ -55,15 +54,16 @@ build() {
     -DOPTION_BUILD_DOCS=OFF \
     -DSYSTEM_DIR_INSTALL=ON \
     ../${_realname}-${pkgver}
-  make
+
+  cmake --build .
 }
 
 package () {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR=${pkgdir} cmake --install .
+
+  # Remove KHR include, fixes conflict with mingw-w64
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/include/KHR
 
-  # Remove KHR include, fixes conflict with angleproject
-  #rm -rf "${pkgdir}${MINGW_PREFIX}"/include/KHR
-  
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
diff --git a/mingw-w64-libgdiplus/PKGBUILD b/mingw-w64-libgdiplus/PKGBUILD
index d9892f7e94..615a1213a4 100644
--- a/mingw-w64-libgdiplus/PKGBUILD
+++ b/mingw-w64-libgdiplus/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libgdiplus
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source Implementation of the GDI+ API (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -49,7 +49,7 @@ build() {
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
-    --enable-static \
+    --disable-static \
     --enable-shared \
     --without-x11
 
diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD
index 513c6c59f7..7206d35bab 100644
--- a/mingw-w64-mesa/PKGBUILD
+++ b/mingw-w64-mesa/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mesa
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=21.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -180,4 +180,7 @@ package() {
     sed -e "s|./vulkan_radeon|${MINGW_PREFIX}/bin/libvulkan_radeon|g" \
       -i $(find ${pkgdir}${MINGW_PREFIX}/share/vulkan/icd.d -name "radeon_icd*.json" -print)
   fi
+
+  # Remove KHR include, fixes conflict with mingw-w64
+  rm -rf "${pkgdir}${MINGW_PREFIX}"/include/KHR
 }
diff --git a/mingw-w64-pupnp/PKGBUILD b/mingw-w64-pupnp/PKGBUILD
index 485a082878..30af237d27 100644
--- a/mingw-w64-pupnp/PKGBUILD
+++ b/mingw-w64-pupnp/PKGBUILD
@@ -5,7 +5,7 @@ _realname=pupnp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.14.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable SDK for UPnP* Devices (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -48,6 +48,7 @@ build() {
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DSTATIC_POSTFIX="-static" \
     -Dclient=ON \
     -Ddevice=ON \
     -Dwebserver=ON \
diff --git a/mingw-w64-unixodbc/PKGBUILD b/mingw-w64-unixodbc/PKGBUILD
index 9b9c2b6d4d..154a9f701f 100644
--- a/mingw-w64-unixodbc/PKGBUILD
+++ b/mingw-w64-unixodbc/PKGBUILD
@@ -4,7 +4,7 @@ _realname=unixodbc
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.3.9
-pkgrel=3
+pkgrel=4
 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -25,11 +25,12 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
+    --includedir=${MINGW_PREFIX}/include/${_realname} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
@@ -40,6 +41,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }