diff --git a/mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch b/mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch
index d14aa2b202..7451b70f54 100644
--- a/mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch
+++ b/mingw-w64-glsl-optimizer/0001-GYP-Add-missing-files.patch
@@ -21,9 +21,9 @@ index 37ae920..980683a 100644
          'glsl/opt_array_splitting.cpp',
          'glsl/opt_constant_folding.cpp',
 @@ -136,8 +136,9 @@
+         'glsl/opt_swizzle_swizzle.cpp',
          'glsl/opt_tree_grafting.cpp',
          'glsl/opt_vectorize.cpp',
-         'glsl/opt_vector_splitting.cpp',
 -        'glsl/opt_flip_matrices.cpp',
 -        'glsl/opt_dead_builtin_varyings.cpp',
 +        'glsl/opt_minmax.cpp',
diff --git a/mingw-w64-glsl-optimizer/0005-main.cpp-Remove-duplicate-_mesa_error_no_memory-func.patch b/mingw-w64-glsl-optimizer/0005-main.cpp-Remove-duplicate-_mesa_error_no_memory-func.patch
deleted file mode 100644
index 924735211a..0000000000
--- a/mingw-w64-glsl-optimizer/0005-main.cpp-Remove-duplicate-_mesa_error_no_memory-func.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From dd9859f0976b3e447509ed664cb5261d77d063b9 Mon Sep 17 00:00:00 2001
-From: Ray Donnelly <mingw.android@gmail.com>
-Date: Wed, 22 Jul 2015 08:56:14 +0100
-Subject: [PATCH 5/6] main.cpp: Remove duplicate _mesa_error_no_memory function
-
-The stub implementation in src/glsl/standalone_scaffolding.cpp
-was replaced by the implementation in src/glsl/main.cpp.
----
- src/glsl/main.cpp                   | 6 ------
- src/glsl/standalone_scaffolding.cpp | 2 ++
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
-index feed100..97fcee1 100644
---- a/src/glsl/main.cpp
-+++ b/src/glsl/main.cpp
-@@ -40,12 +40,6 @@
- 
- static int glsl_version = 330;
- 
--extern "C" void
--_mesa_error_no_memory(const char *caller)
--{
--   fprintf(stderr, "Mesa error: out of memory in %s", caller);
--}
--
- static void
- initialize_context(struct gl_context *ctx, gl_api api)
- {
-diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp
-index b338e92..16d4b47 100644
---- a/src/glsl/standalone_scaffolding.cpp
-+++ b/src/glsl/standalone_scaffolding.cpp
-@@ -32,6 +32,7 @@
- #include <assert.h>
- #include <string.h>
- #include <limits.h>
-+#include <stdio.h>
- #include "util/ralloc.h"
- 
- 
-@@ -52,6 +53,7 @@ _mesa_shader_debug(struct gl_context *, GLenum, GLuint *id,
- extern "C" void
- _mesa_error_no_memory(const char *caller)
- {
-+    fprintf(stderr, "Mesa error: out of memory in %s", caller);
- }
- 
- 
--- 
-2.4.5
-
diff --git a/mingw-w64-glsl-optimizer/PKGBUILD b/mingw-w64-glsl-optimizer/PKGBUILD
index ebc4c92fa6..6e603541b0 100644
--- a/mingw-w64-glsl-optimizer/PKGBUILD
+++ b/mingw-w64-glsl-optimizer/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=glsl-optimizer
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=r66854.14946bd
+pkgver=r66905.5cee0ef05b
 pkgrel=1
 pkgdesc="C++ library that takes GLSL shaders, does some GPU-independent optimizations on them and outputs GLSL back (mingw-w64)"
 arch=('any')
@@ -19,14 +19,12 @@ source=("${_realname}"::"git+https://github.com/aras-p/glsl-optimizer.git"
         0002-tests-MinGW-w64-Fix-build.patch
         0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
         0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
-        0005-main.cpp-Remove-duplicate-_mesa_error_no_memory-func.patch
         0006-CMake-Handle-installation.patch)
 sha256sums=('SKIP'
-            '8c750c062533581633aa63733eadd4332c3d523baf1f5aa2a239e17e79bfdec1'
+            '8331534f67e58ae53dd7b237f23723dd5c341c7d94ab625b61fa9fe371d28f63'
             '8e98f9c630b2d54c1d9c85bee27f4e9eb7b5b233849272dacec94d5bce1b005d'
             '867fad6f9000bfa6cb70bab4a9bf2d533da1e3dbd87c2fddad5c9cd18222ce29'
             'cf1e2ed63f6c77b08d834e3315972ba1fe19b5be5503bfba53fb153d5a4f8362'
-            'ef1fe885371cecc5adfe5f3e9264d3ff658b2a4c486ddfb7d16ada8f25b41ffe'
             '9c35c74f3a4d5124b78b2fea94087d2d443529f5d0e65f164cc96255b2d2fa82')
 
 pkgver() {
@@ -36,12 +34,11 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}"/${_realname}
-  git am "${srcdir}"/0001-GYP-Add-missing-files.patch
-  git am "${srcdir}"/0002-tests-MinGW-w64-Fix-build.patch
-  git am "${srcdir}"/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
-  git am "${srcdir}"/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
-  git am "${srcdir}"/0005-main.cpp-Remove-duplicate-_mesa_error_no_memory-func.patch
-  git am "${srcdir}"/0006-CMake-Handle-installation.patch
+  git am --committer-date-is-author-date "${srcdir}"/0001-GYP-Add-missing-files.patch
+  git am --committer-date-is-author-date "${srcdir}"/0002-tests-MinGW-w64-Fix-build.patch
+  git am --committer-date-is-author-date "${srcdir}"/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
+  git am --committer-date-is-author-date "${srcdir}"/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
+  git am --committer-date-is-author-date "${srcdir}"/0006-CMake-Handle-installation.patch
 }
 
 build() {