xserver-xorg-video-nouveau: Changes to 'debian-unstable'
ChangeLog | 101 + configure.ac |5 - debian/changelog |7 ++ debian/patches/02-link-against-libdrm.diff | 42 debian/patches/series |1 src/Makefile.am| 20 + src/drmmode_display.c | 52 -- src/nouveau_xv.c | 36 -- src/nv_driver.c|2 src/nvc0_accel.c | 33 - src/shader/Makefile| 15 src/shader/exac8nvf0.fp| 42 src/shader/exac8nvf0.fpc | 28 src/shader/exacanvf0.fp| 43 src/shader/exacanvf0.fpc | 30 src/shader/exacmnvf0.fp| 43 src/shader/exacmnvf0.fpc | 30 src/shader/exas8nvf0.fp| 38 ++ src/shader/exas8nvf0.fpc | 20 + src/shader/exasanvf0.fp| 43 src/shader/exasanvf0.fpc | 30 src/shader/exascnvf0.fp| 35 ++ src/shader/exascnvf0.fpc | 14 src/shader/videonvf0.fp| 47 + src/shader/videonvf0.fpc | 38 ++ src/shader/xfrm2nvf0.vp| 82 +++ src/shader/xfrm2nvf0.vpc | 90 + 27 files changed, 898 insertions(+), 69 deletions(-) New commits: commit 0897ccb715da88e1038d80b82928ebeccff8e254 Author: Sven Joachim Date: Tue Jul 30 08:53:01 2013 +0200 Remove patch 02-link-against-libdrm.diff, applied upstream diff --git a/debian/changelog b/debian/changelog index 47df922..d13c255 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-nouveau (1:1.0.9-1) UNRELEASED; urgency=low * New upstream release. + * Remove patch 02-link-against-libdrm.diff, applied upstream. -- Sven Joachim Tue, 30 Jul 2013 08:47:33 +0200 diff --git a/debian/patches/02-link-against-libdrm.diff b/debian/patches/02-link-against-libdrm.diff deleted file mode 100644 index 602562a..000 --- a/debian/patches/02-link-against-libdrm.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit 3a48b65b5bfc9cf4c3049923cfdba18d78097c88 -Author: Sven Joachim -Date: Thu Jun 13 20:33:28 2013 +0200 - -Link against libdrm - -The DDX uses symbols from libdrm but currently does not link against -it, but rather relies on indirect linkage from libdrm_nouveau. This -could lead to insufficient dependencies in distribution packages, seen -in http://bugs.debian.org/633786. - -Signed-off-by: Sven Joachim - -diff --git a/configure.ac b/configure.ac -index 6f7f870..b54b8cd 100644 a/configure.ac -+++ b/configure.ac -@@ -80,6 +80,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - XORG_DRIVER_CHECK_EXT(DRI2, [dri2proto >= 2.6]) - - # Checks for pkg-config packages -+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.17]) - PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25]) - AC_SUBST(LIBDRM_NOUVEAU_CFLAGS) - AC_SUBST(LIBDRM_NOUVEAU_LIBS) -diff --git a/src/Makefile.am b/src/Makefile.am -index f54e135..5836ead 100644 a/src/Makefile.am -+++ b/src/Makefile.am -@@ -23,10 +23,10 @@ - # -avoid-version prevents gratuitous .0.0.0 version numbers on the end - # _ladir passes a dummy rpath to libtool so the thing will actually link - # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. --AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ -+AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ @LIBDRM_CFLAGS@ - nouveau_drv_la_LTLIBRARIES = nouveau_drv.la - nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \ -- @LIBUDEV_LIBS@ -+ @LIBUDEV_LIBS@ @LIBDRM_LIBS@ - nouveau_drv_ladir = @moduledir@/drivers - - nouveau_drv_la_SOURCES = \ diff --git a/debian/patches/series b/debian/patches/series index 90907d4..d6892cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-set-NV_DRIVER_DATE-from-ChangeLog.diff -02-link-against-libdrm.diff commit 48b29eedcfcf7ac3ae48e32a844332116e7c15fc Author: Sven Joachim Date: Tue Jul 30 08:51:03 2013 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index cb76802..a73b0e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,104 @@ +commit 300c5a32d79cf507b5fede96710335bcd316eccb +Author: Dave Airlie +Date: Tue Jul 30 15:28:06 2013 +1000 + +bump to 1.0.9 for release + +Signed-off-by: Dave Airlie + +commit be44e7804862b4c276ed4d4717b1212920f428e6 +Author: Dave Airlie +Date: Tue Jul 30 15:26:46 2013 +1000 + +nouv
xserver-xorg-video-nouveau: Changes to 'upstream-unstable'
configure.ac |5 +-
src/Makefile.am | 20 +-
src/drmmode_display.c| 52 ++-
src/nouveau_xv.c | 36 +++---
src/nv_driver.c |2 -
src/nvc0_accel.c | 33 +++--
src/shader/Makefile | 15 +++
src/shader/exac8nvf0.fp | 42 +
src/shader/exac8nvf0.fpc | 28 ++
src/shader/exacanvf0.fp | 43 ++
src/shader/exacanvf0.fpc | 30 +++
src/shader/exacmnvf0.fp | 43 ++
src/shader/exacmnvf0.fpc | 30 +++
src/shader/exas8nvf0.fp | 38 +++
src/shader/exas8nvf0.fpc | 20 ++
src/shader/exasanvf0.fp | 43 ++
src/shader/exasanvf0.fpc | 30 +++
src/shader/exascnvf0.fp | 35 ++
src/shader/exascnvf0.fpc | 14 +++
src/shader/videonvf0.fp | 47
src/shader/videonvf0.fpc | 38 +++
src/shader/xfrm2nvf0.vp | 82 ++
src/shader/xfrm2nvf0.vpc | 90 +++
23 files changed, 790 insertions(+), 26 deletions(-)
New commits:
commit 300c5a32d79cf507b5fede96710335bcd316eccb
Author: Dave Airlie
Date: Tue Jul 30 15:28:06 2013 +1000
bump to 1.0.9 for release
Signed-off-by: Dave Airlie
diff --git a/configure.ac b/configure.ac
index b54b8cd..eff9087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-nouveau],
-[1.0.8],
+[1.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-nouveau])
commit be44e7804862b4c276ed4d4717b1212920f428e6
Author: Dave Airlie
Date: Tue Jul 30 15:26:46 2013 +1000
nouveau: fix crash when xinerama is enabled.
Signed-off-by: Dave Airlie
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ed9e186..570a9e4 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -348,7 +348,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr
mode,
fb_id = drmmode->fb_id;
#ifdef NOUVEAU_PIXMAP_SHARING
- if (crtc->randr_crtc->scanout_pixmap) {
+ if (crtc->randr_crtc && crtc->randr_crtc->scanout_pixmap) {
x = drmmode_crtc->scanout_pixmap_x;
y = 0;
} else
commit 588252556d1c84bf6793bc22edd48e6650a0f1b9
Author: Dave Airlie
Date: Tue Jul 30 15:14:22 2013 +1000
fix make distcheck.
add all the nvf0 stuff.
Signed-off-by: Dave Airlie
diff --git a/src/Makefile.am b/src/Makefile.am
index 5836ead..82d7c14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,34 +70,50 @@ EXTRA_DIST = hwdefs/nv_3ddefs.xml.h \
shader/exac8nvc0.fpc \
shader/exac8nve0.fp \
shader/exac8nve0.fpc \
+shader/exac8nvf0.fp \
+shader/exac8nvf0.fpc \
shader/exacanvc0.fp \
shader/exacanvc0.fpc \
shader/exacanve0.fp \
shader/exacanve0.fpc \
+shader/exacanvf0.fp \
+shader/exacanvf0.fpc \
shader/exacmnvc0.fp \
shader/exacmnvc0.fpc \
shader/exacmnve0.fp \
shader/exacmnve0.fpc \
+shader/exacmnvf0.fp \
+shader/exacmnvf0.fpc \
shader/exas8nvc0.fp \
shader/exas8nvc0.fpc \
shader/exas8nve0.fp \
shader/exas8nve0.fpc \
+shader/exas8nvf0.fp \
+shader/exas8nvf0.fpc \
shader/exasanvc0.fp \
shader/exasanvc0.fpc \
shader/exasanve0.fp \
shader/exasanve0.fpc \
+shader/exasanvf0.fp \
+shader/exasanvf0.fpc \
shader/exascnvc0.fp \
shader/exascnvc0.fpc \
shader/exascnve0.fp \
shader/exascnve0.fpc \
+shader/exascnvf0.fp \
+shader/exascnvf0.fpc \
shader/videonvc0.fp \
shader/videonvc0.fpc \
shader/videonve0.fp \
shader/videonve0.fpc \
+shader/videonvf0.fp \
+shader/videonvf0.fpc \
shader/xfrm2nvc0.vp \
shader/xfrm2nvc0.vpc \
shader/xfrm2nve0.vp \
shader/xfrm2nve0.vpc \
+shader/xfrm2nvf0.vp \
+shader/xfrm2nvf0.vpc \
shader/Makefile \
nouveau_local.h \
nv_const.h \
commit 29aecda1b5bdb95700894083874492a6d5dfc08a
Author: Dave Airlie
Date: Tue Jul 30 14:10:51 2013 +1000
drmmode: add support for multi-screen reverse optimus
Initial reverse optimus didn't consider multiple screens, so
this overhauls the code to use the new X server interface,
and allows for multiple outputs on the nvidia to be used with
the intel doing the rendering.
Processed: dealing with old installation-reports
Processing commands for cont...@bugs.debian.org: > reassign 709005 xserver-xorg-video-nouveau Bug #709005 [installation-reports] installation-reports: Graphics does not work with Gnome 3 Bug reassigned from package 'installation-reports' to 'xserver-xorg-video-nouveau'. Ignoring request to alter found versions of bug #709005 to the same values previously set Ignoring request to alter fixed versions of bug #709005 to the same values previously set > reassign 706880 network-manager Bug #706880 [installation-reports] installation-reports: After installing Wheezy wireless keeps disconnecting every minute Bug reassigned from package 'installation-reports' to 'network-manager'. Ignoring request to alter found versions of bug #706880 to the same values previously set Ignoring request to alter fixed versions of bug #706880 to the same values previously set > reassign 658344 xserver-xorg Bug #658344 [installation-reports] installation-reports: wheezy netinst without xorg configuration Bug reassigned from package 'installation-reports' to 'xserver-xorg'. Ignoring request to alter found versions of bug #658344 to the same values previously set Ignoring request to alter fixed versions of bug #658344 to the same values previously set > severity 666547 normal Bug #666547 [installation-reports] installation-reports: network installer freezes at Installer boot menu Severity set to 'normal' from 'important' > # 666547 is "lovely". close? > thanks Stopping processing here. Please contact me if you need assistance. -- 658344: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658344 666547: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666547 706880: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706880 709005: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709005 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- 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/handler.s.c.13751769085381.transcr...@bugs.debian.org
xorg-server: Changes to 'ubuntu+1'
Xi/xiqueryversion.c| 36 ++--
debian/changelog | 11 +--
debian/control |2 +-
debian/serverminver|2 +-
dix/getevents.c|2 +-
dix/touch.c|3 +--
hw/xfree86/modes/xf86RandR12.c | 19 ---
include/inputstr.h |2 +-
8 files changed, 60 insertions(+), 17 deletions(-)
New commits:
commit ffa102f6a01e9c3c7192f2830d0f23cf784dd714
Author: Maarten Lankhorst
Date: Tue Jul 30 12:43:30 2013 +0200
new snapshots, bump libx11-dev and xinput abi
diff --git a/debian/changelog b/debian/changelog
index a8f66e3..a2d9cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-xorg-server (2:1.14.99.1-0ubuntu0.0) UNRELEASED; urgency=low
+xorg-server (2:1.14.99.1-0ubuntu0.0~ppa4) saucy; urgency=low
+
+ * New ppa snapshot, more xinput bugfixes.
+
+ -- Maarten Lankhorst Tue, 30 Jul 2013
12:19:02 +0200
+
+xorg-server (2:1.14.99.1-0ubuntu0.0~ppa3) saucy; urgency=low
* Bump to 1.15rc1 + git.
* Drop upstreamed patches.
* Add patch to fix a new build failure.
- dix-fixup-build-failure.patch
+ * New ppa snapshot. Fix another bug related to input.
- -- Maarten Lankhorst Thu, 30 May 2013
11:00:36 +0200
+ -- Maarten Lankhorst Thu, 25 Jul 2013
14:37:51 +0200
xorg-server (2:1.14.1-0ubuntu1) saucy; urgency=low
diff --git a/debian/control b/debian/control
index 74c5327..cc30d71 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Build-Depends:
libgl1-mesa-dev (>= 7.8),
libxmuu-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
- libx11-dev (>= 1:0.99.2),
+ libx11-dev (>= 2:1.6.0),
libxrender-dev (>= 1:0.9.0),
libxi-dev (>= 2:1.7.1.901),
x11proto-dmx-dev (>= 1:2.2.99.1),
diff --git a/debian/serverminver b/debian/serverminver
index 0f9556a..6dde337 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
2:1.13.99.901
ABI_VIDEODRV_VERSION:14.1
-ABI_XINPUT_VERSION:19.1
+ABI_XINPUT_VERSION:19.2
commit 4360514d1cc8e3132f93f56172d291074e8c770f
Author: Keith Packard
Date: Wed Jul 10 22:42:55 2013 -0700
Xi: Allow clients to ask for 2.3 and then 2.2 without failing
This allows different sub-systems within the same application to
request different Xi versions without either getting old behaviour
everywhere or simply failing with a BadValue.
Signed-off-by: Keith Packard
Signed-off-by: Peter Hutterer
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index b807a53..6c7b9c0 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -71,13 +71,37 @@ ProcXIQueryVersion(ClientPtr client)
pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
if (pXIClient->major_version) {
-if (version_compare(stuff->major_version, stuff->minor_version,
-pXIClient->major_version,
pXIClient->minor_version) < 0) {
-client->errorValue = stuff->major_version;
-return BadValue;
+
+/* Check to see if the client has only ever asked
+ * for version 2.2 or higher
+ */
+if (version_compare(stuff->major_version, stuff->minor_version, 2, 2)
>= 0 &&
+version_compare(pXIClient->major_version,
pXIClient->minor_version, 2, 2) >= 0)
+{
+
+/* As of version 2.2, Peter promises to never again break
+ * backward compatibility, so we'll return the requested
+ * version to the client but leave the server internal
+ * version set to the highest requested value
+ */
+major = stuff->major_version;
+minor = stuff->minor_version;
+if (version_compare(stuff->major_version, stuff->minor_version,
+pXIClient->major_version,
pXIClient->minor_version) > 0)
+{
+pXIClient->major_version = stuff->major_version;
+pXIClient->minor_version = stuff->minor_version;
+}
+} else {
+if (version_compare(stuff->major_version, stuff->minor_version,
+pXIClient->major_version,
pXIClient->minor_version) < 0) {
+
+client->errorValue = stuff->major_version;
+return BadValue;
+}
+major = pXIClient->major_version;
+minor = pXIClient->minor_version;
}
-major = pXIClient->major_version;
-minor = pXIClient->minor_version;
} else {
if (version_compare(XIVersion.major_version, XIVersion.minor_version,
stuff->major_version, stuff->minor_version) > 0) {
commit bdd1e22cbde9ea2324e4e1991c9e152f22f88151
Author: Aaron Plattner
Date: Tue Apr 30 14:14:23 2013 -0700
xfree86: detach scanout pixmaps when detaching output GPUs
Commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6 fixed a bit of a
chick
xorg-server: Changes to 'ubuntu'
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 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 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 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 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 000..c24c415 --- /dev/null +++ b/debian/patches/aarch64.patch @@ -0,0 +1,39 @@ +Author: Marcin Juszkiewicz + +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
xorg-server: Changes to 'ubuntu+1'
ChangeLog| 781 +++ debian/changelog | 78 ++- debian/patches/aarch64.patch | 39 + debian/patches/series|2 debian/patches/xf86-detach-scanout.patch | 52 -- 5 files changed, 881 insertions(+), 71 deletions(-) New commits: commit 203b686224fdd576ea0ae63f41eaab2ecac6dc36 Author: Maarten Lankhorst Date: Tue Jul 30 13:10:47 2013 +0200 Retry, pick up aarch64 fix, fixup patch. diff --git a/debian/changelog b/debian/changelog index 98fd70e..546c009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.14.99.1-0ubuntu0.0~ppa5) saucy; urgency=low + + * Retry, pick up aarch64 fix, fixup patch. + + -- Maarten Lankhorst Tue, 30 Jul 2013 13:09:46 +0200 + xorg-server (2:1.14.99.1-0ubuntu0.0~ppa4) saucy; urgency=low * New ppa snapshot, more xinput bugfixes. commit 43f7a2db974a02d4e8c6b8adbc23af5e85594a20 Author: Maarten Lankhorst 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 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 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 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 000..c24c415 --- /dev/null +++ b/debian/patches/aarch64.patch @@ -0,0 +1,39 @@ +Author: Marcin Juszkiewicz + +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 commit 8f2e389dd5b6fa6bc1e623f175b72f0d3674d4f8 Author: Maarten Lankhorst Date: Tue Jul 16 09:39:35 2013 +0200 New upstream release. (LP: #1156498) Remove upstreamed patch. - xf86setdesired-hybrid.patch diff --git a/debian/changelog b/debian/changelog index e4224df..cdc07ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg-server (2:1.14.2-0ubuntu1) saucy; urgency=low + + * New upstream release. (LP: #1156498) + * Remove upstreamed patch. +- xf86setdesired-hybrid.patch + + -- Maarten Lankhorst Tue, 16 Ju
