diff -u mesa-13.0.2/debian/changelog mesa-13.0.2/debian/changelog
--- mesa-13.0.2/debian/changelog
+++ mesa-13.0.2/debian/changelog
@@ -1,3 +1,12 @@
+mesa (13.0.2-1+rpi1) stretch-staging; urgency=medium
+
+  * Use llvm 3.8 for now until we get 3.9 built for raspbian.
+  * Disable radv, it needs llvm 3.9 and it seems to be related to hardware we don't care about anyway.
+  * Add -f to rm commands so they don't fail if the files don't exist.
+  * Disable mesa-vulkan-drivers package.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 06 Dec 2016 10:30:45 +0000
+
 mesa (13.0.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -u mesa-13.0.2/debian/control mesa-13.0.2/debian/control
--- mesa-13.0.2/debian/control
+++ mesa-13.0.2/debian/control
@@ -43,10 +43,10 @@
  python-mako,
  flex,
  bison,
- llvm-3.9-dev (>= 1:3.9) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el],
+ llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.9-dev (>= 1:3.9) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
+ libclang-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
  libclc-dev (>= 0.2.0+git20160907) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
@@ -464,7 +464,7 @@
 
 Package: mesa-vulkan-drivers
 Section: libs
-Architecture: amd64 i386 arm64 armhf ppc64el x32
+Architecture: dont-build-this
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
  libvulkan1,
diff -u mesa-13.0.2/debian/rules mesa-13.0.2/debian/rules
--- mesa-13.0.2/debian/rules
+++ mesa-13.0.2/debian/rules
@@ -92,7 +92,7 @@
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el))
 	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += --enable-gallium-llvm
-	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.9
+	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.8
 	GALLIUM_DRIVERS += swrast
   else
 	DRI_DRIVERS += swrast
@@ -100,9 +100,9 @@
 
   # radv needs LLVM and the Vulkan loader, so only build on the subset of
   # arches where we have LLVM enabled and where the Vulkan loader is built.
-  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 arm64 armhf ppc64el))
-	VULKAN_DRIVERS += radeon
-  endif
+  #ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 arm64 armhf ppc64el))
+  #	VULKAN_DRIVERS += radeon
+  #endif
 
 	confflags_DIRECT_RENDERING = --enable-driglx-direct
 	confflags_GALLIUM += --enable-vdpau
@@ -172,7 +172,7 @@
 override_dh_install:
 	# Also get rid of other files which aren't installed. Do not
 	# use -f to ensure we notice disappearing files:
-	set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
+	set -e; for file in $(NOT_INSTALLED); do rm -f debian/tmp/$$file; done
 	# Files only in git, not in tarballs, OK to use rm -f here:
 	set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f debian/tmp/$$file; done
 	# purge .la files
@@ -186,11 +186,11 @@
   # Remove vulkan headers only where they get installed in tmp
   # We ship those headers via src:vulkan / libvulkan-dev
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 arm64 armhf ppc64el x32))
-	set -e; for file in vk_platform.h vulkan.h; do rm debian/tmp/usr/include/vulkan/$$file; done
+	set -e; for file in vk_platform.h vulkan.h; do rm -f debian/tmp/usr/include/vulkan/$$file; done
     ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32))
 	rm debian/tmp/usr/include/vulkan/vulkan_intel.h
     endif
-	rmdir debian/tmp/usr/include/vulkan
+	-rmdir debian/tmp/usr/include/vulkan
   endif
 
   ifneq ($(DEB_HOST_ARCH_OS), hurd)