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 1E6101395E2 for ; Thu, 10 Nov 2016 22:36:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD913E084C; Thu, 10 Nov 2016 22:36:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B20DDE084C for ; Thu, 10 Nov 2016 22:36:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B6AC341683 for ; Thu, 10 Nov 2016 22:36:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C105E24B0 for ; Thu, 10 Nov 2016 22:36:03 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1478817352.1fcef10c30128a91b2fcbf9273270b76390f4561.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-13.0.0.ebuild media-libs/mesa/mesa-9999.ebuild media-libs/mesa/metadata.xml X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1fcef10c30128a91b2fcbf9273270b76390f4561 X-VCS-Branch: master Date: Thu, 10 Nov 2016 22:36: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-Archives-Salt: 333b3d49-9b89-44f7-aecd-b29a64fcdfa4 X-Archives-Hash: ed8cbc00ea56f1ba3adce94063213362 commit: 1fcef10c30128a91b2fcbf9273270b76390f4561 Author: Mike Frysinger gentoo org> AuthorDate: Thu Nov 10 22:29:14 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Nov 10 22:35:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fcef10c media-libs/mesa: add USE flags to control sha1 dep #539266 The sha1 usage in mesa is a bit convoluted and can leverage a number of sublibs to satisfy things. Add USE flags to control them directly. This covers the common cases but can probably be further refined. We'll look more into it via the bug. media-libs/mesa/mesa-13.0.0.ebuild | 13 ++++++++++--- media-libs/mesa/mesa-9999.ebuild | 13 ++++++++++--- media-libs/mesa/metadata.xml | 3 +++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/media-libs/mesa/mesa-13.0.0.ebuild b/media-libs/mesa/mesa-13.0.0.ebuild index bfedccc..f7e3929 100644 --- a/media-libs/mesa/mesa-13.0.0.ebuild +++ b/media-libs/mesa/mesa-13.0.0.ebuild @@ -43,11 +43,12 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm - +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind - vdpau wayland xvmc xa kernel_FreeBSD" + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2 + +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic selinux + vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD" REQUIRED_USE=" + || ( gcrypt nettle openssl ) d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) @@ -100,6 +101,11 @@ RDEPEND=" ) ) >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) + !nettle? ( + gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) + !gcrypt? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) + ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc @@ -302,6 +308,7 @@ multilib_src_configure() { --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ + --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt libcrypto)) \ PYTHON2="${PYTHON}" \ ${myconf} } diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index bfedccc..f7e3929 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -43,11 +43,12 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm - +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind - vdpau wayland xvmc xa kernel_FreeBSD" + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2 + +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic selinux + vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD" REQUIRED_USE=" + || ( gcrypt nettle openssl ) d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) @@ -100,6 +101,11 @@ RDEPEND=" ) ) >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) + !nettle? ( + gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) + !gcrypt? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) + ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc @@ -302,6 +308,7 @@ multilib_src_configure() { --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ + --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt libcrypto)) \ PYTHON2="${PYTHON}" \ ${myconf} } diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index e0706e7..f53e36d 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -12,12 +12,15 @@ Enable DRI3 support. Enable EGL support. Build drivers based on Gallium3D, the new architecture for 3D graphics drivers. + Use dev-libs/libgcrypt for low level sha1 utility functions. Enable the Graphics Buffer Manager for EGL on KMS. Enable GLESv1 support. Enable GLESv2 support. Enable LLVM backend for Gallium3D. + Use dev-libs/nettle for low level sha1 utility functions. Enable the Clover Gallium OpenCL state tracker. Enable OpenMAX video decode/encode acceleration for Gallium3D. + Use dev-libs/openssl for low level sha1 utility functions. Enable the OpenVG 2D acceleration API for Gallium3D. Build the Mesa library for off-screen rendering. Enable if the user plans to run the package under a pax enabled hardened kernel