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 23A02138334 for ; Wed, 25 Sep 2019 21:35:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 742BEE093A; Wed, 25 Sep 2019 21:35:51 +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 5D34EE093A for ; Wed, 25 Sep 2019 21:35:51 +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 6DAF934B59B for ; Wed, 25 Sep 2019 21:35:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 237197FB for ; Wed, 25 Sep 2019 21:35:49 +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: <1569447339.1ef1b1f83c095b4d59dc8e9c822df6dbeb40bdca.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-19.2.0.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 1ef1b1f83c095b4d59dc8e9c822df6dbeb40bdca X-VCS-Branch: master Date: Wed, 25 Sep 2019 21:35:49 +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: 2a4f7bce-fb18-49e5-a86f-ea50064bf876 X-Archives-Hash: 7730cc8d88f55d8bebace37937aefb62 commit: 1ef1b1f83c095b4d59dc8e9c822df6dbeb40bdca Author: Matt Turner gentoo org> AuthorDate: Wed Sep 25 21:27:34 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Sep 25 21:35:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef1b1f8 media-libs/mesa: Fix more libglvnd issues Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-19.2.0.ebuild | 11 ++++++++--- media-libs/mesa/mesa-9999.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild index 53a94beb608..27301deb54b 100644 --- a/media-libs/mesa/mesa-19.2.0.ebuild +++ b/media-libs/mesa/mesa-19.2.0.ebuild @@ -243,6 +243,7 @@ x86? ( usr/lib*/libGLESv2.so.2.0.0 usr/lib*/libGL.so.1.2.0 usr/lib*/libOSMesa.so.8.0.0 + libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) )" llvm_check_deps() { @@ -503,6 +504,8 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc } multilib_src_install_all() { @@ -514,9 +517,11 @@ multilib_src_test() { } pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} + if ! use libglvnd; then + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + fi } # $1 - VIDEO_CARDS flag (check skipped for "--") diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 53a94beb608..27301deb54b 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -243,6 +243,7 @@ x86? ( usr/lib*/libGLESv2.so.2.0.0 usr/lib*/libGL.so.1.2.0 usr/lib*/libOSMesa.so.8.0.0 + libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) )" llvm_check_deps() { @@ -503,6 +504,8 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc } multilib_src_install_all() { @@ -514,9 +517,11 @@ multilib_src_test() { } pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} + if ! use libglvnd; then + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + fi } # $1 - VIDEO_CARDS flag (check skipped for "--")