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 d6883094f9fd51d5492e4a242a47370a11c29cfa..6eb2ab411f88d697259cef4642c0b519b0cf0c23 100644 (file)
--- 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 c45093888f55127bc5426b0e90334ef8d3ece349..495a9b9e9a79b0d0db22c9194284fb1d10179f58 100644 (file)
--- 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