From 5a6deca6e403ca195b255bf78d41a5da4819d617 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 25 Sep 2019 14:50:06 -0700 Subject: [PATCH] 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 --- 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 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 -- 2.26.2