Change the dri driver search path to fix ia32-libs

Set the DRI driver search path to "${ORIGIN}/dri", allowing libGL to
find the drivers after being relocated to /usr/lib32 by ia32-libs
(closes: #466790).  Thanks to Javier Serrano Polo for the suggestion.

diff --git a/debian/changelog b/debian/changelog
index b372781..2b4130b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 mesa (7.10-5) UNRELEASED; urgency=low
 
+  [ Cyril Brulebois ]
   * Revert to r600 classic, r600 gallium doesn't seem ready yet, after all
     (Closes: #612609).
 
+  [ Julien Cristau ]
+  * Set the DRI driver search path to "${ORIGIN}/dri", allowing libGL to find
+    the drivers after being relocated to /usr/lib32 by ia32-libs
+    (closes: #466790).  Thanks to Javier Serrano Polo for the suggestion.
+
  -- Cyril Brulebois <kibi@debian.org>  Thu, 17 Feb 2011 15:43:30 +0100
 
 mesa (7.10-4) unstable; urgency=low

diff --git a/debian/rules b/debian/rules
index cfe6d38..483bd84 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,7 @@ confflags-dri = \
        --with-driver=dri \
        --with-dri-drivers="$(DRI_DRIVERS)" \
        --with-dri-driverdir=/usr/lib/dri \
+       --with-dri-searchpath='\$$$${ORIGIN}/dri' \
        --enable-glx-tls \
        $(confflags_DIRECT_RENDERING) \
        $(confflags_EGL) \