$ git diff --patch-with-stat --summary b5e9df92a1ef470f69ffe02fe8660b1cf05edd48..98a63c64298ae648d57558fc5af8ebae9e99986d

 ...ude-install-GL-headers-when-GL-is-enabled.patch |  28 +++++
 ...figure-option-to-disable-glesv1-or-glesv2.patch | 122 +++++++++++++++++++++
 ...ronos.patch => 0002-egl-Sync-with-Khronos.patch |  24 +++-
 ...atch => 0003-Update-GL-gl.h-to-match-Mesa.patch |   4 +-
 0004-Provide-an-empty-GLES3-gl3ext.h-header.patch  |  46 ++++++++
 libglvnd.spec                                      |  10 +-
 6 files changed, 227 insertions(+), 7 deletions(-)
 create mode 100644 0000-include-install-GL-headers-when-GL-is-enabled.patch
 create mode 100644 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
 rename egl-sync-with-khronos.patch => 0002-egl-Sync-with-Khronos.patch (73%)
 rename update-gl-h-to-match-mesa.patch => 0003-Update-GL-gl.h-to-match-Mesa.patch (99%)
 create mode 100644 0004-Provide-an-empty-GLES3-gl3ext.h-header.patch

diff --git a/0000-include-install-GL-headers-when-GL-is-enabled.patch b/0000-include-install-GL-headers-when-GL-is-enabled.patch
new file mode 100644
index 0000000..eae2733
--- /dev/null
+++ b/0000-include-install-GL-headers-when-GL-is-enabled.patch
@@ -0,0 +1,28 @@
+From 6f52473dac08c44b081b792874b4ce73122096da Mon Sep 17 00:00:00 2001
+From: Eric Engestrom <eric@engestrom.ch>
+Date: Mon, 30 Sep 2019 16:06:42 +0100
+Subject: [PATCH 0/4] include: install GL headers when GL is enabled
+
+A typo made it depend on EGL instead.
+
+Fixes: ab9b5fcc3bf90064418f ("Install the GL/GLES/GLX/EGL header files.")
+---
+ include/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 1e33d2d..3d81d17 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -39,7 +39,7 @@ EGL_HEADER_FILES = \
+ 	EGL/eglext.h \
+ 	EGL/eglplatform.h
+ 
+-if ENABLE_EGL_HEADERS
++if ENABLE_GL_HEADERS
+ nobase_include_HEADERS += $(GL_HEADER_FILES)
+ else
+ noinst_HEADERS += $(GL_HEADER_FILES)
+-- 
+2.24.0
+
diff --git a/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch b/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
new file mode 100644
index 0000000..68c2b20
--- /dev/null
+++ b/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
@@ -0,0 +1,122 @@
+From 3a1fb32c3b2ba0bc28952759c33dc98bb5260125 Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym@gmail.com>
+Date: Tue, 8 Oct 2019 16:34:16 +0000
+Subject: [PATCH 1/4] Add a configure option to disable glesv1 or glesv2
+
+Because mesa can be built without glesv1 so it breaks autodetection.
+
+Fixes: https://bugs.archlinux.org/task/64032 ('mesa-demos doesn't build, unable to find GLES/gl.h')
+---
+ configure.ac        | 23 +++++++++++++++--------
+ include/Makefile.am | 24 ++++++++++++++++++------
+ src/Makefile.am     |  4 +++-
+ 3 files changed, 36 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index faa0379..eb68d3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,13 +70,19 @@ if test "x$enable_x11" != "xyes" -a "x$enable_glx" = "xyes" ; then
+     AC_MSG_ERROR([Can't build GLX without X11.])
+ fi
+ 
+-AC_ARG_ENABLE([gles],
+-    [AS_HELP_STRING([--disable-gles],
+-        [Do not build the libGLES*.so libraries @<:@default=enabled@:>@])],
+-    [enable_gles="$enableval"],
+-    [enable_gles=yes]
+-)
+-AM_CONDITIONAL([ENABLE_GLES], [test "x$enable_gles" = "xyes"])
++AC_ARG_ENABLE([gles1],
++    [AS_HELP_STRING([--disable-gles1],
++        [disable support for OpenGL ES 1.x API @<:@default=enabled@:>@])],
++    [enable_gles1="$enableval"],
++    [enable_gles1=yes])
++AM_CONDITIONAL([ENABLE_GLES1], [test "x$enable_gles1" = "xyes"])
++
++AC_ARG_ENABLE([gles2],
++    [AS_HELP_STRING([--disable-gles2],
++        [disable support for OpenGL ES 2.x and 3.x API @<:@default=enabled@:>@])],
++    [enable_gles2="$enableval"],
++    [enable_gles2=yes])
++AM_CONDITIONAL([ENABLE_GLES2], [test "x$enable_gles2" = "xyes"])
+ 
+ AC_ARG_ENABLE([headers],
+     [AS_HELP_STRING([--disable-headers],
+@@ -87,7 +93,8 @@ AC_ARG_ENABLE([headers],
+ AM_CONDITIONAL([ENABLE_GL_HEADERS], [test "x$enable_headers" = "xyes"])
+ AM_CONDITIONAL([ENABLE_EGL_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_egl" = "xyes"])
+ AM_CONDITIONAL([ENABLE_GLX_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_glx" = "xyes"])
+-AM_CONDITIONAL([ENABLE_GLES_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles" = "xyes"])
++AM_CONDITIONAL([ENABLE_GLES1_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles1" = "xyes"])
++AM_CONDITIONAL([ENABLE_GLES2_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles2" = "xyes"])
+ 
+ dnl
+ dnl Arch/platform-specific settings. Copied from mesa
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 3d81d17..0c41dc7 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -17,14 +17,18 @@ GL_HEADER_FILES = \
+ 	GL/glext.h \
+ 	KHR/khrplatform.h
+ 
+-GLES_HEADER_FILES = \
++GLES1_HEADER_FILES = \
+ 	GLES/egl.h \
+ 	GLES/gl.h \
+ 	GLES/glext.h \
+-	GLES/glplatform.h \
++	GLES/glplatform.h
++
++GLES2_HEADER_FILES = \
+ 	GLES2/gl2ext.h \
+ 	GLES2/gl2.h \
+-	GLES2/gl2platform.h \
++	GLES2/gl2platform.h
++
++GLES3_HEADER_FILES = \
+ 	GLES3/gl31.h \
+ 	GLES3/gl32.h \
+ 	GLES3/gl3.h \
+@@ -45,10 +49,18 @@ else
+ noinst_HEADERS += $(GL_HEADER_FILES)
+ endif
+ 
+-if ENABLE_GLES_HEADERS
+-nobase_include_HEADERS += $(GLES_HEADER_FILES)
++if ENABLE_GLES1_HEADERS
++nobase_include_HEADERS += $(GLES1_HEADER_FILES)
++else
++noinst_HEADERS += $(GLES1_HEADER_FILES)
++endif
++
++if ENABLE_GLES2_HEADERS
++nobase_include_HEADERS += $(GLES2_HEADER_FILES)
++nobase_include_HEADERS += $(GLES3_HEADER_FILES)
+ else
+-noinst_HEADERS += $(GLES_HEADER_FILES)
++noinst_HEADERS += $(GLES2_HEADER_FILES)
++noinst_HEADERS += $(GLES3_HEADER_FILES)
+ endif
+ 
+ if ENABLE_GLX_HEADERS
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5f7ce79..821346f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,8 +12,10 @@ SUBDIRS += GLX
+ SUBDIRS += GL
+ endif
+ 
+-if ENABLE_GLES
++if ENABLE_GLES1
+ SUBDIRS += GLESv1
++endif
++if ENABLE_GLES2
+ SUBDIRS += GLESv2
+ endif
+ 
+-- 
+2.24.0
+
diff --git a/egl-sync-with-khronos.patch b/0002-egl-Sync-with-Khronos.patch
similarity index 73%
rename from egl-sync-with-khronos.patch
rename to 0002-egl-Sync-with-Khronos.patch
index 9f048e4..a7ef93e 100644
--- a/egl-sync-with-khronos.patch
+++ b/0002-egl-Sync-with-Khronos.patch
@@ -1,5 +1,22 @@
+From 51233cc52cbcbe25f8461830913c06f5b5bc9508 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 17 Oct 2019 11:51:37 -0400
+Subject: [PATCH 2/4] egl: Sync with Khronos
+
+    commit de3a5e867d906a04a5c37ee0d89e7f01d3598eb9
+    Author: Ken Russell <kbrussel@alum.mit.edu>
+    Date:   Sat Oct 12 05:44:43 2019 -0700
+
+        Reserve enums 0x34A0..0x34AF for ANGLE project. (#93)
+
+Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/193
+---
+ include/EGL/eglplatform.h | 6 ++++++
+ src/generate/xml/egl.xml  | 7 +++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
 diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-index 29ab288b57eb6ccce0476f0e76c8b4da94225091..5ab49c1d4ea4564cc5d94a2a7ffa842ac6b3eeb1 100644
+index 29ab288..5ab49c1 100644
 --- a/include/EGL/eglplatform.h
 +++ b/include/EGL/eglplatform.h
 @@ -116,6 +116,12 @@ typedef intptr_t EGLNativeDisplayType;
@@ -16,7 +33,7 @@ index 29ab288b57eb6ccce0476f0e76c8b4da94225091..5ab49c1d4ea4564cc5d94a2a7ffa842a
  
  /* X11 (tentative)  */
 diff --git a/src/generate/xml/egl.xml b/src/generate/xml/egl.xml
-index c27f1726b677f311d792a136e86c5e01ae467e5f..6bc2ea2886aaf628d9741a7de2629bd8e38f37c8 100644
+index c27f172..6bc2ea2 100644
 --- a/src/generate/xml/egl.xml
 +++ b/src/generate/xml/egl.xml
 @@ -1002,6 +1002,9 @@
@@ -40,3 +57,6 @@ index c27f1726b677f311d792a136e86c5e01ae467e5f..6bc2ea2886aaf628d9741a7de2629bd8
      </enums>
  
      <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
+-- 
+2.24.0
+
diff --git a/update-gl-h-to-match-mesa.patch b/0003-Update-GL-gl.h-to-match-Mesa.patch
similarity index 99%
rename from update-gl-h-to-match-mesa.patch
rename to 0003-Update-GL-gl.h-to-match-Mesa.patch
index 9e1f26a..87ac86b 100644
--- a/update-gl-h-to-match-mesa.patch
+++ b/0003-Update-GL-gl.h-to-match-Mesa.patch
@@ -1,7 +1,7 @@
 From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001
 From: Kyle Brenneman <kbrenneman@nvidia.com>
 Date: Tue, 22 Oct 2019 16:46:09 -0600
-Subject: [PATCH] Update GL/gl.h to match Mesa.
+Subject: [PATCH 3/4] Update GL/gl.h to match Mesa.
 
 Updated GL/gl.h to match the copy from Mesa at commit
 a0829cf23b307ca44ab8c4505974fb7c8d71a35a.
@@ -241,5 +241,5 @@ index 3f8cb62..2518dfb 100644
  
  #ifdef __cplusplus
 -- 
-2.22.0
+2.24.0
 
diff --git a/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch b/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
new file mode 100644
index 0000000..2b6ea45
--- /dev/null
+++ b/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
@@ -0,0 +1,46 @@
+From f4668353266a33e71ab7cdbb99595edbaff03ace Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 6 Nov 2019 11:13:56 -0800
+Subject: [PATCH 4/4] Provide an empty GLES3/gl3ext.h header
+
+The one in Mesa is empty but appears to come from some Khronos
+repository, but gl3ext.h has never existed in the OpenGL-Registry
+repository on github. Provide it for backwards compatibility.
+
+Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/195
+---
+ include/GLES3/gl3ext.h | 9 +++++++++
+ include/Makefile.am    | 1 +
+ 2 files changed, 10 insertions(+)
+ create mode 100644 include/GLES3/gl3ext.h
+
+diff --git a/include/GLES3/gl3ext.h b/include/GLES3/gl3ext.h
+new file mode 100644
+index 0000000..484ea17
+--- /dev/null
++++ b/include/GLES3/gl3ext.h
+@@ -0,0 +1,9 @@
++#ifndef __gl3ext_h_
++#define __gl3ext_h_
++
++/* 
++ * This file is intentionally empty and is provided for source compatibility
++ * with Mesa.
++ */
++
++#endif /* __gl3ext_h_ */
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 0c41dc7..c821de1 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -31,6 +31,7 @@ GLES2_HEADER_FILES = \
+ GLES3_HEADER_FILES = \
+ 	GLES3/gl31.h \
+ 	GLES3/gl32.h \
++	GLES3/gl3ext.h \
+ 	GLES3/gl3.h \
+ 	GLES3/gl3platform.h
+ 
+-- 
+2.24.0
+
diff --git a/libglvnd.spec b/libglvnd.spec
index 070216c..6f289c9 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -24,13 +24,17 @@
 Summary:	The GL Vendor-Neutral Dispatch library
 Name:		libglvnd
 Version:	1.2.0
-Release:	4
+Release:	5
 License:	MIT
 Group:		System/Libraries
 Url:		https://github.com/NVIDIA/libglvnd
 Source0:	https://github.com/NVIDIA/libglvnd/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Patch0:		update-gl-h-to-match-mesa.patch
-Patch1:		egl-sync-with-khronos.patch
+# (tpg) patches from upstream git
+Patch0:		0000-include-install-GL-headers-when-GL-is-enabled.patch
+Patch1:		0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
+Patch2:		0002-egl-Sync-with-Khronos.patch
+Patch3:		0003-Update-GL-gl.h-to-match-Mesa.patch
+Patch4:		0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
 BuildRequires:	python-libxml2
 BuildRequires:	pkgconfig(glproto)
 BuildRequires:	pkgconfig(x11)