--- a/exception_lists/packaging	Wed Oct 12 07:39:30 2016 -0700
+++ b/exception_lists/packaging	Wed Oct 12 12:50:01 2016 -0700
@@ -75,6 +75,11 @@
 usr/lib/xorg/sparcv9/libdrm_radeon.so	     	sparc
 usr/lib/xorg/sparcv9/libdrm_radeon.so.1	     	sparc
 
+# Not delivering kms_swrast_dri.so (not needed for now)
+usr/lib/xorg/modules/dri/kms_swrast_dri.so
+usr/lib/xorg/modules/dri/sparcv9/kms_swrast_dri.so	sparc	
+usr/lib/xorg/modules/dri/amd64/kms_swrast_dri.so	i386
+
 # Deliver it once the driver provides the correct plumbing for use on solaris
 usr/bin/intel_gpu_abrt				i386
 

--- a/pkg/manifests/developer-opensolaris-X.p5m	Wed Oct 12 07:39:30 2016 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Wed Oct 12 12:50:01 2016 -0700
@@ -103,8 +103,9 @@
 # Various modules need flex to generate lexers
 depend type=require fmri=pkg:/developer/lexer/flex
 
-# we are adding llvm (pipe) to mesa for 3d support on gnome3 
-depend type=require fmri=pkg:/developer/llvm/llvm org.opensolaris.pkgdepend.resolve=true
+# we are adding llvm (pipe) to mesa for 3d support on gnome3
+depend type=require fmri=pkg:/developer/llvm/llvm \
+    org.opensolaris.pkgdepend.resolve=true
 
 # xcb, xcb-util, xcb-util-wm need GNU M4 to build
 # (also required by any module running autoconf/autoreconf)