configure.ac | 2 +-
debian/changelog | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 028a4ce874af9389da421d08f3b1559a3f19d11d
Author: Julien Cristau <jcris...@debian.org>
Date: Thu May 30 11:29:54 2013 +0200
Changelog entry
diff --git a/debian/changelog b/debian/changelog
index deed47b..3baa173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (9.1.3-2) UNRELEASED; urgency=low
+
+ * Fix build of swrast only without libdrm, causing build failure on hurd
+ (cherry-picked from upstream). Thanks, Andreas Boll!
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 30 May 2013 11:28:21 +0200
+
mesa (9.1.3-1) experimental; urgency=low
* Team upload.
commit 9d36e513b8a6183ac66b3aee222386570f8d3f8f
Author: Daniel Martin <consume.no...@gmail.com>
Date: Thu Feb 28 19:39:06 2013 +0100
Fix build of swrast only without libdrm
Reviewed-by: Matt Turner <matts...@gmail.com>
Signed-off-by: Daniel Martin <consume.no...@gmail.com>
(cherry picked from commit 998d975e38db7478781130b42a4fb68d6b181055)
diff --git a/configure.ac b/configure.ac
index 36065f1..5da5220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1078,7 +1078,7 @@ if test "x$enable_dri" = xyes; then
fi
# if we are building any dri driver other than swrast or using the dri
state tracker ...
- if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast || test "x$enable_dri" =
xyes; then
+ if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast -a "x$enable_dri" =
xyes; then
# ... libdrm is required
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uhzbw-0008i0...@vasks.debian.org
