ssuominen 14/09/17 13:55:40 Modified: imagemagick-6.8.9.7.ebuild ChangeLog Log: Fix sandbox problems with USE="opencl" and /dev/nvidiactl wrt #472766#c31 by Wojtek Arabczyk (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.2 media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild?r1=1.1&r2=1.2 Index: imagemagick-6.8.9.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- imagemagick-6.8.9.7.ebuild 24 Aug 2014 15:37:23 -0000 1.1 +++ imagemagick-6.8.9.7.ebuild 17 Sep 2014 13:55:39 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.1 2014/08/24 15:37:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.2 2014/09/17 13:55:39 ssuominen Exp $ EAPI=5 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator @@ -73,11 +73,16 @@ # For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3 shopt -s nullglob - cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${cards}"; then - addpredict "${cards}" + 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}" fi shopt -u nullglob + addpredict /dev/nvidiactl } src_configure() { @@ -158,7 +163,7 @@ if use opencl; then cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/ati/card:/dev/dri/card" + SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card" EOF insinto /etc/sandbox.d 1.562 media-gfx/imagemagick/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.562&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.562&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.561&r2=1.562 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v retrieving revision 1.561 retrieving revision 1.562 diff -u -r1.561 -r1.562 --- ChangeLog 24 Aug 2014 15:41:26 -0000 1.561 +++ ChangeLog 17 Sep 2014 13:55:39 -0000 1.562 @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.561 2014/08/24 15:41:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.562 2014/09/17 13:55:39 ssuominen Exp $ + + 17 Sep 2014; Samuli Suominen <[email protected]> + imagemagick-6.8.9.7.ebuild: + Fix sandbox problems with USE="opencl" and /dev/nvidiactl wrt #472766#c31 by + Wojtek Arabczyk 24 Aug 2014; Samuli Suominen <[email protected]> imagemagick-6.8.8.10-r1.ebuild:
