From 4a21b791b9c3e5b8a9c20a193e42651e11b12fac Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
Date: Sat, 12 Oct 2019 10:07:41 -0700
Subject: [PATCH] xserver-xorg: add patch to remove libgl version check

In anticipation of updating libglvnd to 1.2.0.

Upstream discussion:
https://gitlab.freedesktop.org/xorg/xserver/issues/893

Signed-off-by: Matt Madison <matt@madison.systems>
---
 .../0001-Remove-version-check-for-gl.patch    | 32 +++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.20%.bbappend  |  6 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/0001-Remove-version-check-for-gl.patch

diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-Remove-version-check-for-gl.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-Remove-version-check-for-gl.patch
new file mode 100644
index 00000000..4c9211d3
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-Remove-version-check-for-gl.patch
@@ -0,0 +1,32 @@
+From d9732794d02258b0b71a0b1473da1c79694da628 Mon Sep 17 00:00:00 2001
+From: Matt Madison <matt@madison.systems>
+Date: Sat, 5 Oct 2019 09:05:15 -0700
+Subject: [PATCH] Remove version check for gl
+
+See https://gitlab.freedesktop.org/xorg/xserver/issues/893
+and https://gitlab.freedesktop.org/xorg/xserver/merge_requests/292
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xorg-server-1.20.5/configure.ac
+===================================================================
+--- xorg-server-1.20.5.orig/configure.ac
++++ xorg-server-1.20.5/configure.ac
+@@ -765,7 +765,7 @@ LIBDRI="dri >= 7.8.0"
+ LIBDRM="libdrm >= 2.4.89"
+ LIBEGL="egl"
+ LIBGBM="gbm >= 10.2.0"
+-LIBGL="gl >= 7.1.0"
++LIBGL="gl"
+ LIBXEXT="xext >= 1.0.99.4"
+ LIBXFONT="xfont2 >= 2.0.0"
+ LIBXI="xi >= 1.2.99.1"
+@@ -1116,7 +1116,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ 	yes,yes | auto,yes)
+ 		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+ 		DRI2=yes
+-		LIBGL="gl >= 9.2.0"
+ 		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+ 		;;
+ esac
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
index bbe6b8c9..2e1fa780 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
@@ -1,5 +1,7 @@
-OPENGL_PKGCONFIGS_remove_tegra = "dri"
-OPENGL_PKGCONFIGS_remove_tegra = "dri3"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Remove-version-check-for-gl.patch"
+
 OPENGL_PKGCONFIGS_remove_tegra = "glamor"
 PACKAGECONFIG_remove_tegra = "dri2"
 PACKAGECONFIG_append_tegra = " xinerama"