debian/changelog | 6 ++++++
debian/rules | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 4bcd9fdf387fba18efe405a47823766541db5162
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Apr 13 21:17:12 2009 +0100
Disable dri2 on hurd-i386.
Thanks, Samuel Thibault!
diff --git a/debian/changelog b/debian/changelog
index d8bfde9..e747495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.6.0-2) UNRELEASED; urgency=low
+
+ * Disable dri2 on hurd-i386. Thanks, Samuel Thibault!
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 13 Apr 2009 21:16:49 +0100
+
xorg-server (2:1.6.0-1) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/rules b/debian/rules
index c9af5bc..aa2941a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,12 @@ else
selinux = --disable-xselinux
endif
+ifeq ($(DEB_HOST_ARCH), hurd-i386)
+ dri2 = --disable-dri2
+else
+ dri2 = --enable-dri2
+endif
+
INSTALL=/usr/bin/install
VENDOR = $(shell lsb_release -i -s)
@@ -72,7 +78,7 @@ confflags += --disable-static \
--with-os-vendor="$(VENDOR)" \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
--with-int10=x86emu \
- --enable-dri2
+ $(dri2)
configure: $(STAMP_DIR)/patch
dh_testdir
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
