debian/changelog | 9 +++++++++ debian/control | 2 +- debian/patches/101_copy-fb.patch | 17 ++++++++++------- 3 files changed, 20 insertions(+), 8 deletions(-)
New commits: commit 764cef45acebe1cd054478670889bd59a1f38464 Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Mon Aug 2 15:57:05 2010 +1000 Update for Xserver 1.9 diff --git a/debian/changelog b/debian/changelog index 0f16d5e..0343ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-video-intel (2:2.12.0-1ubuntu3) UNRELEASED; urgency=low + + * debian/patches/101_copy-fb.patch: + + Update for Xserver 1.9 + * debian/control: + + Bump build-depends on xserver-xorg-dev to ensure we pick up the new ABI + + -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 02 Aug 2010 15:54:36 +1000 + xserver-xorg-video-intel (2:2.12.0-1ubuntu2) maverick; urgency=low * Re-add 102-disable-page-flipping-v2.patch. Spate of freeze bugs: recieved. diff --git a/debian/control b/debian/control index 39b8a77..5b8d934 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons <dpars...@debian.or Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.8.99.905), x11proto-core-dev, x11proto-fonts-dev, x11proto-xinerama-dev, diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch index 8f41c33..2af70c1 100644 --- a/debian/patches/101_copy-fb.patch +++ b/debian/patches/101_copy-fb.patch @@ -1,7 +1,7 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c =================================================================== ---- xserver-xorg-video-intel.orig/src/drmmode_display.c 2010-07-19 16:53:00.804605145 +0200 -+++ xserver-xorg-video-intel/src/drmmode_display.c 2010-07-21 11:45:20.603191502 +0200 +--- xserver-xorg-video-intel.orig/src/drmmode_display.c 2010-08-02 15:19:02.007854556 +1000 ++++ xserver-xorg-video-intel/src/drmmode_display.c 2010-08-02 15:19:03.687916333 +1000 @@ -36,6 +36,8 @@ #include <errno.h> #include <poll.h> @@ -133,8 +133,8 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c +} Index: xserver-xorg-video-intel/src/i830.h =================================================================== ---- xserver-xorg-video-intel.orig/src/i830.h 2010-07-19 16:53:00.814605145 +0200 -+++ xserver-xorg-video-intel/src/i830.h 2010-07-21 11:44:42.133191502 +0200 +--- xserver-xorg-video-intel.orig/src/i830.h 2010-08-02 15:19:02.017854924 +1000 ++++ xserver-xorg-video-intel/src/i830.h 2010-08-02 15:19:03.687916333 +1000 @@ -423,6 +423,7 @@ OptionInfoPtr Options; @@ -153,8 +153,8 @@ Index: xserver-xorg-video-intel/src/i830.h extern int i830_crtc_to_pipe(xf86CrtcPtr crtc); Index: xserver-xorg-video-intel/src/i830_driver.c =================================================================== ---- xserver-xorg-video-intel.orig/src/i830_driver.c 2010-07-19 16:53:00.834605145 +0200 -+++ xserver-xorg-video-intel/src/i830_driver.c 2010-07-21 11:44:42.133191502 +0200 +--- xserver-xorg-video-intel.orig/src/i830_driver.c 2010-08-02 15:19:02.027855292 +1000 ++++ xserver-xorg-video-intel/src/i830_driver.c 2010-08-02 15:19:23.298637400 +1000 @@ -1093,6 +1093,8 @@ if (IS_I965G(intel)) gen4_render_state_init(scrn); @@ -172,10 +172,13 @@ Index: xserver-xorg-video-intel/src/i830_driver.c intel->suspended = FALSE; return uxa_resources_init(screen); -@@ -1289,6 +1292,8 @@ +@@ -1289,6 +1292,11 @@ i830_set_gem_max_sizes(scrn); ++ if (!CreateScratchPixmapsForScreen(scrn->scrnIndex)) ++ return FALSE; ++ + drmmode_copy_fb(scrn); + if (!xf86SetDesiredModes(scrn)) -- 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/e1ofo1c-0000qa...@alioth.debian.org