[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

[Matt Turner]

commit:     5a6deca6e403ca195b255bf78d41a5da4819d617
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 21:50:06 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 21:52:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6deca6

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 <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.5.ebuild | 6 ++++++
 x11-base/xorg-server/xorg-server-9999.ebuild   | 6 ++++++
 2 files changed, 12 insertions(+)

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 d6883094f9f..6eb2ab411f8 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 c45093888f5..495a9b9e9a7 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