From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CE8E138334 for ; Wed, 25 Sep 2019 22:08:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C2D6E08C8; Wed, 25 Sep 2019 22:08:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 621EFE08C8 for ; Wed, 25 Sep 2019 22:08:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6622034B5A0 for ; Wed, 25 Sep 2019 22:08:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF4F37F2 for ; Wed, 25 Sep 2019 22:08:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1569448325.5a6deca6e403ca195b255bf78d41a5da4819d617.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-1.20.5.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5a6deca6e403ca195b255bf78d41a5da4819d617 X-VCS-Branch: master Date: Wed, 25 Sep 2019 22:08:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b1283b6-7527-4c29-a793-f92ca2678e27 X-Archives-Hash: afa4ecc9c9066f8a9a585121c601e4df commit: 5a6deca6e403ca195b255bf78d41a5da4819d617 Author: Matt Turner gentoo org> AuthorDate: Wed Sep 25 21:50:06 2019 +0000 Commit: Matt Turner gentoo 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 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