patch.txt 4/27/2016

--- rules_old	2015-11-04 21:22:21.000000000 -0600
+++ rules_new	2015-11-05 17:24:39.431595000 -0600
@@ -100,7 +100,7 @@
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf ppc64el))
 	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += --enable-gallium-llvm
-	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.7
+	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.9
 	GALLIUM_DRIVERS += swrast
   else
 	DRI_DRIVERS += swrast
@@ -108,6 +108,8 @@

 	confflags_DIRECT_RENDERING = --enable-driglx-direct
 	confflags_GALLIUM += --enable-vdpau
+	confflags_GALLIUM += --enable-nine
+	confflags_GALLIUM += --enable-r600-llvm-compiler
 endif
 confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
 confflags_GLES = --enable-gles1 --enable-gles2
@@ -224,7 +226,7 @@

 	# 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
@@ -235,6 +237,21 @@
 	mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
 	   debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/

+	# gallium-nine:
+	# pipe: already added for opencl:
+	#   install -m755 -d debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe && \
+	#   mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so \
+	#      debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe && \
+
+	if [ -e "debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/d3d/" ] && \
+	   [ -d "debian/tmp/dri/usr/include/d3dadapter/" ]; then \
+	   mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/d3d/ \
+	      debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/ && \
+	   install -m755 -d debian/mesa-common-dev/usr/include/d3dadapter/ && \
+	   mv debian/tmp/dri/usr/include/d3dadapter/* \
+	      debian/mesa-common-dev/usr/include/d3dadapter/ ; \
+	fi
+
   ifneq ($(DEB_HOST_ARCH_OS), hurd)
 	# Copy the hardlinked vdpau drivers correctly.
 	install -m755 -d debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/