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 D89C7138334 for ; Mon, 4 Mar 2019 18:29:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA96EE084A; Mon, 4 Mar 2019 18:29:01 +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 9DEEDE084A for ; Mon, 4 Mar 2019 18:29:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 50A49335D1A for ; Mon, 4 Mar 2019 18:29:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5D64503 for ; Mon, 4 Mar 2019 18:28:58 +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: <1551724129.fb942672a70feb4604ab8a5033510be3feae3a4f.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.0.0_rc6.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: fb942672a70feb4604ab8a5033510be3feae3a4f X-VCS-Branch: master Date: Mon, 4 Mar 2019 18:28:58 +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: d722c028-a157-4bb4-879d-a3d15dbcaf26 X-Archives-Hash: 5f930544f6f5654f66c1d4af7dc0f376 commit: fb942672a70feb4604ab8a5033510be3feae3a4f Author: Matt Turner gentoo org> AuthorDate: Mon Mar 4 16:54:14 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Mar 4 18:28:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb942672 media-libs/mesa: More libglvnd fixes Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-19.0.0_rc6.ebuild | 11 +++++++++-- media-libs/mesa/mesa-9999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-19.0.0_rc6.ebuild b/media-libs/mesa/mesa-19.0.0_rc6.ebuild index 0056e74d3ec..daf421bff7b 100644 --- a/media-libs/mesa/mesa-19.0.0_rc6.ebuild +++ b/media-libs/mesa/mesa-19.0.0_rc6.ebuild @@ -70,7 +70,6 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" RDEPEND=" !app-eselect/eselect-mesa - >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] @@ -80,6 +79,13 @@ RDEPEND=" >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) gallium? ( unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( @@ -106,7 +112,6 @@ RDEPEND=" vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) ) - libglvnd? ( media-libs/libglvnd ) wayland? ( >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] >=dev-libs/wayland-protocols-1.8 @@ -477,6 +482,8 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* } multilib_src_install_all() { diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 075bfa0b5a7..f889058acb1 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -70,7 +70,6 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" RDEPEND=" !app-eselect/eselect-mesa - >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] @@ -80,6 +79,13 @@ RDEPEND=" >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) gallium? ( unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( @@ -106,7 +112,6 @@ RDEPEND=" vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) ) - libglvnd? ( media-libs/libglvnd ) wayland? ( >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] >=dev-libs/wayland-protocols-1.8 @@ -477,6 +482,8 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* } multilib_src_install_all() {