debian/changelog |    5 +++--
 debian/rules     |    8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 370606acf2e5be14b5b05ee5de499212da8a5934
Author: Julien Cristau <jcris...@debian.org>
Date:   Sat Dec 14 18:16:26 2013 +0100

    Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 61159df..0809f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.99.904-2) UNRELEASED; urgency=medium
+xorg-server (2:1.14.99.904-2) experimental; urgency=medium
 
   * Pass VERBOSE=1 to make check to make debugging test failures possible.
   * Disable dri3 on kfreebsd.  xtrans doesn't enable fd passing there yet.
 
- -- Julien Cristau <jcris...@debian.org>  Thu, 12 Dec 2013 18:35:21 +0100
+ -- Julien Cristau <jcris...@debian.org>  Sat, 14 Dec 2013 18:16:17 +0100
 
 xorg-server (2:1.14.99.904-1) experimental; urgency=low
 

commit ce9a79990e68d68181aabcadaf9adb354d0752d9
Author: Julien Cristau <jcris...@debian.org>
Date:   Sat Dec 14 18:12:05 2013 +0100

    Disable dri3 on kfreebsd.
    
    xtrans doesn't enable fd passing there yet.

diff --git a/debian/changelog b/debian/changelog
index b7298df..61159df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.14.99.904-2) UNRELEASED; urgency=medium
 
   * Pass VERBOSE=1 to make check to make debugging test failures possible.
+  * Disable dri3 on kfreebsd.  xtrans doesn't enable fd passing there yet.
 
  -- Julien Cristau <jcris...@debian.org>  Thu, 12 Dec 2013 18:35:21 +0100
 
diff --git a/debian/rules b/debian/rules
index d76059d..89c54aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,13 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
        dri = --disable-dri --disable-dri2 --disable-dri3
 else
-       dri = --enable-dri --enable-dri2 --enable-dri3
+       dri = --enable-dri --enable-dri2
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+       dri += --enable-dri3
+else
+       # disable dri3 on kbsd until xtrans fd passing is enabled
+       dri += --disable-dri3
+endif
 endif
 
 config_backend = --disable-config-dbus


-- 
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/e1vrt5p-0001pq...@moszumanska.debian.org

Reply via email to