diff -u mesa-11.2.1/debian/changelog mesa-11.2.1/debian/changelog
--- mesa-11.2.1/debian/changelog
+++ mesa-11.2.1/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.2.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * fix glsl compiler.  LP: #1585942.
+
+ -- Steve Langasek <tjaalton@debian.org>  Fri, 10 Jun 2016 01:33:00 +0000
+
 mesa (11.2.1-1ubuntu1) yakkety; urgency=medium
 
   * Merge from Debian.
diff -u mesa-11.2.1/debian/patches/series mesa-11.2.1/debian/patches/series
--- mesa-11.2.1/debian/patches/series
+++ mesa-11.2.1/debian/patches/series
@@ -1,3 +1,4 @@
+fix_wrong_uniform_locations.patch
 07_gallium-fix-build-failure-on-powerpcspe.diff
 
 
only in patch2:
unchanged:
--- mesa-11.2.1.orig/debian/patches/fix_wrong_uniform_locations.patch
+++ mesa-11.2.1/debian/patches/fix_wrong_uniform_locations.patch
@@ -0,0 +1,13 @@
+Index: mesa-11.2.1/src/compiler/glsl/linker.cpp
+===================================================================
+--- mesa-11.2.1.orig/src/compiler/glsl/linker.cpp
++++ mesa-11.2.1/src/compiler/glsl/linker.cpp
+@@ -4337,6 +4337,8 @@ link_shaders(struct gl_context *ctx, str
+    }
+ 
+    num_explicit_uniform_locs = check_explicit_uniform_locations(ctx, prog);
++   if ((int)num_explicit_uniform_locs == -1)
++      num_explicit_uniform_locs = 0;
+    link_assign_subroutine_types(prog);
+ 
+    if (!prog->LinkStatus)