various packaging changes for the new release

12 files changed, 149 insertions, 89 deletions

diff --git a/debian/changelog b/debian/changelog
index 00d03539847..cc5ed6a3dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-mesa (9.0.2-1) UNRELEASED; urgency=low
+mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+    - Set close on exec flag when opening dri devices (Closes: #651370).
 
   [ Julien Cristau ]
   * Use xz for all binary packages not just *-dbg.
 
   [ Timo Aaltonen ]
-  * New upstream release 9.0.
-    - Set close on exec flag when opening dri devices (Closes: #651370).
   * Refresh patches
     - disable 05_kfreebsd-egl-x11.diff for now.
-    - switch to llvm-3.1 (Closes: #678822).
   * control: Added libtool to build-depends.
   * rules: Drop special handling of config.{guess,sub}, not needed anymore.
   * rules, libosmesa*: Build only the 32bit OSMesa library.
@@ -26,15 +26,17 @@ mesa (9.0.2-1) UNRELEASED; urgency=low
   * control: Add new dependencies to libgl1-mesa-dev.
   * rules, libgl1-mesa-dri.install.linux.in: Add support for radeonsi.
   * rules: Build llvm shared libs on platforms that support llvm.
-  * Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
-    llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
   * control, rules, libglu*: Remove libglu packaging, since it's been split
     off upstream.
   * rules: Disable dri for the swx11 targets.
   * not-installed: Updated.
-  * Update symbols for libgles2-mesa
+  * Update symbols for libgles2-mesa and libxatracker1.
   * libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
   * control: Add libdrm-dev to mesa-common-dev Depends.
+  * control: Build-depend on llvm-3.2-dev (Closes: #678822).
+  * 15-fix-oot-build.diff: Use correct includes to fix out-of-tree builds.
+  * libgl1-mesa-dri.install.in: Include gallium-pipe/*.so and libllvmradeon*.so.
+  * rules: Add files to clean.
 
   [ Steve Langasek ]
   * Install all dri drivers from the DESTDIR tree, instead of copying them
@@ -49,11 +51,9 @@ mesa (9.0.2-1) UNRELEASED; urgency=low
     in Debian right now so let's just be complete.
 
   [ Maarten Lankhorst ]
-  * New upstream release 9.0.2.
   * Bump standards-version to 3.9.3.
   * control: Bump libwayland-dev build-dep to 1.0.2.
   * Remove 13-llvm-config-pick-a-version.diff and just pass a flag to configure.
-  * Add 16-radeon-ndebug.diff to fix a build failure against llvm
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/control b/debian/control
index eae7f1e98fa..87d0953cc95 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.1-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libwayland-dev (>= 1.0.2) [linux-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 5eda011cf3c..ffed3b72c5b 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1,4 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libllvmradeon*.so usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libgles1-mesa.symbols b/debian/libgles1-mesa.symbols
index fa79646a410..0452e2b1dc9 100644
--- a/debian/libgles1-mesa.symbols
+++ b/debian/libgles1-mesa.symbols
@@ -67,6 +67,7 @@ libGLESv1_CM.so.1 libgles1-mesa #MINVER# | libgles1
  glEnableClientState@Base 7.8.1
  glFinish@Base 7.8.1
  glFlush@Base 7.8.1
+ glFlushMappedBufferRangeEXT@Base 9.1~
  glFogf@Base 7.8.1
  glFogfv@Base 7.8.1
  glFogx@Base 7.8.1
@@ -145,6 +146,7 @@ libGLESv1_CM.so.1 libgles1-mesa #MINVER# | libgles1
  glLoadMatrixxOES@Base 7.8.1
  glLogicOp@Base 7.8.1
  glMapBufferOES@Base 7.8.1
+ glMapBufferRangeEXT@Base 9.1~
  glMaterialf@Base 7.8.1
  glMaterialfv@Base 7.8.1
  glMaterialx@Base 7.8.1
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index 8f0be1a04ac..30c7d857c2a 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -1,32 +1,49 @@
 libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
  glActiveTexture@Base 7.8.1
  glAttachShader@Base 7.8.1
+ glBeginQuery@Base 9.1~
+ glBeginTransformFeedback@Base 9.1~
  glBindAttribLocation@Base 7.8.1
  glBindBuffer@Base 7.8.1
+ glBindBufferBase@Base 9.1~
+ glBindBufferRange@Base 9.1~
  glBindFramebuffer@Base 7.8.1
  glBindRenderbuffer@Base 7.8.1
+ glBindSampler@Base 9.1~
  glBindTexture@Base 7.8.1
+ glBindTransformFeedback@Base 9.1~
+ glBindVertexArray@Base 9.1~
  glBindVertexArrayOES@Base 9.0~0
  glBlendColor@Base 7.8.1
  glBlendEquation@Base 7.8.1
  glBlendEquationSeparate@Base 7.8.1
  glBlendFunc@Base 7.8.1
  glBlendFuncSeparate@Base 7.8.1
+ glBlitFramebuffer@Base 9.1~
  glBufferData@Base 7.8.1
  glBufferSubData@Base 7.8.1
  glCheckFramebufferStatus@Base 7.8.1
  glClear@Base 7.8.1
+ glClearBufferfi@Base 9.1~
+ glClearBufferfv@Base 9.1~
+ glClearBufferiv@Base 9.1~
+ glClearBufferuiv@Base 9.1~
  glClearColor@Base 7.8.1
  glClearDepthf@Base 7.8.1
  glClearStencil@Base 7.8.1
+ glClientWaitSync@Base 9.1~
  glColorMask@Base 7.8.1
  glCompileShader@Base 7.8.1
  glCompressedTexImage2D@Base 7.8.1
+ glCompressedTexImage3D@Base 9.1~
  glCompressedTexImage3DOES@Base 7.8.1
  glCompressedTexSubImage2D@Base 7.8.1
+ glCompressedTexSubImage3D@Base 9.1~
  glCompressedTexSubImage3DOES@Base 7.8.1
+ glCopyBufferSubData@Base 9.1~
  glCopyTexImage2D@Base 7.8.1
  glCopyTexSubImage2D@Base 7.8.1
+ glCopyTexSubImage3D@Base 9.1~
  glCopyTexSubImage3DOES@Base 7.8.1
  glCreateProgram@Base 7.8.1
  glCreateShader@Base 7.8.1
@@ -34,9 +51,14 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
  glDeleteBuffers@Base 7.8.1
  glDeleteFramebuffers@Base 7.8.1
  glDeleteProgram@Base 7.8.1
+ glDeleteQueries@Base 9.1~
  glDeleteRenderbuffers@Base 7.8.1
+ glDeleteSamplers@Base 9.1~
  glDeleteShader@Base 7.8.1
+ glDeleteSync@Base 9.1~
  glDeleteTextures@Base 7.8.1
+ glDeleteTransformFeedbacks@Base 9.1~
+ glDeleteVertexArrays@Base 9.1~
  glDeleteVertexArraysOES@Base 9.0~0
  glDepthFunc@Base 7.8.1
  glDepthMask@Base 7.8.1
@@ -45,74 +67,130 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
  glDisable@Base 7.8.1
  glDisableVertexAttribArray@Base 7.8.1
  glDrawArrays@Base 7.8.1
+ glDrawArraysInstanced@Base 9.1~
+ glDrawBuffers@Base 9.1~
  glDrawBuffersNV@Base 8.0~rc1
  glDrawElements@Base 7.8.1
+ glDrawElementsInstanced@Base 9.1~
+ glDrawRangeElements@Base 9.1~
  glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
  glEGLImageTargetTexture2DOES@Base 7.8.1
  glEnable@Base 7.8.1
  glEnableVertexAttribArray@Base 7.8.1
+ glEndQuery@Base 9.1~
+ glEndTransformFeedback@Base 9.1~
+ glFenceSync@Base 9.1~
  glFinish@Base 7.8.1
  glFlush@Base 7.8.1
+ glFlushMappedBufferRange@Base 9.1~
+ glFlushMappedBufferRangeEXT@Base 9.1~
  glFramebufferRenderbuffer@Base 7.8.1
  glFramebufferTexture2D@Base 7.8.1
  glFramebufferTexture3DOES@Base 7.8.1
+ glFramebufferTextureLayer@Base 9.1~
  glFrontFace@Base 7.8.1
  glGenBuffers@Base 7.8.1
  glGenFramebuffers@Base 7.8.1
+ glGenQueries@Base 9.1~
  glGenRenderbuffers@Base 7.8.1
+ glGenSamplers@Base 9.1~
  glGenTextures@Base 7.8.1
+ glGenTransformFeedbacks@Base 9.1~
+ glGenVertexArrays@Base 9.1~
  glGenVertexArraysOES@Base 9.0~0
  glGenerateMipmap@Base 7.8.1
  glGetActiveAttrib@Base 7.8.1
  glGetActiveUniform@Base 7.8.1
+ glGetActiveUniformBlockName@Base 9.1~
+ glGetActiveUniformBlockiv@Base 9.1~
+ glGetActiveUniformsiv@Base 9.1~
  glGetAttachedShaders@Base 7.8.1
  glGetAttribLocation@Base 7.8.1
  glGetBooleanv@Base 7.8.1
+ glGetBufferParameteri64v@Base 9.1~
  glGetBufferParameteriv@Base 7.8.1
+ glGetBufferPointerv@Base 9.1~
  glGetBufferPointervOES@Base 7.8.1
  glGetError@Base 7.8.1
  glGetFloatv@Base 7.8.1
+ glGetFragDataLocation@Base 9.1~
  glGetFramebufferAttachmentParameteriv@Base 7.8.1
+ glGetInteger64i_v@Base 9.1~
+ glGetInteger64v@Base 9.1~
+ glGetIntegeri_v@Base 9.1~
  glGetIntegerv@Base 7.8.1
+ glGetInternalformativ@Base 9.1~
+ glGetProgramBinary@Base 9.1~
  glGetProgramBinaryOES@Base 7.8.1
  glGetProgramInfoLog@Base 7.8.1
  glGetProgramiv@Base 7.8.1
+ glGetQueryObjectuiv@Base 9.1~
+ glGetQueryiv@Base 9.1~
  glGetRenderbufferParameteriv@Base 7.8.1
+ glGetSamplerParameterfv@Base 9.1~
+ glGetSamplerParameteriv@Base 9.1~
  glGetShaderInfoLog@Base 7.8.1
  glGetShaderPrecisionFormat@Base 7.8.1
  glGetShaderSource@Base 7.8.1
  glGetShaderiv@Base 7.8.1
  glGetString@Base 7.8.1
+ glGetStringi@Base 9.1~
+ glGetSynciv@Base 9.1~
  glGetTexParameterfv@Base 7.8.1
  glGetTexParameteriv@Base 7.8.1
+ glGetTransformFeedbackVarying@Base 9.1~
+ glGetUniformBlockIndex@Base 9.1~
+ glGetUniformIndices@Base 9.1~
  glGetUniformLocation@Base 7.8.1
  glGetUniformfv@Base 7.8.1
  glGetUniformiv@Base 7.8.1
+ glGetUniformuiv@Base 9.1~
+ glGetVertexAttribIiv@Base 9.1~
+ glGetVertexAttribIuiv@Base 9.1~
  glGetVertexAttribPointerv@Base 7.8.1
  glGetVertexAttribfv@Base 7.8.1
  glGetVertexAttribiv@Base 7.8.1
  glHint@Base 7.8.1
+ glInvalidateFramebuffer@Base 9.1~
+ glInvalidateSubFramebuffer@Base 9.1~
  glIsBuffer@Base 7.8.1
  glIsEnabled@Base 7.8.1
  glIsFramebuffer@Base 7.8.1
  glIsProgram@Base 7.8.1
+ glIsQuery@Base 9.1~
  glIsRenderbuffer@Base 7.8.1
+ glIsSampler@Base 9.1~
  glIsShader@Base 7.8.1
+ glIsSync@Base 9.1~
  glIsTexture@Base 7.8.1
+ glIsTransformFeedback@Base 9.1~
+ glIsVertexArray@Base 9.1~
  glIsVertexArrayOES@Base 9.0~0
  glLineWidth@Base 7.8.1
  glLinkProgram@Base 7.8.1
  glMapBufferOES@Base 7.8.1
+ glMapBufferRange@Base 9.1~
+ glMapBufferRangeEXT@Base 9.1~
  glMultiDrawArraysEXT@Base 7.8.1
  glMultiDrawElementsEXT@Base 7.8.1
+ glPauseTransformFeedback@Base 9.1~
  glPixelStorei@Base 7.8.1
  glPolygonOffset@Base 7.8.1
+ glProgramBinary@Base 9.1~
  glProgramBinaryOES@Base 7.8.1
+ glProgramParameteri@Base 9.1~
+ glReadBuffer@Base 9.1~
  glReadBufferNV@Base 8.1~0
  glReadPixels@Base 7.8.1
  glReleaseShaderCompiler@Base 7.8.1
  glRenderbufferStorage@Base 7.8.1
+ glRenderbufferStorageMultisample@Base 9.1~
+ glResumeTransformFeedback@Base 9.1~
  glSampleCoverage@Base 7.8.1
+ glSamplerParameterf@Base 9.1~
+ glSamplerParameterfv@Base 9.1~
+ glSamplerParameteri@Base 9.1~
+ glSamplerParameteriv@Base 9.1~
  glScissor@Base 7.8.1
  glShaderBinary@Base 7.8.1
  glShaderSource@Base 7.8.1
@@ -123,32 +201,53 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
  glStencilOp@Base 7.8.1
  glStencilOpSeparate@Base 7.8.1
  glTexImage2D@Base 7.8.1
+ glTexImage3D@Base 9.1~
  glTexImage3DOES@Base 7.8.1
  glTexParameterf@Base 7.8.1
  glTexParameterfv@Base 7.8.1
  glTexParameteri@Base 7.8.1
  glTexParameteriv@Base 7.8.1
+ glTexStorage2D@Base 9.1~
+ glTexStorage3D@Base 9.1~
  glTexSubImage2D@Base 7.8.1
+ glTexSubImage3D@Base 9.1~
  glTexSubImage3DOES@Base 7.8.1
+ glTransformFeedbackVaryings@Base 9.1~
  glUniform1f@Base 7.8.1
  glUniform1fv@Base 7.8.1
  glUniform1i@Base 7.8.1
  glUniform1iv@Base 7.8.1
+ glUniform1ui@Base 9.1~
+ glUniform1uiv@Base 9.1~
  glUniform2f@Base 7.8.1
  glUniform2fv@Base 7.8.1
  glUniform2i@Base 7.8.1
  glUniform2iv@Base 7.8.1
+ glUniform2ui@Base 9.1~
+ glUniform2uiv@Base 9.1~
  glUniform3f@Base 7.8.1
  glUniform3fv@Base 7.8.1
  glUniform3i@Base 7.8.1
  glUniform3iv@Base 7.8.1
+ glUniform3ui@Base 9.1~
+ glUniform3uiv@Base 9.1~
  glUniform4f@Base 7.8.1
  glUniform4fv@Base 7.8.1
  glUniform4i@Base 7.8.1
  glUniform4iv@Base 7.8.1
+ glUniform4ui@Base 9.1~
+ glUniform4uiv@Base 9.1~
+ glUniformBlockBinding@Base 9.1~
  glUniformMatrix2fv@Base 7.8.1
+ glUniformMatrix2x3fv@Base 9.1~
+ glUniformMatrix2x4fv@Base 9.1~
  glUniformMatrix3fv@Base 7.8.1
+ glUniformMatrix3x2fv@Base 9.1~
+ glUniformMatrix3x4fv@Base 9.1~
  glUniformMatrix4fv@Base 7.8.1
+ glUniformMatrix4x2fv@Base 9.1~
+ glUniformMatrix4x3fv@Base 9.1~
+ glUnmapBuffer@Base 9.1~
  glUnmapBufferOES@Base 7.8.1
  glUseProgram@Base 7.8.1
  glValidateProgram@Base 7.8.1
@@ -160,5 +259,12 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
  glVertexAttrib3fv@Base 7.8.1
  glVertexAttrib4f@Base 7.8.1
  glVertexAttrib4fv@Base 7.8.1
+ glVertexAttribDivisor@Base 9.1~
+ glVertexAttribI4i@Base 9.1~
+ glVertexAttribI4iv@Base 9.1~
+ glVertexAttribI4ui@Base 9.1~
+ glVertexAttribI4uiv@Base 9.1~
+ glVertexAttribIPointer@Base 9.1~
  glVertexAttribPointer@Base 7.8.1
  glViewport@Base 7.8.1
+ glWaitSync@Base 9.1~
diff --git a/debian/libxatracker1.symbols b/debian/libxatracker1.symbols
index d36a9e78b4d..26d038e4064 100644
--- a/debian/libxatracker1.symbols
+++ b/debian/libxatracker1.symbols
@@ -1,4 +1,5 @@
 libxatracker.so.1 libxatracker1 #MINVER#
+ driver_descriptor@Base 9.1~
  xa_composite_allocation@Base 0
  xa_composite_check_accelerated@Base 0
  xa_composite_done@Base 0
diff --git a/debian/not-installed b/debian/not-installed
index 8fdb25bb75a..67dd2b5ca54 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,9 +3,11 @@
 # Common list:
 NOT_INSTALLED := \
 	dri/etc/drirc \
-	dri/usr/include/GL/vms_x_fix.h \
 	dri/usr/include/GL/wglext.h \
 	dri/usr/include/GL/wmesa.h \
+	dri/usr/include/GLES3/gl3platform.h \
+	dri/usr/include/GLES3/gl3ext.h \
+	dri/usr/include/GLES3/gl3.h \
 	dri/usr/lib/*/libGL.so \
 	dri/usr/lib/*/pkgconfig/gl.pc \
 	usr/include/GL/glext.h \
@@ -15,7 +17,6 @@ NOT_INSTALLED := \
 	usr/include/GL/glx.h \
 	usr/include/GL/glx_mangle.h \
 	usr/include/GL/osmesa.h \
-	usr/include/GL/vms_x_fix.h \
 	usr/include/GL/wglext.h \
 	usr/include/GL/wmesa.h
 
diff --git a/debian/patches/15-fix-llvmpipe-test-linking.diff b/debian/patches/15-fix-llvmpipe-test-linking.diff
deleted file mode 100644
index 92893a32bac..00000000000
--- a/debian/patches/15-fix-llvmpipe-test-linking.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 7e2e29c67f8fc8ec72c2dc8544428fdd86b21353 Mon Sep 17 00:00:00 2001
-From: Olivier Blin <dev@blino.org>
-Date: Sat, 4 Aug 2012 00:29:45 +0200
-Subject: [PATCH] gallium: only link static archives between ld start/end group options
-
-llvmpipe test programs failed to link with --as-needed ld option,
-since dynamic libraries were mixed with static libraries between the
-ld --start-group and --end-group options.
-
-gd3d1x likely had the same issue.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52167
----
- src/gallium/Makefile.template                    | 2 +-
- src/gallium/drivers/llvmpipe/Makefile            | 3 ++-
- src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
-index 036c119..c30477a 100644
---- a/src/gallium/Makefile.template
-+++ b/src/gallium/Makefile.template
-@@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURC
- 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
- 
- $(PROGS): % : %.o $(PROGS_DEPS)
--	$(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
-+	$(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group $(LDADD)
- 
- # Emacs tags
- tags:
-diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
-index ef16fc7..35f8fe8 100644
---- a/src/gallium/drivers/llvmpipe/Makefile
-+++ b/src/gallium/drivers/llvmpipe/Makefile
-@@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxil
- 	$(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
- 
- LDFLAGS += $(LLVM_LDFLAGS)
--LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
-+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a
-+LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS)
- LD=$(CXX)
- 
- $(PROGS): lp_test_main.o libllvmpipe.a
-diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
-index 32d2956..f9cad05 100644
---- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
-+++ b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
-@@ -3,5 +3,6 @@ CPP_SOURCES=$(wildcard *.cpp)
- LIBRARY_INCLUDES=-Iinclude -I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../d3d1xshader/include -I../../../include -I../../../auxiliary -I../../../state_trackers/egl/common
- PROGS=tools/dxbc2tgsi
- PROGS_DEPS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a ../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a
--LIBS=$(PROGS_DEPS) -ldl
-+LIBS=$(PROGS_DEPS)
-+LDADD=-ldl
- include ../Makefile.inc
--- 
-1.7.11.4
-
-
diff --git a/debian/patches/15-fix-oot-build.diff b/debian/patches/15-fix-oot-build.diff
new file mode 100644
index 00000000000..76047668d2b
--- /dev/null
+++ b/debian/patches/15-fix-oot-build.diff
@@ -0,0 +1,22 @@
+diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
+index d647a64..d770699 100644
+--- a/src/gallium/state_trackers/egl/Makefile.am
++++ b/src/gallium/state_trackers/egl/Makefile.am
+@@ -27,7 +27,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
+ AM_CFLAGS = $(GALLIUM_CFLAGS)
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/egl/main \
+-	-I$(top_srcdir)/src/egl/wayland/wayland-drm/ \
++	-I$(top_builddir)/src/egl/wayland/wayland-drm/ \
+ 	-I$(top_srcdir)/include
+ 
+ noinst_LTLIBRARIES = libegl.la
+@@ -71,7 +71,7 @@ AM_CFLAGS += \
+ AM_CPPFLAGS += \
+ 	-I$(top_srcdir)/src/gallium/winsys \
+ 	-I$(top_srcdir)/src/egl/wayland/wayland-egl \
+-	-I$(top_srcdir)/src/egl/wayland/wayland-drm \
++	-I$(top_builddir)/src/egl/wayland/wayland-drm \
+ 	-DHAVE_WAYLAND_BACKEND
+ endif
+ 
diff --git a/debian/patches/16-radeon-ndebug.diff b/debian/patches/16-radeon-ndebug.diff
deleted file mode 100644
index afdbda6eec9..00000000000
--- a/debian/patches/16-radeon-ndebug.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 7f1c613..2dfad85 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -14,7 +14,7 @@ CXXFLAGS+= $(LLVM_CXXFLAGS)
- 
- include ../../Makefile.template
- 
--CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS))
-+CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS)) -DNDEBUG
- 
- tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
- 
diff --git a/debian/patches/series b/debian/patches/series
index c959e9c1dcc..9ffbdea5ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@
 10-hurd-configure-tweaks.diff
 #11-hurd-ftbfs-again.diff
 14-fix-osmesa-build.diff
-15-fix-llvmpipe-test-linking.diff
-16-radeon-ndebug.diff
+15-fix-oot-build.diff
diff --git a/debian/rules b/debian/rules
index a4127c110d0..bfe04a5a4f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,7 +190,7 @@ $(STAMP)-build-%: configure
 	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
 	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --localstatedir=/var $(confflags) $(confflags-$*) \
-	             ac_cv_path_LLVM_CONFIG=llvm-config-3.1
+	             ac_cv_path_LLVM_CONFIG=llvm-config-3.2
 	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
 	>$@
 
@@ -229,6 +229,7 @@ clean: unpatch
 	rm -f src/glsl/builtins/tools/texture_builtins.pyc
 	rm -f src/mapi/glapi/gen/*.pyc
 	rm -f src/mesa/main/*.pyc
+	rm -f src/gallium/auxiliary/util/*.pyc
 
 	dh_clean