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 E5DD7138334 for ; Mon, 1 Jul 2019 20:25:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B702E08CA; Mon, 1 Jul 2019 20:25:06 +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 09037E08CA for ; Mon, 1 Jul 2019 20:25:06 +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 0F12334615E for ; Mon, 1 Jul 2019 20:25:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85080626 for ; Mon, 1 Jul 2019 20:25:03 +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: <1562012635.14b419aebb9fb2508182bb4b0405ef7884f6c2d7.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-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 14b419aebb9fb2508182bb4b0405ef7884f6c2d7 X-VCS-Branch: master Date: Mon, 1 Jul 2019 20:25:03 +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: 59dfd10d-6f60-44be-8554-f624d1c4349d X-Archives-Hash: 662e0d51c6174565ec7f3aa5fc0764c0 commit: 14b419aebb9fb2508182bb4b0405ef7884f6c2d7 Author: Matt Turner gentoo org> AuthorDate: Mon Jul 1 20:19:40 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jul 1 20:23:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b419ae media-libs/mesa: Drop USE=pic Upstream commit 20294dceebc2 ("mesa: Enable asm unconditionally, now that gen_matypes is gone.") removed the -Dasm= option. I have no information about when or why the 'pic' USE flag was added, so worst case I'll at least find out why it's needed by removing it now... Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 0fd4ae716a5..cd10f97cc60 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -37,7 +37,7 @@ done IUSE="${IUSE_VIDEO_CARDS} +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind + lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc" REQUIRED_USE=" @@ -230,13 +230,11 @@ EGIT_CHECKOUT_DIR=${S} QA_WX_LOAD=" x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.0.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.0.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 )" llvm_check_deps() { @@ -452,11 +450,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) fi - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - emesonargs+=( -Dasm=false ) - fi - if use gallium; then gallium_enable -- swrast emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )