commit: ac141b1953a532e8553b099ac341db25f45d74b8 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sat Jun 24 10:37:06 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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
