From: Matt Turner <mattst88@gentoo.org>
Date: Wed, 25 Sep 2019 21:50:06 +0000 (-0700)
Subject: x11-base/xorg-server: Allow building against libglvnd
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5a6deca6e403ca195b255bf78d41a5da4819d617;p=gentoo.git

x11-base/xorg-server: Allow building against libglvnd

Mesa's gl.pc contains a version that matches the Mesa version, but
libglvnd's gl.pc version is the SO version (1.2). The Xserver checks for
gl >= 7.1.0 and gl >= 9.2.0 which are very old versions of Mesa at this
point, so removing the version dependency doesn't negatively affect
anything and allows the Xserver to build against libglvnd.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
index d6883094f9fd..6eb2ab411f88 100644
--- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -186,6 +186,12 @@ pkg_setup() {
 	)
 }
 
+src_prepare() {
+	sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+	default
+	eautoreconf
+}
+
 src_install() {
 	xorg-3_src_install
 
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index c45093888f55..495a9b9e9a79 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -181,6 +181,12 @@ pkg_setup() {
 	)
 }
 
+src_prepare() {
+	sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+	default
+	eautoreconf
+}
+
 src_install() {
 	xorg-3_src_install