1 |
commit: ac141b1953a532e8553b099ac341db25f45d74b8 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 24 10:37:06 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 24 10:37:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac141b19 |
7 |
|
8 |
media-gfx/imagemagick: Add missing rendering devices to sandbox whitelist |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=580208 |
11 |
Package-Manager: Portage-2.3.3, Repoman-2.3.2 |
12 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
13 |
|
14 |
media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild | 17 +++++++++++++---- |
15 |
...ick-7.0.5.7.ebuild => imagemagick-7.0.5.7-r1.ebuild} | 17 +++++++++++++---- |
16 |
2 files changed, 26 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild |
19 |
index eac3e882c37..df1817d711c 100644 |
20 |
--- a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild |
21 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild |
22 |
@@ -68,19 +68,28 @@ REQUIRED_USE="corefonts? ( truetype ) |
23 |
S=${WORKDIR}/${MY_P} |
24 |
|
25 |
src_prepare() { |
26 |
+ local mesa_cards ati_cards nvidia_cards render_cards |
27 |
default |
28 |
|
29 |
elibtoolize # for Darwin modules |
30 |
|
31 |
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
32 |
shopt -s nullglob |
33 |
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
34 |
+ if test -n "${ati_cards}"; then |
35 |
+ addpredict "${ati_cards}" |
36 |
+ fi |
37 |
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
38 |
if test -n "${mesa_cards}"; then |
39 |
addpredict "${mesa_cards}" |
40 |
fi |
41 |
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
42 |
- if test -n "${ati_cards}"; then |
43 |
- addpredict "${ati_cards}" |
44 |
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') |
45 |
+ if test -n "${nvidia_cards}"; then |
46 |
+ addpredict "${nvidia_cards}" |
47 |
+ fi |
48 |
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') |
49 |
+ if test -n "${render_cards}"; then |
50 |
+ addpredict "${render_cards}" |
51 |
fi |
52 |
shopt -u nullglob |
53 |
addpredict /dev/nvidiactl |
54 |
@@ -164,7 +173,7 @@ src_install() { |
55 |
|
56 |
if use opencl; then |
57 |
cat <<-EOF > "${T}"/99${PN} |
58 |
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card" |
59 |
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" |
60 |
EOF |
61 |
|
62 |
insinto /etc/sandbox.d |
63 |
|
64 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild |
65 |
similarity index 92% |
66 |
rename from media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild |
67 |
rename to media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild |
68 |
index c4de337b59d..887a4a506d6 100644 |
69 |
--- a/media-gfx/imagemagick/imagemagick-7.0.5.7.ebuild |
70 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.5.7-r1.ebuild |
71 |
@@ -68,19 +68,28 @@ REQUIRED_USE="corefonts? ( truetype ) |
72 |
S=${WORKDIR}/${MY_P} |
73 |
|
74 |
src_prepare() { |
75 |
+ local ati_cards mesa_cards nvidia_cards render_cards |
76 |
default |
77 |
|
78 |
elibtoolize # for Darwin modules |
79 |
|
80 |
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
81 |
shopt -s nullglob |
82 |
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
83 |
+ if test -n "${ati_cards}"; then |
84 |
+ addpredict "${ati_cards}" |
85 |
+ fi |
86 |
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
87 |
if test -n "${mesa_cards}"; then |
88 |
addpredict "${mesa_cards}" |
89 |
fi |
90 |
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
91 |
- if test -n "${ati_cards}"; then |
92 |
- addpredict "${ati_cards}" |
93 |
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') |
94 |
+ if test -n "${nvidia_cards}"; then |
95 |
+ addpredict "${nvidia_cards}" |
96 |
+ fi |
97 |
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') |
98 |
+ if test -n "${render_cards}"; then |
99 |
+ addpredict "${render_cards}" |
100 |
fi |
101 |
shopt -u nullglob |
102 |
addpredict /dev/nvidiactl |
103 |
@@ -164,7 +173,7 @@ src_install() { |
104 |
|
105 |
if use opencl; then |
106 |
cat <<-EOF > "${T}"/99${PN} |
107 |
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card" |
108 |
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" |
109 |
EOF |
110 |
|
111 |
insinto /etc/sandbox.d |