From 1b72cc84b815d68ddc87a299b397433c529cfafd Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Fri, 27 Sep 2019 14:21:37 +0200
Subject: [PATCH] xorg-server: glx: lower gl version to work with libglvnd

---
 ...wer-gl-version-to-work-with-libglvnd.patch | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 packages/x11/xserver/xorg-server/patches/xorg-server-999.01-lower-gl-version-to-work-with-libglvnd.patch

diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-999.01-lower-gl-version-to-work-with-libglvnd.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-999.01-lower-gl-version-to-work-with-libglvnd.patch
new file mode 100644
index 0000000000..f2322ee0ea
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-999.01-lower-gl-version-to-work-with-libglvnd.patch
@@ -0,0 +1,64 @@
+From c16186f700e9763ba25cb3475cab34c28b1d13a0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Tue, 24 Sep 2019 09:58:43 +0200
+Subject: [PATCH] build: glx: Lower gl version to work with libglvnd
+
+When using mesa with libglvnd support, mesa will no longer install the
+gl, glx, egl pkg-config files but instead let libglvnd provide them.
+libglvnd maintainers decided to change the versioning as it was
+mesa-specific previously. Now the libraries have versions of the API
+they expose[1].
+This causes problems when building the X server:
+
+  checking for glproto >= 1.4.17 gl >= 9.2.0... no
+  configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
+
+  Requested 'gl >= 9.2.0' but version of gl is 1.2
+
+Lower the version requirement to 1.2 to allow building against libglvnd
+provided libraries
+
+[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
+---
+ configure.ac    | 4 ++--
+ glx/meson.build | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4b71f8559..56ef410f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -763,7 +763,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 >= 1.2"
+ LIBXEXT="xext >= 1.0.99.4"
+ LIBXFONT="xfont2 >= 2.0.0"
+ LIBXI="xi >= 1.2.99.1"
+@@ -1118,7 +1118,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ 	yes,yes | auto,yes)
+ 		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+ 		DRI2=yes
+-		LIBGL="gl >= 9.2.0"
++		LIBGL="gl >= 1.2"
+ 		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+ 		;;
+ esac
+diff --git a/glx/meson.build b/glx/meson.build
+index 7f9e549f0..745814336 100644
+--- a/glx/meson.build
++++ b/glx/meson.build
+@@ -39,7 +39,7 @@ if build_glx
+             common_dep,
+             dl_dep,
+             dependency('glproto', version: '>= 1.4.17'),
+-            dependency('gl', version: '>= 9.2.0'),
++            dependency('gl', version: '>= 1.2'),
+         ],
+         c_args: [
+             glx_align64,
+-- 
+2.22.0
+