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 2CDA3138359 for ; Fri, 25 Sep 2020 04:53:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A11FE0871; Fri, 25 Sep 2020 04:53:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 04053E0871 for ; Fri, 25 Sep 2020 04:53:36 +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 E6DE8340D91 for ; Fri, 25 Sep 2020 04:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84C213A1 for ; Fri, 25 Sep 2020 04:53:31 +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: <1601009587.d70a6280fedfb61abe722e349c7e4d9aba3124d7.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: d70a6280fedfb61abe722e349c7e4d9aba3124d7 X-VCS-Branch: master Date: Fri, 25 Sep 2020 04:53:31 +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: 2d44b1b2-4d2f-428b-aae0-ae1b6273d1fa X-Archives-Hash: 080bc8d90a20bc1ccfb364be6b2e2eec commit: d70a6280fedfb61abe722e349c7e4d9aba3124d7 Author: Matt Turner gentoo org> AuthorDate: Fri Sep 25 04:49:20 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Sep 25 04:53:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70a6280 media-libs/mesa: Drop IUSE=libglvnd Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index d7ceac80a26..9a49069d0d3 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" @@ -76,14 +76,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" RDEPEND=" !app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) gallium? ( unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( @@ -244,7 +238,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 ) + usr/lib/libGLX_mesa.so.0.0.0 )" llvm_check_deps() { @@ -496,13 +490,13 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) + -Dglvnd=enabled -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl) $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) - $(meson_use libglvnd glvnd) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false) @@ -533,14 +527,6 @@ multilib_src_test() { meson test -v -C "${BUILD_DIR}" -t 100 } -pkg_postinst() { - 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 "--") # other args - names of DRI drivers to enable dri_driver_enable() {