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 25A06139694 for ; Sat, 24 Jun 2017 10:37:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7488022400A; Sat, 24 Jun 2017 10:37:58 +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 3E81322400A for ; Sat, 24 Jun 2017 10:37:58 +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 26DC6341AC1 for ; Sat, 24 Jun 2017 10:37:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4F067490 for ; Sat, 24 Jun 2017 10:37:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1498300671.ac141b1953a532e8553b099ac341db25f45d74b8.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ac141b1953a532e8553b099ac341db25f45d74b8 X-VCS-Branch: master Date: Sat, 24 Jun 2017 10:37:55 +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: 602110aa-edf1-4371-b6c9-821b3ed00676 X-Archives-Hash: 872b6cceaaee4adaf49ccd9b0f834c24 commit: ac141b1953a532e8553b099ac341db25f45d74b8 Author: Justin Lecher gentoo org> AuthorDate: Sat Jun 24 10:37:06 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jun 24 10:37:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac141b19 media-gfx/imagemagick: Add missing rendering devices to sandbox whitelist Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=580208 Package-Manager: Portage-2.3.3, Repoman-2.3.2 Signed-off-by: Justin Lecher gentoo.org> media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild | 17 +++++++++++++---- ...ick-7.0.5.7.ebuild => imagemagick-7.0.5.7-r1.ebuild} | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild index eac3e882c37..df1817d711c 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild @@ -68,19 +68,28 @@ REQUIRED_USE="corefonts? ( truetype ) S=${WORKDIR}/${MY_P} src_prepare() { + local mesa_cards ati_cards nvidia_cards render_cards default elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') if test -n "${mesa_cards}"; then addpredict "${mesa_cards}" fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" fi shopt -u nullglob addpredict /dev/nvidiactl @@ -164,7 +173,7 @@ src_install() { if use opencl; then cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card" + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" EOF insinto /etc/sandbox.d diff --git a/media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild similarity index 92% rename from media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild rename to media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild index c4de337b59d..887a4a506d6 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild @@ -68,19 +68,28 @@ REQUIRED_USE="corefonts? ( truetype ) S=${WORKDIR}/${MY_P} src_prepare() { + local ati_cards mesa_cards nvidia_cards render_cards default elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') if test -n "${mesa_cards}"; then addpredict "${mesa_cards}" fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" fi shopt -u nullglob addpredict /dev/nvidiactl @@ -164,7 +173,7 @@ src_install() { if use opencl; then cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card" + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" EOF insinto /etc/sandbox.d