xorg-server: Changes to 'debian-experimental'
debian/changelog | 7 +++++++
debian/control | 3 +++
debian/rules | 9 ++-------
3 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit b8ef40d8922c76c6efc62fa3055cca1968f7a1de
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 23 20:29:52 2014 +0200
Enable glamor.
diff --git a/debian/changelog b/debian/changelog
index 0f9b7da..9b4b6e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.15.99.902-2) UNRELEASED; urgency=medium
* Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
+ * Enable glamor.
-- Julien Cristau <jcristau@debian.org> Wed, 23 Apr 2014 20:28:34 +0200
diff --git a/debian/control b/debian/control
index dcb80ea..15468fe 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,9 @@ Build-Depends:
libxv-dev,
libxinerama-dev,
libxshmfence-dev (>= 1.1) [!hurd-i386],
+# glamor
+ libepoxy-dev [linux-any kfreebsd-any],
+ libgbm-dev [linux-any],
# XCB bits for Xephyr
libxcb1-dev,
libxcb-shape0-dev,
diff --git a/debian/rules b/debian/rules
index 98f5d96..9020090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2 --disable-dri3
else
dri = --enable-dri --enable-dri2 --enable-dri3
+ dri += --enable-glamor
endif
config_backend = --disable-config-dbus --disable-config-hal
commit 225637e49835a0c6024ba58bfa358ef00af902fa
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 23 20:29:13 2014 +0200
Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
diff --git a/debian/changelog b/debian/changelog
index e70fbd9..0f9b7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.902-2) UNRELEASED; urgency=medium
+
+ * Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 23 Apr 2014 20:28:34 +0200
+
xorg-server (2:1.15.99.902-1) experimental; urgency=medium
* New upstream snapshot.
diff --git a/debian/rules b/debian/rules
index 2836310..98f5d96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,13 +52,7 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2 --disable-dri3
else
- 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
+ dri = --enable-dri --enable-dri2 --enable-dri3
endif
config_backend = --disable-config-dbus --disable-config-hal
Reply to: