xorg-server: Changes to 'ubuntu+1'
debian/changelog | 7 +++++++
debian/patches/157_check_null_modes.patch | 14 --------------
debian/patches/162_null_crtc_in_rotation.patch | 14 --------------
debian/patches/167_nullptr_xisbread.patch | 14 --------------
debian/patches/series | 11 +++++++----
5 files changed, 14 insertions(+), 46 deletions(-)
New commits:
commit c01147b8cdc8d7377b33679b5e1c9a743d6f61de
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 7 16:12:29 2013 -0800
Drop 167 - fixed upstream in a different way
Upstream chose to fix the bug by reworking the code which was passing
XisbRead the null pointer.
This patch is essentially harmless, but it could be hiding other bugs.
Only way we can be certain is to drop the patch and see what turns up.
diff --git a/debian/changelog b/debian/changelog
index a0dc76d..a85064a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.13.99.901-0ubuntu1) UNRELEASED; urgency=low
* 157_check_null_modes.patch: Dropped, patch included upstream.
* 162_null_crtc_in_rotation.patch: Dropped, no longer relevant
(see LP: 139990)
+ * 167_nullptr_xisbread.patch: Dropped, fixed differently upstream.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 07 Feb 2013 20:25:26 +0200
diff --git a/debian/patches/167_nullptr_xisbread.patch b/debian/patches/167_nullptr_xisbread.patch
deleted file mode 100644
index 6bc6298..0000000
--- a/debian/patches/167_nullptr_xisbread.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
-index 3568a57..6eaf594 100644
---- a/hw/xfree86/common/xisb.c
-+++ b/hw/xfree86/common/xisb.c
-@@ -96,6 +96,9 @@ XisbRead(XISBuffer * b)
- {
- int ret;
-
-+ if (b == NULL)
-+ return -2;
-+
- if (b->current >= b->end) {
- if (b->block_duration >= 0) {
- if (xf86WaitForInput(b->fd, b->block_duration) < 1)
diff --git a/debian/patches/series b/debian/patches/series
index 2f4b7af..3bfda7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,7 +26,6 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=20742
## To send upstream
-167_nullptr_xisbread.patch
208_switch_on_release.diff
227_null_ptr_midispcur.patch
232-xf86compatoutput-valgrind.patch
commit 7dff2ef5fbda6da30bd29adbae71338ab53ee3f4
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 7 16:09:49 2013 -0800
Patch 165 was sent upstream via bugzilla
diff --git a/debian/patches/series b/debian/patches/series
index b641d45..2f4b7af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,8 +22,10 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=27134
# http://lists.x.org/archives/xorg-devel/2010-April/007777.html
-## To send upstream
165_man_xorg_conf_no_device_ident.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=20742
+
+## To send upstream
167_nullptr_xisbread.patch
208_switch_on_release.diff
227_null_ptr_midispcur.patch
commit bea77bd9ab8d27fa401b1fa9f242b3afcd12eff3
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 7 15:52:20 2013 -0800
Drop 162_null_crtc_in_rotation.patch as no longer relevant
We've carried this patch for a few years, meantime a number of
improvements have been made to upstream handling of multi-GPU.
We're going to optimistically drop this patch in hopes that whatever
situation led to the crash are long since gone. This bug is kind of a
corner case we don't expect very many people to encounter, so this is a
low risk way of handling it. However, if anyone does see this still
happening, please file a new bug report (and reference this one).
(LP: #139990)
diff --git a/debian/changelog b/debian/changelog
index 2af8b1d..a0dc76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.13.99.901-0ubuntu1) UNRELEASED; urgency=low
[ Bryce Harrington ]
* 157_check_null_modes.patch: Dropped, patch included upstream.
+ * 162_null_crtc_in_rotation.patch: Dropped, no longer relevant
+ (see LP: 139990)
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 07 Feb 2013 20:25:26 +0200
diff --git a/debian/patches/162_null_crtc_in_rotation.patch b/debian/patches/162_null_crtc_in_rotation.patch
deleted file mode 100644
index de6ae55..0000000
--- a/debian/patches/162_null_crtc_in_rotation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index a773c34..f9ebb5f 100644
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -927,7 +927,8 @@ xf86RandR12SetRotations(ScreenPtr pScreen, Rotation rotations)
- for (c = 0; c < config->num_crtc; c++) {
- xf86CrtcPtr crtc = config->crtc[c];
-
-- RRCrtcSetRotations(crtc->randr_crtc, rotations);
-+ if (crtc != NULL)
-+ RRCrtcSetRotations(crtc->randr_crtc, rotations);
- }
- #endif
- randrp->supported_rotations = rotations;
diff --git a/debian/patches/series b/debian/patches/series
index 689301a..b641d45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,7 +23,6 @@
# http://lists.x.org/archives/xorg-devel/2010-April/007777.html
## To send upstream
-162_null_crtc_in_rotation.patch
165_man_xorg_conf_no_device_ident.patch
167_nullptr_xisbread.patch
208_switch_on_release.diff
commit ff5c0199edd69514d4c52efab0d96fdf674ec3d7
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 7 14:51:37 2013 -0800
Drop 157_check_null_modes.patch - already included in source
This patch (for LP: #300310) was sent upstream in 2009 to fdo #19643.
That bug was closed as fixed (without actually taking the patch) in
2010. Meanwhile, the bug had also been reported to fdo #17431, which
received a fix in 2011 identical to ours, which was accepted upstream as
commit 6105fcaa3592cb6d0d5f22d9b850986d0bc4d241.
diff --git a/debian/changelog b/debian/changelog
index e7aeab9..2af8b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xorg-server (2:1.13.99.901-0ubuntu1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Merge from unreleased debian git.
* 500_pointer_barrier_thresholds.diff: Dropped, implemented upstream.
+ [ Bryce Harrington ]
+ * 157_check_null_modes.patch: Dropped, patch included upstream.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 07 Feb 2013 20:25:26 +0200
xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
diff --git a/debian/patches/157_check_null_modes.patch b/debian/patches/157_check_null_modes.patch
deleted file mode 100644
index e7fbd2a..0000000
--- a/debian/patches/157_check_null_modes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
-index 13ffe06..4cc8ca5 100644
---- a/hw/xfree86/common/xf86VidMode.c
-+++ b/hw/xfree86/common/xf86VidMode.c
-@@ -224,6 +224,9 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
- return FALSE;
-
- pVidMode = VMPTR(pScrn->pScreen);
-+ if (pScrn->modes == NULL)
-+ return FALSE;
-+
- pVidMode->First = pScrn->modes;
- pVidMode->Next = pVidMode->First->next;
-
diff --git a/debian/patches/series b/debian/patches/series
index 642411e..689301a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,7 +23,6 @@
# http://lists.x.org/archives/xorg-devel/2010-April/007777.html
## To send upstream
-157_check_null_modes.patch
162_null_crtc_in_rotation.patch
165_man_xorg_conf_no_device_ident.patch
167_nullptr_xisbread.patch
commit fd995d649331ec7d7165bcb345c8c2167e1b67ef
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 7 14:42:13 2013 -0800
Patch 122 came from an upstream bug report.
I've updated the bug report with our current version of the patch.
diff --git a/debian/patches/series b/debian/patches/series
index 41a9bde..642411e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,8 +17,12 @@
# drop after desktop support arrives
228_autobind_gpu.patch
-## send upstream
+## In progress upstream
122_xext_fix_card32_overflow_in_xauth.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=27134
+# http://lists.x.org/archives/xorg-devel/2010-April/007777.html
+
+## To send upstream
157_check_null_modes.patch
162_null_crtc_in_rotation.patch
165_man_xorg_conf_no_device_ident.patch
Reply to: