debian/changelog | 8 ++++++++
debian/patches/101_copy-fb.patch | 14 +++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 4012088e04a2154843d03244cea077ede200bdc1
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Aug 9 22:03:43 2011 +1000
Fix fixed 101_copy-fb so that X actually starts
diff --git a/debian/changelog b/debian/changelog
index b3f5c8e..263e290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.15.901-1ubuntu2) oneiric; urgency=low
+
+ * 101_copy-fb.patch: intel_batch_submit_internal is no longer added by
+ this patch. Don't reference it. Fixes Xserver failing to start
+ with symbol error.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 09 Aug 2011
22:03:12 +1000
+
xserver-xorg-video-intel (2:2.15.901-1ubuntu1) oneiric; urgency=low
[ Robert Hooker ]
diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index c8c15cb..e827abb 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/intel.h
===================================================================
---- xserver-xorg-video-intel.orig/src/intel.h 2011-08-08 11:07:56.000000000
+1000
-+++ xserver-xorg-video-intel/src/intel.h 2011-08-08 11:08:50.721290693
+1000
+--- xserver-xorg-video-intel.orig/src/intel.h 2011-08-09 10:04:02.184071019
+1000
++++ xserver-xorg-video-intel/src/intel.h 2011-08-09 21:39:33.292370844
+1000
@@ -436,6 +436,7 @@
OptionInfoPtr Options;
@@ -20,8 +20,8 @@ Index: xserver-xorg-video-intel/src/intel.h
DRI2_SWAP,
Index: xserver-xorg-video-intel/src/intel_display.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_display.c 2011-07-25
16:21:36.000000000 +1000
-+++ xserver-xorg-video-intel/src/intel_display.c 2011-08-08
11:08:50.721290693 +1000
+--- xserver-xorg-video-intel.orig/src/intel_display.c 2011-08-09
10:04:02.164071017 +1000
++++ xserver-xorg-video-intel/src/intel_display.c 2011-08-09
21:40:03.962371167 +1000
@@ -36,6 +36,8 @@
#include <errno.h>
#include <poll.h>
@@ -151,7 +151,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
+
+ intel->uxa_driver->done_copy(dst);
+
-+ intel_batch_submit_internal(scrn, TRUE);
++ intel_batch_submit(scrn);
+
+ (*pScreen->DestroyPixmap)(src);
+ (*pScreen->DestroyPixmap)(dst);
@@ -160,8 +160,8 @@ Index: xserver-xorg-video-intel/src/intel_display.c
+
Index: xserver-xorg-video-intel/src/intel_driver.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-07-25
16:21:36.000000000 +1000
-+++ xserver-xorg-video-intel/src/intel_driver.c 2011-08-08
11:08:50.721290693 +1000
+--- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-08-09
10:04:02.144071018 +1000
++++ xserver-xorg-video-intel/src/intel_driver.c 2011-08-09
21:39:33.292370844 +1000
@@ -942,6 +942,10 @@
intel->directRenderingType = DRI_DRI2;
#endif
--
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/e1qqlgl-0005tt...@vasks.debian.org
