mesa: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit e35a4e00e85b39e23034cc7f27559c3c0d6bf71e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 17 11:37:22 2011 +0200
Prepend the multiarch dir to the dri driver search path.
${ORIGIN}/dri works for libGL, but not for egl_dri2.so (which lives in
/usr/lib/*/egl/). Thanks to Michel Dänzer for the heads-up!
diff --git a/debian/changelog b/debian/changelog
index 57e410d..22874c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (7.10.3-2) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Add Breaks against nvidia and fglrx packages, since they are also
affected by the multiarch changes, and need fixing. Until fixed
packages reach the archive, nvidia and fglrx users should stick to
@@ -8,6 +9,11 @@ mesa (7.10.3-2) UNRELEASED; urgency=low
* Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the
report and the patch, Fabio Pedretti!
+ [ Julien Cristau ]
+ * Prepend the multiarch dir to the dri driver search path. ${ORIGIN}/dri
+ works for libGL, but not for egl_dri2.so (which lives in /usr/lib/*/egl/).
+ Thanks to Michel Dänzer for the heads-up!
+
-- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:09:10 +0200
mesa (7.10.3-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 843c4bf..cedef45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
- --with-dri-searchpath='\$$$${ORIGIN}/dri:/usr/lib/dri' \
+ --with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
Reply to: