debian/changelog | 12 +++++++++ debian/patches/aarch64.patch | 39 +++++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/patches/xf86-detach-scanout.patch | 2 - 4 files changed, 54 insertions(+), 1 deletion(-)
New commits: commit 43f7a2db974a02d4e8c6b8adbc23af5e85594a20 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Tue Jul 30 12:59:03 2013 +0200 Oops, refresh xf86-detach-scanout, embarassing bug in the for check. diff --git a/debian/changelog b/debian/changelog index 8fe038a..b7763a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.14.2-0ubuntu3) saucy; urgency=low + + * Oops, refresh xf86-detach-scanout, embarassing bug in the for check. + + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 30 Jul 2013 12:51:40 +0200 + xorg-server (2:1.14.2-0ubuntu2) saucy; urgency=low * Add support for Aarch64. diff --git a/debian/patches/xf86-detach-scanout.patch b/debian/patches/xf86-detach-scanout.patch index 9226590..b994845 100644 --- a/debian/patches/xf86-detach-scanout.patch +++ b/debian/patches/xf86-detach-scanout.patch @@ -37,7 +37,7 @@ Dave, does this seem like a reasonable way to work around this particular crash? + int i; + + /* make sure there are no attached shared scanout pixmaps first */ -+ for (i = 0; i < rp && rp->numCrtcs; i++) ++ for (i = 0; rp && i < rp->numCrtcs; i++) + RRCrtcDetachScanoutPixmap(rp->crtcs[i]); + + DetachOutputGPU(pScreen); commit c498e23e7561395a0e603ed76e18ff940cfa3587 Author: Matthias Klose <d...@ubuntu.com> Date: Tue Jul 30 12:58:00 2013 +0200 Add support for Aarch64. diff --git a/debian/changelog b/debian/changelog index cdc07ce..8fe038a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.14.2-0ubuntu2) saucy; urgency=low + + * Add support for Aarch64. + + -- Matthias Klose <d...@ubuntu.com> Wed, 24 Jul 2013 14:24:25 +0200 + xorg-server (2:1.14.2-0ubuntu1) saucy; urgency=low * New upstream release. (LP: #1156498) diff --git a/debian/patches/aarch64.patch b/debian/patches/aarch64.patch new file mode 100644 index 0000000..c24c415 --- /dev/null +++ b/debian/patches/aarch64.patch @@ -0,0 +1,39 @@ +Author: Marcin Juszkiewicz <marcin.juszkiew...@linaro.org> + +Upstream-status: not sent yet + +--- + hw/xfree86/os-support/linux/lnx_video.c | 4 ++-- + include/servermd.h | 7 +++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +Index: b/hw/xfree86/os-support/linux/lnx_video.c +=================================================================== +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -58,6 +58,7 @@ + !defined(__sparc__) && \ + !defined(__mips__) && \ + !defined(__nds32__) && \ ++ !defined(__aarch64__) && \ + !defined(__arm__) + + /* +Index: b/include/servermd.h +=================================================================== +--- a/include/servermd.h ++++ b/include/servermd.h +@@ -245,6 +245,13 @@ + /* ???? */ + #endif /* AMD64 */ + ++#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) ++#define IMAGE_BYTE_ORDER MSBFirst ++#define BITMAP_BIT_ORDER MSBFirst ++#define GLYPHPADBYTES 4 ++/* ???? */ ++#endif /* AArch64 */ ++ + #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ + defined(__alpha__) || defined(__alpha) || \ + defined(__i386__) || \ diff --git a/debian/patches/series b/debian/patches/series index 22b1497..37a75fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,3 +54,5 @@ autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch config-add-no-removal.patch include-selection-h.patch xf86-detach-scanout.patch + +aarch64.patch -- 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/e1v47pl-0004un...@vasks.debian.org