debian/control | 5 ++++- debian/rules | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit e5fdae2e56fabf5ce8eee9a467ee19231edef2d4 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Wed Mar 5 17:33:37 2014 +0100 bump depends, enable builtin glamor, conflict with glamor. For what good it will do, x11proto-core-dev and x11proto-fonts-dev still need a bump. diff --git a/debian/control b/debian/control index f3480dc..966d36d 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Build-Depends: x11proto-xf86vidmode-dev (>= 2.2.99.1), x11proto-present-dev, x11proto-dri3-dev, - xtrans-dev (>= 1.3.2), + xtrans-dev (>= 1.3.3), libxau-dev (>= 1:1.0.5-2), x11proto-input-dev (>= 2.3), x11proto-dri2-dev (>= 2.8), @@ -45,6 +45,7 @@ Build-Depends: libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.27.2), libpciaccess-dev (>= 0.12.901), + libepoxy-dev, libgcrypt-dev, nettle-dev, libdbus-1-dev [kfreebsd-any], @@ -140,6 +141,8 @@ Breaks: unity (<< 7.0.2), libxfixes3 (<< 1:5.0.1), libxi6 (<< 2:1.7.1.901), + xserver-xorg-glamoregl, + xserver-xorg-video-glamoregl, Conflicts: xserver-xorg-input-evtouch, Provides: diff --git a/debian/rules b/debian/rules index 3db0592..cc3c94e 100755 --- a/debian/rules +++ b/debian/rules @@ -162,6 +162,7 @@ confflags_main = \ --enable-xnest \ --enable-kdrive \ --enable-xephyr \ + --enable-glamor \ $(build_xfbdev) \ $(build_xmir) \ --with-sha1=libgcrypt \ @@ -195,6 +196,7 @@ confflags_udeb = \ --disable-xnest \ --disable-kdrive \ --disable-xephyr \ + --disable-glamor \ --disable-xfbdev \ --disable-xmir \ --with-sha1=libnettle \ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wlemk-0006rr...@moszumanska.debian.org