xorg-server: Changes to 'ubuntu-artful'
debian/changelog |6 ++ debian/local/xvfb-run |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 7edde320afdf5cdab183a3067e38155b553e3bb0 Author: Timo Aaltonen Date: Wed Oct 11 11:13:05 2017 +0300 xvfb-run: Keep redirecting stderr to stdout, autopkgtests need it. diff --git a/debian/changelog b/debian/changelog index 00e7e46..1f6e744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.19.4-1ubuntu2) artful; urgency=medium + + * xvfb-run: Keep redirecting stderr to stdout, autopkgtests need it. + + -- Timo Aaltonen Wed, 11 Oct 2017 11:12:57 +0300 + xorg-server (2:1.19.4-1ubuntu1) artful; urgency=medium * Merge from Debian. diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run index 3a18596..6ee5c8a 100644 --- a/debian/local/xvfb-run +++ b/debian/local/xvfb-run @@ -181,7 +181,7 @@ done # Start the command and save its exit status. set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 RETVAL=$? set -e
xorg-server: Changes to 'ubuntu-artful'
New branch 'ubuntu-artful' available with the following commits: commit e23cb9959a6f8e80f872e6a2d7daef4aea3ec5b9 Author: Timo Aaltonen Date: Tue Oct 10 11:21:31 2017 +0300 release to artful commit f17420f3c0f2c91b49a6bd68efde196f4710b88a Merge: 6abd8d2 290ffbf Author: Timo Aaltonen Date: Tue Oct 10 11:13:42 2017 +0300 Merge branch 'debian-unstable' into ubuntu-artful commit 6abd8d24436e33b1345998639ebf8bbc694db8a6 Author: Timo Aaltonen Date: Tue Oct 3 00:25:30 2017 +0300 release to artful commit 2e77321a9e0263e3f246d096372e4dc0c5fc6c3b Author: Timo Aaltonen Date: Tue Sep 26 10:50:09 2017 +0300 Update changelog, drop upstreamed patches. commit 545c96c343e2354658e1ef48cdd8d481e9329c05 Merge: cb00105 126144c Author: Timo Aaltonen Date: Tue Sep 26 08:27:44 2017 +0300 Merge remote-tracking branch 'upstream/server-1.19-branch' into ubuntu-artful commit cb00105f08b29e8fa126e7c3bc78c253d88b43c4 Author: Timo Aaltonen Date: Wed Aug 30 14:49:57 2017 +0300 xwayland-add-grab-protocol-support.diff: Dropped, causes issues with kvm. (LP: #1713981) commit 6028ff2d4646d02ba80a8b7d040c1daf093effcd Author: Timo Aaltonen Date: Mon Aug 28 18:44:17 2017 +0300 release to artful commit ccb1364011259b26eeacedbca48b267623e92698 Author: Timo Aaltonen Date: Mon Aug 28 18:40:59 2017 +0300 add-cfl-cnl-ids.diff: Add Coffee Lake and Cannonlake pci-ids.
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |
6
debian/patches/randr-rrCheckPixmapBounding-Do-not-substract-crtc-no.patch |
58 +++
debian/patches/randr-rrCheckPixmapBounding-do-not-shrink-the-screen.patch |
76 ++
debian/patches/series |
2
4 files changed, 142 insertions(+)
New commits:
commit 2b0916d078b0407362d7fb357af24de4059a925d
Author: Timo Aaltonen
Date: Thu Sep 7 13:07:49 2017 +0300
Fix shrinking behavior in rrCheckPixmapBounding. (LP: #1715586)
diff --git a/debian/changelog b/debian/changelog
index 4933010..441b9bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.4-0ubuntu0.5) xenial; urgency=medium
+
+ * Fix shrinking behavior in rrCheckPixmapBounding. (LP: #1715586)
+
+ -- Kai-Heng Feng Thu, 07 Sep 2017 17:23:55
+0800
+
xorg-server (2:1.18.4-0ubuntu0.4) xenial; urgency=medium
* control: Build against libxfont1-dev. (LP: #1687981, #1707691)
diff --git
a/debian/patches/randr-rrCheckPixmapBounding-Do-not-substract-crtc-no.patch
b/debian/patches/randr-rrCheckPixmapBounding-Do-not-substract-crtc-no.patch
new file mode 100644
index 000..dadd031
--- /dev/null
+++ b/debian/patches/randr-rrCheckPixmapBounding-Do-not-substract-crtc-no.patch
@@ -0,0 +1,58 @@
+From 3b624aa9a9df86dc7d48149e0f18ca223b4355f1 Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng
+Date: Tue, 22 Nov 2016 14:48:14 +0100
+Subject: [PATCH 1/2] randr: rrCheckPixmapBounding: Do not substract crtc non 0
+ x,y from screen size
+
+From: Hans de Goede
+
+The purpose of rrCheckPixmapBounding is to make sure that the
+screen_pixmap is large enough for the slave-output which crtc is
+being configured.
+
+This should include crtc->x and crtc->y, otherwise the crtc might
+still end up scanning out an area outside of the screen-pixmap.
+
+For example: Take a laptop with an external monitor on a slave-output at
+1920x1080+0+0 and its internal-screen at 3840x2160+1920+0 and in
+gnome-settings-daemon move the external monitor to be on the ri ght of
+the internal screen rather then on the left. First g-s-d will do a
+RRSetScreenSize to 5760*2160 (which is a nop), then it calls RRSetCrtc
+to move the slave output to 1920x1080+3840+0, since this is a slave
+output, rrCheckPixmapBounding gets called, since the 2 crtcs now overlap
+the code before this commit would shrinks the screen_pixmap to 3180*2160.
+Then g-s-d calls RRSetCrtc to move the internal screen to 3180*2160+0+0.
+
+And we end up with the slave-output configured to scan-out an area
+which completely falls outside of the screen-pixmap (and end up with
+a black display on the external monitor).
+
+This commit fixes this by not substracting the x1 and y1 coordinates
+of the union-ed region when determining the new screen_pixmap size.
+
+Cc: Nikhil Mahale
+Cc: Dave Airlie
+Signed-off-by: Hans de Goede
+Reviewed-by: Dave Airlie
+---
+ randr/rrcrtc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
+index 5d404e84b..ac853eab6 100644
+--- a/randr/rrcrtc.c
b/randr/rrcrtc.c
+@@ -686,8 +686,8 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
+ }
+
+ newsize = RegionExtents(&total_region);
+-new_width = newsize->x2 - newsize->x1;
+-new_height = newsize->y2 - newsize->y1;
++new_width = newsize->x2;
++new_height = newsize->y2;
+
+ if (new_width == screen_pixmap->drawable.width &&
+ new_height == screen_pixmap->drawable.height) {
+--
+2.14.1
+
diff --git
a/debian/patches/randr-rrCheckPixmapBounding-do-not-shrink-the-screen.patch
b/debian/patches/randr-rrCheckPixmapBounding-do-not-shrink-the-screen.patch
new file mode 100644
index 000..4067f2f
--- /dev/null
+++ b/debian/patches/randr-rrCheckPixmapBounding-do-not-shrink-the-screen.patch
@@ -0,0 +1,76 @@
+From a46afee84d45fbff4e4dad9376afc95bbcc31d7c Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng
+Date: Tue, 22 Nov 2016 14:53:20 +0100
+Subject: [PATCH 2/2] randr: rrCheckPixmapBounding: do not shrink the
+ screen_pixmap
+
+From: Hans de Goede
+
+The purpose of rrCheckPixmapBounding is to make sure that the
+screen_pixmap is *large* enough for the slave-output which crtc is
+being configured.
+
+However until now rrCheckPixmapBounding would also shrink the
+screen_pixmap in certain scenarios leading to various problems.
+
+For example: Take a laptop with its internalscreen on a slave-output and
+currently disabled and an external monitor at 1920x1080+0+0.
+Now lets say that we want to drive the external monitor at its native
+resolution of 2560x1440 and have the internal screen mirror the top left
+part of the external monitor, so we run:
+
+ $ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
+ --mode 2560x1440 --pos 0x0
+
+Here xrandr utility first calls RRSetScreenSize to 2560x1440, then it
+calls RRSetCrtc 1920x1080+0+0 on the eDP, since this is a slave output,
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e374c16140aed4570ac5658ce933938ab8c36c81 Author: Timo Aaltonen Date: Mon Aug 7 17:10:20 2017 +0300 close a bug diff --git a/debian/changelog b/debian/changelog index 5ee9e80..4933010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xorg-server (2:1.18.4-0ubuntu0.4) xenial; urgency=medium - * control: Build against libxfont1-dev. (LP: #1687981) + * control: Build against libxfont1-dev. (LP: #1687981, #1707691) * disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver supports rotation now. (LP: #1706287)
xorg-server: Changes to 'ubuntu'
debian/changelog | 29 debian/control |2 debian/patches/CVE-2017-10971-1.patch | 41 debian/patches/CVE-2017-10971-2.patch | 43 debian/patches/CVE-2017-10971-3.patch | 66 debian/patches/CVE-2017-10972.patch| 35 debian/patches/series |7 debian/patches/xwayland-add-grab-protocol-support.diff | 255 ++ debian/patches/xwayland-pointer-confine.diff | 143 + debian/patches/xwayland-tablet.diff| 1568 + 10 files changed, 2188 insertions(+), 1 deletion(-) New commits: commit 39cb1e331907a3bbe8d9efd8276d9ce9b2e773d0 Author: Timo Aaltonen Date: Fri Aug 25 08:32:28 2017 +0300 release to artful diff --git a/debian/changelog b/debian/changelog index 3017f37..96db26e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.19.3-1ubuntu4) UNRELEASED; urgency=medium +xorg-server (2:1.19.3-1ubuntu4) artful; urgency=medium * xwayland-tablet.diff: Add support for Wacom tablets in xwayland. (LP: #1712571) @@ -7,7 +7,7 @@ xorg-server (2:1.19.3-1ubuntu4) UNRELEASED; urgency=medium * xwayland-add-grab-protocol-support.diff: Add support for keyboard grabbing to xwayland. Bump wayland-protocols build-dependency to 1.9. - -- Timo Aaltonen Thu, 24 Aug 2017 14:33:30 +0300 + -- Timo Aaltonen Fri, 25 Aug 2017 08:32:17 +0300 xorg-server (2:1.19.3-1ubuntu3) artful; urgency=medium commit 431ecda6854a4db7742fd66cb2815c7eb92b570d Author: Timo Aaltonen Date: Thu Aug 24 21:51:48 2017 +0300 xwayland-add-grab-protocol-support.diff: Add support for keyboard grabbing to xwayland. Bump wayland-protocols build-dependency. diff --git a/debian/changelog b/debian/changelog index 0085ce2..3017f37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ xorg-server (2:1.19.3-1ubuntu4) UNRELEASED; urgency=medium (LP: #1712571) * xwayland-pointer-confine.diff: Add pointer locking/confinement fixes to xwayland. + * xwayland-add-grab-protocol-support.diff: Add support for keyboard +grabbing to xwayland. Bump wayland-protocols build-dependency to 1.9. -- Timo Aaltonen Thu, 24 Aug 2017 14:33:30 +0300 diff --git a/debian/control b/debian/control index 972fca3..34ca069 100644 --- a/debian/control +++ b/debian/control @@ -97,7 +97,7 @@ Build-Depends: libbsd-dev, # xwayland libwayland-dev [linux-any], - wayland-protocols (>= 1.1) [linux-any], + wayland-protocols (>= 1.9) [linux-any], #logind libdbus-1-dev (>= 1.0) [linux-any], # systemd-daemon diff --git a/debian/patches/series b/debian/patches/series index 588ed0a..e2b8cb2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,3 +35,4 @@ CVE-2017-10971-3.patch CVE-2017-10972.patch xwayland-tablet.diff xwayland-pointer-confine.diff +xwayland-add-grab-protocol-support.diff diff --git a/debian/patches/xwayland-add-grab-protocol-support.diff b/debian/patches/xwayland-add-grab-protocol-support.diff new file mode 100644 index 000..f85db7e --- /dev/null +++ b/debian/patches/xwayland-add-grab-protocol-support.diff @@ -0,0 +1,255 @@ +From 0a448d133f4f1c913b1c2cb05accff31c74a3dbf Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Wed, 12 Jul 2017 11:51:08 +0200 +Subject: [PATCH] xwayland: Add grab protocol support + +The keyboard grabbing protocol for Xwayland is included in +wayland-protocol 1.9. + +Update the wayland-protocol required version in both configure and meson +builds and add support for this new protocol in Xwayland. + +Signed-off-by: Olivier Fourdan +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + configure.ac | 2 +- + hw/xwayland/Makefile.am | 9 +++- + hw/xwayland/xwayland-input.c | 99 + hw/xwayland/xwayland.c | 2 +- + hw/xwayland/xwayland.h | 5 ++- + meson.build | 2 +- + 6 files changed, 114 insertions(+), 5 deletions(-) + +--- a/configure.ac b/configure.ac +@@ -2526,7 +2526,7 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDR + + dnl Xwayland DDX + +-XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.5 $LIBDRM epoxy" ++XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.9 $LIBDRM epoxy" + if test "x$XF86VIDMODE" = xyes; then + XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO" + fi +--- a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am +@@ -58,7 +58,9 @@ Xwayland_built_sources += \ + pointer-constraints-unstable-v1-client-protocol.h \ + pointer-constraints-unstable-v1-protocol.c \ + tablet-unstable-v2-client-protocol.h\ +- tablet-unstable-v2-protocol.c ++ tablet-unstable-v2-protocol.c \ ++ xwayland-k
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog | 25 ++-
debian/patches/CVE-2017-10971-1.patch | 41 +++
debian/patches/CVE-2017-10971-2.patch | 43
debian/patches/CVE-2017-10971-3.patch | 63 ++
debian/patches/CVE-2017-10972.patch | 35 ++
debian/patches/CVE-2017-2624.patch| 119 ++
debian/patches/series |5 +
7 files changed, 330 insertions(+), 1 deletion(-)
New commits:
commit 186e7e1569afcb208c3b371149a1e5e5aeffc56b
Author: Timo Aaltonen
Date: Tue Aug 1 11:30:41 2017 +0300
import changes from 2:1.18.4-0ubuntu0.3, bump the new version
diff --git a/debian/changelog b/debian/changelog
index 961ed83..5ee9e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
+xorg-server (2:1.18.4-0ubuntu0.4) xenial; urgency=medium
* control: Build against libxfont1-dev. (LP: #1687981)
* disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
@@ -6,6 +6,29 @@ xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
-- Timo Aaltonen Mon, 26 Jun 2017 14:53:19 +0300
+xorg-server (2:1.18.4-0ubuntu0.3) xenial-security; urgency=medium
+
+ * SECURITY UPDATE: DoS and possible code execution in endianness
+conversion of X Events
+- debian/patches/CVE-2017-10971-1.patch: do not try to swap
+ GenericEvent in Xi/sendexev.c.
+- debian/patches/CVE-2017-10971-2.patch: verify all events in
+ ProcXSendExtensionEvent in Xi/sendexev.c.
+- debian/patches/CVE-2017-10971-3.patch: disallow GenericEvent in
+ SendEvent request in dix/events.c, dix/swapreq.c.
+- CVE-2017-10971
+ * SECURITY UPDATE: information leak in XEvent handling
+- debian/patches/CVE-2017-10972.patch: zero target buffer in
+ SProcXSendExtensionEvent in Xi/sendexev.c.
+- CVE-2017-10972
+ * SECURITY UPDATE: MIT-MAGIC-COOKIES timing attack
+- debian/patches/CVE-2017-2624.patch: use timingsafe_memcmp() in
+ configure.ac, include/dix-config.h.in, include/os.h,
+ os/mitauth.c, os/timingsafe_memcmp.c.
+- CVE-2017-2624
+
+ -- Marc Deslauriers Mon, 17 Jul 2017 09:38:58
-0400
+
xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
diff --git a/debian/patches/CVE-2017-10971-1.patch
b/debian/patches/CVE-2017-10971-1.patch
new file mode 100644
index 000..b995a69
--- /dev/null
+++ b/debian/patches/CVE-2017-10971-1.patch
@@ -0,0 +1,41 @@
+From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001
+From: Michal Srb
+Date: Wed, 24 May 2017 15:54:42 +0300
+Subject: Xi: Do not try to swap GenericEvent.
+
+The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
+it is assuming that the event has fixed size and gives the swapping function
+xEvent-sized buffer.
+
+A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
+
+Signed-off-by: Michal Srb
+Reviewed-by: Peter Hutterer
+Signed-off-by: Peter Hutterer
+
+diff --git a/Xi/sendexev.c b/Xi/sendexev.c
+index 5e63bfc..5c2e0fc 100644
+--- a/Xi/sendexev.c
b/Xi/sendexev.c
+@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client)
+
+ eventP = (xEvent *) &stuff[1];
+ for (i = 0; i < stuff->num_events; i++, eventP++) {
++if (eventP->u.u.type == GenericEvent) {
++client->errorValue = eventP->u.u.type;
++return BadValue;
++}
++
+ proc = EventSwapVector[eventP->u.u.type & 0177];
+-if (proc == NotImplemented) /* no swapping proc; invalid event
type? */
++/* no swapping proc; invalid event type? */
++if (proc == NotImplemented) {
++client->errorValue = eventP->u.u.type;
+ return BadValue;
++}
+ (*proc) (eventP, &eventT);
+ *eventP = eventT;
+ }
+--
+cgit v0.10.2
+
diff --git a/debian/patches/CVE-2017-10971-2.patch
b/debian/patches/CVE-2017-10971-2.patch
new file mode 100644
index 000..a477e15
--- /dev/null
+++ b/debian/patches/CVE-2017-10971-2.patch
@@ -0,0 +1,43 @@
+From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001
+From: Michal Srb
+Date: Wed, 24 May 2017 15:54:41 +0300
+Subject: Xi: Verify all events in ProcXSendExtensionEvent.
+
+The requirement is that events have type in range
+EXTENSION_EVENT_BASE..lastEvent, but it was tested
+only for first event of all.
+
+Signed-off-by: Michal Srb
+Reviewed-by: Peter Hutterer
+Signed-off-by: Peter Hutterer
+
+Index: xorg-server-1.19.3/Xi/sendexev.c
+===
+--- xorg-server-1.19.3.orig/Xi/sendexev.c 2017-07-17 09:33:47.024571967
-0400
xorg-server-1.19.3/Xi/sendexev.c 2017-07-17 09:33:47.024571967 -0400
+@@ -125,7 +125,7 @@ SProcXSendExtensionEvent(ClientPtr clien
+ int
+ ProcXSendExtensionEvent(ClientPtr client)
+ {
+-int ret;
++int ret
xorg-server: Changes to 'ubuntu-xenial'
Rebased ref, commits from common ancestor:
commit deb5813a5c20feaa0b3b5d83426075893c5d4d3d
Author: Timo Aaltonen
Date: Tue Jul 25 12:06:57 2017 +0300
disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
supports rotation now. (LP: #1706287)
diff --git a/debian/changelog b/debian/changelog
index 6d134ec..961ed83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
* control: Build against libxfont1-dev. (LP: #1687981)
+ * disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
+supports rotation now. (LP: #1706287)
-- Timo Aaltonen Mon, 26 Jun 2017 14:53:19 +0300
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch
b/debian/patches/disable-rotation-transform-gpuscreens.patch
deleted file mode 100644
index e62a133..000
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Disable support for rotations and transforms on gpu screens.
-Author: Maarten Lankhorst
-Bug-Ubuntu: https://launchpad.net/bugs/1386620
-Bug-Ubuntu: https://launchpad.net/bugs/1308515
-Bug-Ubuntu: https://launchpad.net/bugs/1489696
-
a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -922,6 +922,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
- if (xf86RandR12Key == NULL)
- return;
-
-+if (pScreen->isGPU)
-+rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -942,6 +945,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
-
-+if (pScreen->isGPU)
-+transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
-
diff --git a/debian/patches/series b/debian/patches/series
index 6a2bebd..3facf44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,7 +43,6 @@ xf86-inactive-gpuscreen.patch
config-add-no-removal.patch
xf86-ignore-conflicting-rr-caps.patch
fix-detach-gpu.patch
-disable-rotation-transform-gpuscreens.patch
xmir.patch
xmir-desktop-file-hint-flag.patch
commit a1016520ba7e5c5b3557889eace675f291e816a4
Author: Timo Aaltonen
Date: Fri Jun 30 09:44:44 2017 +0300
control: Build against libxfont1-dev. (LP: #1687981)
diff --git a/debian/changelog b/debian/changelog
index cd6b1f9..6d134ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
+
+ * control: Build against libxfont1-dev. (LP: #1687981)
+
+ -- Timo Aaltonen Mon, 26 Jun 2017 14:53:19 +0300
+
xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
diff --git a/debian/control b/debian/control
index 9843ce2..f873459 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
x11proto-input-dev (>= 2.3),
x11proto-dri2-dev (>= 2.8),
libxdmcp-dev (>= 1:0.99.1),
- libxfont-dev (>= 1:1.4.2),
+ libxfont1-dev (>= 1:1.4.2),
libxkbfile-dev (>= 1:0.99.1),
libpixman-1-dev (>= 0.27.2),
libpciaccess-dev (>= 0.12.901),
@@ -220,7 +220,7 @@ Depends:
x11proto-xf86bigfont-dev (>= 1.2.0),
x11proto-dri3-dev,
x11proto-present-dev,
- libxfont-dev,
+ libxfont1-dev,
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |7 +++
debian/patches/disable-rotation-transform-gpuscreens.patch | 28 -
debian/patches/series |1
3 files changed, 7 insertions(+), 29 deletions(-)
New commits:
commit d4c081e76d2fc5dee0b145dc73adbd70067f61a9
Author: Timo Aaltonen
Date: Tue Jul 25 12:03:32 2017 +0300
disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
supports rotation now. (LP: #1706287)
diff --git a/debian/changelog b/debian/changelog
index cd6b1f9..6d46145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-0ubuntu0.3) xenial; urgency=medium
+
+ * disable-rotation-transform-gpuscreens.patch: Dropped, NVIDIA driver
+supports rotation now. (LP: #1706287)
+
+ -- Timo Aaltonen Tue, 25 Jul 2017 12:03:03 +0300
+
xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium
* modesetting-unifdef-slave-support.diff: Fix modesetting slave output
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch
b/debian/patches/disable-rotation-transform-gpuscreens.patch
deleted file mode 100644
index e62a133..000
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Disable support for rotations and transforms on gpu screens.
-Author: Maarten Lankhorst
-Bug-Ubuntu: https://launchpad.net/bugs/1386620
-Bug-Ubuntu: https://launchpad.net/bugs/1308515
-Bug-Ubuntu: https://launchpad.net/bugs/1489696
-
a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -922,6 +922,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
- if (xf86RandR12Key == NULL)
- return;
-
-+if (pScreen->isGPU)
-+rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -942,6 +945,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
-
-+if (pScreen->isGPU)
-+transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
-
diff --git a/debian/patches/series b/debian/patches/series
index 6a2bebd..3facf44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,7 +43,6 @@ xf86-inactive-gpuscreen.patch
config-add-no-removal.patch
xf86-ignore-conflicting-rr-caps.patch
fix-detach-gpu.patch
-disable-rotation-transform-gpuscreens.patch
xmir.patch
xmir-desktop-file-hint-flag.patch
xorg-server: Changes to 'ubuntu'
debian/changelog |6 +++ debian/patches/series |1 debian/patches/sync-i965-ids.diff | 65 ++ 3 files changed, 72 insertions(+) New commits: commit a6d6c48bce9a6705d57e0af2b903ae30de6466d6 Author: Timo Aaltonen Date: Wed May 10 13:03:51 2017 +0300 sync-i965-ids.diff: Sync i965 pci-id's from mesa. diff --git a/debian/changelog b/debian/changelog index 61c359b..0b36891 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.19.3-1ubuntu2) artful; urgency=medium + + * sync-i965-ids.diff: Sync i965 pci-id's from mesa. + + -- Timo Aaltonen Wed, 10 May 2017 13:03:42 +0300 + xorg-server (2:1.19.3-1ubuntu1) zesty; urgency=medium [ Timo Aaltonen ] diff --git a/debian/patches/series b/debian/patches/series index be80ff6..511ff84 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -28,3 +28,4 @@ xf86-ignore-conflicting-rr-caps.patch xmir.patch xi2-resize-touch.patch +sync-i965-ids.diff diff --git a/debian/patches/sync-i965-ids.diff b/debian/patches/sync-i965-ids.diff new file mode 100644 index 000..d312f51 --- /dev/null +++ b/debian/patches/sync-i965-ids.diff @@ -0,0 +1,65 @@ +diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +index 1566afd..17504f5 100644 +--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +@@ -109,6 +109,10 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)") + CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)") + CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3") + CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3") ++CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)") ++CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */ ++CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") ++CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)") + CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)") + CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1") +@@ -134,8 +138,13 @@ CHIPSET(0x1932, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)") + CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)") + CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)") + CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)") +-CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1") +-CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1") ++CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") ++CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics 505 (Broxton)") ++CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics 500 (Broxton 2x6)") ++CHIPSET(0x5902, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)") ++CHIPSET(0x5906, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)") + CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1") +@@ -143,23 +152,16 @@ CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5") + CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5") + CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5") +-CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2") ++CHIPSET(0x5912, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)") ++CHIPSET(0x5916, kbl_gt2, "Intel(R) HD Graphics 620 (Kaby Lake GT2)") ++CHIPSET(0x591A, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)") ++CHIPSET(0x591B, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)") ++CHIPSET(0x591D, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)") ++CHIPSET(0x591E, kbl_gt2, "Intel(R) HD Graphics 615 (Kaby Lake GT2)") + CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F") + CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3") +-CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3") +-CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3") ++CHIPSET(0x5926, kbl_gt3, "Intel(R) Iris Plus Graphics 640 (Kaby Lake GT3)") ++CHIPSET(0x5927, kbl_gt3, "Intel(R) Iris Plus Graphics 650 (Kaby Lake GT3)") + CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4") +-CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)") +-CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */ +-CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") +-CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") +-CHIPSET(0x0A84, bxt, "Intel(R) HD G
xorg-server: Changes to 'ubuntu'
debian/changelog | 14 +- debian/control|1 - debian/local/xvfb-run |2 +- 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit 81bcf1bdada84dbbfc22cb2680c94cf6e124dfa8 Author: Timo Aaltonen Date: Mon Mar 27 23:43:56 2017 +0300 close the ffe bug diff --git a/debian/changelog b/debian/changelog index f9412b4..9e196aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ xorg-server (2:1.19.3-1ubuntu1) zesty; urgency=medium [ Timo Aaltonen ] - * Merge from Debian experimental. + * Merge from Debian experimental. (LP: #1671799) - Patches refreshed - randr-adjust-masters-last-set-time.diff, modesetting-unifdef-slave-support.diff: Dropped, upstream commit 7797853e3650b1a06972560d85d493a48604df72 Author: Timo Aaltonen Date: Thu Dec 15 13:44:26 2016 +0200 release to zesty diff --git a/debian/changelog b/debian/changelog index f233852..5b6c841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.18.4-1ubuntu9) UNRELEASED; urgency=medium +xorg-server (2:1.18.4-1ubuntu9) zesty; urgency=medium * control: Depend on libxfont1-dev. - -- Timo Aaltonen Thu, 15 Dec 2016 13:42:11 +0200 + -- Timo Aaltonen Thu, 15 Dec 2016 13:44:15 +0200 xorg-server (2:1.18.4-1ubuntu8) zesty; urgency=medium commit 9cb7750d46e0608558f6c5ab8e99d4a437e8821f Author: Timo Aaltonen Date: Thu Dec 15 13:44:13 2016 +0200 control: Depend on libxfont1-dev. diff --git a/debian/changelog b/debian/changelog index bffb024..f233852 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.18.4-1ubuntu9) UNRELEASED; urgency=medium + + * control: Depend on libxfont1-dev. + + -- Timo Aaltonen Thu, 15 Dec 2016 13:42:11 +0200 + xorg-server (2:1.18.4-1ubuntu8) zesty; urgency=medium * xvfb-run: Bump default bitdepth to 16 so that GLX works. diff --git a/debian/control b/debian/control index 2b9849d..0e2ca75 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Build-Depends: x11proto-input-dev (>= 2.3), x11proto-dri2-dev (>= 2.8), libxdmcp-dev (>= 1:0.99.1), - libxfont-dev (>= 1:1.4.2), + libxfont1-dev (>= 1:1.4.2), libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.27.2), libpciaccess-dev (>= 0.12.901), @@ -218,7 +218,7 @@ Depends: x11proto-xf86bigfont-dev (>= 1.2.0), x11proto-dri3-dev, x11proto-present-dev, - libxfont-dev, + libxfont1-dev, libxkbfile-dev, libpciaccess-dev, mesa-common-dev, commit c8cc8e378db31754de230fda0bbabb7779d00609 Author: Timo Aaltonen Date: Thu Dec 15 12:33:18 2016 +0200 release to zesty diff --git a/debian/changelog b/debian/changelog index d2c4cc2..bffb024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.18.4-1ubuntu8) UNRELEASED; urgency=medium +xorg-server (2:1.18.4-1ubuntu8) zesty; urgency=medium * xvfb-run: Bump default bitdepth to 16 so that GLX works. - -- Timo Aaltonen Thu, 15 Dec 2016 12:32:32 +0200 + -- Timo Aaltonen Thu, 15 Dec 2016 12:33:01 +0200 xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium commit ec812c8f74b4f74680d268315b556f69dbf4f636 Author: Timo Aaltonen Date: Thu Dec 15 12:32:54 2016 +0200 xvfb-run: Bump default bitdepth to 16 so that GLX works. diff --git a/debian/changelog b/debian/changelog index 0e09110..d2c4cc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.18.4-1ubuntu8) UNRELEASED; urgency=medium + + * xvfb-run: Bump default bitdepth to 16 so that GLX works. + + -- Timo Aaltonen Thu, 15 Dec 2016 12:32:32 +0200 + xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium * modesetting-unifdef-slave-support.diff: Fix modesetting slave output diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run index 82ecb5b..6ee5c8a 100644 --- a/debian/local/xvfb-run +++ b/debian/local/xvfb-run @@ -14,7 +14,7 @@ PROGNAME=xvfb-run SERVERNUM=99 AUTHFILE= ERRORFILE=/dev/null -XVFBARGS="-screen 0 640x480x8" +XVFBARGS="-screen 0 640x480x16" LISTENTCP="-nolisten tcp" XAUTHPROTO=.
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |7 debian/patches/modesetting-unifdef-slave-support.diff | 27 ++ debian/patches/series |1 3 files changed, 35 insertions(+) New commits: commit c298cd3025885e9acd02741c2ec678f3e3a56e9e Author: Timo Aaltonen Date: Tue Nov 1 10:15:05 2016 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index bf8b164..cd6b1f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.18.4-0ubuntu0.2) UNRELEASED; urgency=medium +xorg-server (2:1.18.4-0ubuntu0.2) xenial; urgency=medium * modesetting-unifdef-slave-support.diff: Fix modesetting slave output names. (LP: #1636397) - -- Timo Aaltonen Tue, 01 Nov 2016 10:08:27 +0200 + -- Timo Aaltonen Tue, 01 Nov 2016 10:08:51 +0200 xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium commit dfab9afd78023d1c6e6d55a8e383af377f957f73 Author: Timo Aaltonen Date: Tue Nov 1 10:08:49 2016 +0200 modesetting-unifdef-slave-support.diff: Fix modesetting slave output names. (LP: #1636397) diff --git a/debian/changelog b/debian/changelog index 2e0673d..bf8b164 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.18.4-0ubuntu0.2) UNRELEASED; urgency=medium + + * modesetting-unifdef-slave-support.diff: Fix modesetting slave output +names. (LP: #1636397) + + -- Timo Aaltonen Tue, 01 Nov 2016 10:08:27 +0200 + xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium * New upstream bugfix release. (LP: #1619142) diff --git a/debian/patches/modesetting-unifdef-slave-support.diff b/debian/patches/modesetting-unifdef-slave-support.diff new file mode 100644 index 000..804aaf1 --- /dev/null +++ b/debian/patches/modesetting-unifdef-slave-support.diff @@ -0,0 +1,27 @@ +Subject: [PATCH xserver] modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT +From: Nikhil Mahale +Date: 22.10.2016 15:10 + +Commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22 had already +unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT but commit +9257b1252da9092ddc676fec9aabe2b33dfad272 didn't +notice that. + +Signed-off-by: Nikhil Mahale +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -1401,10 +1401,8 @@ drmmode_create_name(ScrnInfoPtr pScrn, d + fallback: + if (koutput->connector_type >= MS_ARRAY_SIZE(output_names)) + snprintf(name, 32, "Unknown%d-%d", koutput->connector_type, koutput->connector_type_id); +-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT + else if (pScrn->is_gpu) + snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id); +-#endif + else + snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id); + } diff --git a/debian/patches/series b/debian/patches/series index 561db5a..6a2bebd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,3 +50,4 @@ xmir-desktop-file-hint-flag.patch xi2-resize-touch.patch randr-adjust-masters-last-set-time.diff randr-do-not-check-the-screen-size.diff +modesetting-unifdef-slave-support.diff
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7c8f8b2df199229ee494e122d0add2877a873419 Author: Timo Aaltonen Date: Mon Mar 27 19:44:10 2017 +0300 release to zesty diff --git a/debian/changelog b/debian/changelog index a3ef489..f9412b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.19.3-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.19.3-1ubuntu1) zesty; urgency=medium [ Timo Aaltonen ] * Merge from Debian experimental. @@ -33,7 +33,7 @@ xorg-server (2:1.19.3-1ubuntu1) UNRELEASED; urgency=medium - Support both Mir 0.24, 0.25 and 0.26 client APIs - Fix crashing on arm64 (LP: #1642297) - -- Timo Aaltonen Mon, 06 Mar 2017 14:13:12 +0200 + -- Timo Aaltonen Mon, 27 Mar 2017 19:43:08 +0300 xorg-server (2:1.19.3-1) unstable; urgency=medium
xorg-server: Changes to 'ubuntu'
configure.ac |8
debian/changelog | 24
debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 30 -
debian/patches/208_switch_on_release.diff | 118
debian/patches/227_null_ptr_midispcur.patch| 18
debian/patches/228_autobind_gpu.patch | 320 ++---
debian/patches/disable-rotation-transform-gpuscreens.patch | 28 -
debian/patches/randr-do-not-check-the-screen-size.diff | 83 ---
debian/patches/series | 16
debian/patches/xfree86-no-xv-for-gpuscreens.patch |1
dix/pixmap.c | 16
glamor/glamor_dash.c |1
hw/xwayland/xwayland-cursor.c | 14
hw/xwayland/xwayland-glamor.c | 60 ++
os/busfault.c | 13
present/present.c | 16
render/render.c|4
17 files changed, 375 insertions(+), 395 deletions(-)
New commits:
commit 3d48f2b5bd2176b6feff3717fd66b772b33782bd
Author: Timo Aaltonen
Date: Thu Mar 16 14:23:39 2017 +0200
randr-do-not-check-the-screen-size.diff: Dropped, can't reproduce #1586260
anymore without the patch.
diff --git a/debian/changelog b/debian/changelog
index 911ecc5..a3ef489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ xorg-server (2:1.19.3-1ubuntu1) UNRELEASED; urgency=medium
review found issues and it never got applied.
* xfree86-no-xv-for-gpuscreens.patch: Drop bogus buglink.
* 227_null_ptr_midispcur.patch: Dropped, upstream didn't accept it.
+ * randr-do-not-check-the-screen-size.diff: Dropped, can't reproduce
+#1586260 anymore without the patch.
[ Robert Ancell ]
* debian/patches/xmir.patch:
diff --git a/debian/patches/randr-do-not-check-the-screen-size.diff
b/debian/patches/randr-do-not-check-the-screen-size.diff
deleted file mode 100644
index 5f8f015..000
--- a/debian/patches/randr-do-not-check-the-screen-size.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-Subject: [PATCH xserver] randr: Do not check the screen size bound for gpu
screens
-From: Nikhil Mahale
-Date: 20.05.2016 08:00
-To:
-CC: Nikhil Mahale
-
-For gpu screen, CrtcSet set/adjust the master screen size along
-mode in following callstack -
-
- ProcRRSetCrtcConfig()
-|
--> RRCrtcSet()
-|
--> rrCheckPixmapBounding()
-|
--> pScrPriv->rrScreenSetSize()
-
-Checking screen size bound for gpus screen cause some configurations
-to fails, e.g
-
- $ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
- --mode 2560x1440 --pos 0x0
-
- Here xrandr utility first sets screen size to 2560x1440 which
- gets resized to 1920x1080 on RRSetCrtcConfig request for eDP,
- and then RRSetCrtcConfig request for HDMI fails because
- of failure of screen bound check.
-
-Signed-off-by: Nikhil Mahale
- randr/rrcrtc.c | 19 ++-
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
a/randr/rrcrtc.c
-+++ b/randr/rrcrtc.c
-@@ -1313,27 +1313,20 @@ ProcRRSetCrtcConfig(ClientPtr client)
-
- #ifdef RANDR_12_INTERFACE
- /*
-+ * For gpu screen, CrtcSet set/adjust the master screen size along
-+ * with mode.
-+ *
- * Check screen size bounds if the DDX provides a 1.2 interface
- * for setting screen size. Else, assume the CrtcSet sets
- * the size along with the mode. If the driver supports transforms,
- * then it must allow crtcs to display a subset of the screen, so
- * only do this check for drivers without transform support.
- */
--if (pScrPriv->rrScreenSetSize && !crtc->transforms) {
-+if (!pScreen->isGPU && pScrPriv->rrScreenSetSize &&
!crtc->transforms) {
- int source_width;
- int source_height;
- PictTransform transform;
- struct pixman_f_transform f_transform, f_inverse;
--int width, height;
--
--if (pScreen->isGPU) {
--width = pScreen->current_master->width;
--height = pScreen->current_master->height;
--}
--else {
--width = pScreen->width;
--height = pScreen->height;
--}
-
- RRTransformCompute(stuff->x, stuff->y,
-mode->mode.width, mode->mode.height,
-@@ -1343,13 +1336,13 @@ ProcRRSetCrtcConfig(ClientPtr client)
-
- RRModeGetScanoutSize(mode, &transform, &source_width,
- &source_height);
--if (stuff->x + source_width > width) {
-+if (stuff->x + source_width > pScreen->width) {
- client->errorV
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ debian/patches/series |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 80ea196d80b67edd6068899913bb80c3eaef37cd Author: Timo Aaltonen Date: Sat Mar 11 10:34:20 2017 +0200 release to zesty diff --git a/debian/changelog b/debian/changelog index c6fbc63..2a5fe15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.19.2-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.19.2-1ubuntu2) zesty; urgency=medium * 208_switch_on_release.diff: Disabled, doesn't work with 1.19. - -- Timo Aaltonen Sat, 11 Mar 2017 10:33:58 +0200 + -- Timo Aaltonen Sat, 11 Mar 2017 10:34:09 +0200 xorg-server (2:1.19.2-1ubuntu1) zesty; urgency=medium commit 35f1d72f6cf7f636b1be5fdfcdbfa4484b2442ef Author: Timo Aaltonen Date: Sat Mar 11 10:34:07 2017 +0200 208_switch_on_release.diff: Disabled, doesn't work with 1.19. diff --git a/debian/changelog b/debian/changelog index 435d219..c6fbc63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.19.2-1ubuntu2) UNRELEASED; urgency=medium + + * 208_switch_on_release.diff: Disabled, doesn't work with 1.19. + + -- Timo Aaltonen Sat, 11 Mar 2017 10:33:58 +0200 + xorg-server (2:1.19.2-1ubuntu1) zesty; urgency=medium [ Timo Aaltonen ] diff --git a/debian/patches/series b/debian/patches/series index 4cc977d..7e8eb6c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,7 +25,7 @@ no-nv.patch # https://bugs.freedesktop.org/show_bug.cgi?id=27134 # http://lists.x.org/archives/xorg-devel/2010-April/00.html # Resent to mailing list, Feb 2013 -208_switch_on_release.diff +#208_switch_on_release.diff # https://bugs.freedesktop.org/show_bug.cgi?id=865 # - Violates XKB spec: Section 6.3, SA_LockGroup # http://lists.freedesktop.org/archives/xorg-devel/2013-January/035046.html
xorg-server: Changes to 'ubuntu'
configure.ac| 14 +---
debian/changelog| 19 +--
debian/control |4 +-
debian/patches/series |1
debian/patches/xmir-fixes.diff | 61
debian/patches/xmir.patch | 34 ++--
debian/xserver-xorg-core.bug.script |4 +-
dix/pixmap.c| 31 ++
glamor/glamor_render.c |4 ++
hw/xfree86/ramdac/xf86HWCurs.c | 55
hw/xwayland/xwayland-cvt.c |7
hw/xwayland/xwayland-input.c| 11 +++---
hw/xwayland/xwayland-output.c | 37 ++---
include/dix-config.h.in |9 +
include/input.h |1
include/os.h|5 ++
miext/damage/damage.c | 10 +
os/auth.c | 14 +---
os/inputthread.c|8
os/io.c |3 +
os/mitauth.c| 15
os/osdep.h |6 ---
os/rpcauth.c|6 ---
os/timingsafe_memcmp.c | 48
os/xdmauth.c| 27 ---
present/present.c |4 --
26 files changed, 236 insertions(+), 202 deletions(-)
New commits:
commit 226e96c5ac54d35bb8fddb6ad6b84a6b46284b7a
Author: Timo Aaltonen
Date: Mon Mar 6 14:21:37 2017 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 37aa34f..435d219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.19.2-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.19.2-1ubuntu1) zesty; urgency=medium
[ Timo Aaltonen ]
* Merge from Debian experimental.
@@ -23,7 +23,7 @@ xorg-server (2:1.19.2-1ubuntu1) UNRELEASED; urgency=medium
- Support both Mir 0.24, 0.25 and 0.26 client APIs
- Fix crashing on arm64 (LP: #1642297)
- -- Robert Ancell Thu, 17 Nov 2016 15:25:26
+1300
+ -- Timo Aaltonen Mon, 06 Mar 2017 14:13:12 +0200
xorg-server (2:1.19.2-1) unstable; urgency=medium
commit 65d4d12567c1f7b2e465915bb6a4e4946d88570d
Author: Timo Aaltonen
Date: Mon Mar 6 14:09:27 2017 +0200
xmir-fixes.diff: merged to xmir.patch
diff --git a/debian/changelog b/debian/changelog
index ea36198..37aa34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ xorg-server (2:1.19.2-1ubuntu1) UNRELEASED; urgency=medium
to confflags.
* 232-xf86compatoutput-valgrind.patch: This was added upstream
already, no need to carry a duplicate check.
- * xmir-fixes.diff: Port to new glamor api.
[ Robert Ancell ]
* debian/patches/xmir.patch:
diff --git a/debian/patches/series b/debian/patches/series
index a00f624..4cc977d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,4 +44,3 @@ disable-rotation-transform-gpuscreens.patch
xmir.patch
xi2-resize-touch.patch
randr-do-not-check-the-screen-size.diff
-xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
deleted file mode 100644
index 5500dcb..000
--- a/debian/patches/xmir-fixes.diff
+++ /dev/null
@@ -1,61 +0,0 @@
a/hw/xmir/xmir-glamor.c
-+++ b/hw/xmir/xmir-glamor.c
-@@ -245,11 +245,6 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
- glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
- 2 * sizeof(float), texcoords);
- glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
--if (!fbo) {
--glUseProgram(glamor_priv->finish_access_prog[0]);
--glUniform1i(glamor_priv->finish_access_revert[0], REVERT_NONE);
--glUniform1i(glamor_priv->finish_access_swap_rb[0],
SWAP_NONE_UPLOADING);
--}
-
- if (!swap_xy) {
- float _tx1, _tx2, _ty1, _ty2;
-@@ -606,7 +601,6 @@ xmir_glamor_copy_egl_queue(struct xmir_s
- * rotating back and forth.
- */
- glamor_set_pixmap_type(src_pixmap, GLAMOR_TEXTURE_DRM);
--src_pixmap_priv->fbo->external = TRUE;
-
- xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display,
xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR,
(EGLClientBuffer)(intptr_t)src_pixmap_priv->fbo->tex, attribs);
- if (!xmir_win->image) {
-@@ -931,12 +925,6 @@ xmir_glamor_fini(struct xmir_screen *xmi
- free(xmir_screen->device_name);
- }
-
--void
--glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
--{
--glamor_destroy_textured_pixmap(pixmap);
--}
--
- static void
- xmir_glamor_get_name_from_bo(int drm_fd, struct gbm_bo *bo, int *name)
- {
-@@ -1025,12 +1013,6 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
- return fd;
- }
-
--unsigned int
--glamor_egl_create_argb_based_texture(ScreenPtr screen, int w, int h, Bool
linear)
--{
--return 0;
--}
--
- static PixmapPtr
- xmir_glamo
xorg-server: Changes to 'ubuntu'
debian/changelog |4
debian/patches/series|1
debian/patches/xmir-desktop-file-hint-flag.patch | 28 -
debian/patches/xmir-fixes.diff |6
debian/patches/xmir.patch| 497 +++
5 files changed, 252 insertions(+), 284 deletions(-)
New commits:
commit f52fc73b66af6e2f7730f85730b506f359f32088
Author: Timo Aaltonen
Date: Mon Feb 27 15:43:28 2017 +0200
update xmir.patch, drop xmir-desktop-file-hint-flag.patch
diff --git a/debian/changelog b/debian/changelog
index 3040520..0745b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,15 +15,13 @@ xorg-server (2:1.19.1-4ubuntu1) UNRELEASED; urgency=medium
to confflags.
* 232-xf86compatoutput-valgrind.patch: This was added upstream
already, no need to carry a duplicate check.
- * xmir.patch: Don't check for aiglx enable flag, dropped upstream.
* xmir-fixes.diff: Port to new glamor api.
[ Robert Ancell ]
* debian/patches/xmir.patch:
- * debian/patches/xmir-desktop-file-hint-flag.patch:
- Refresh
- Fix warnings when built against lp:mir/0.25
-- Support both Mir 0.24 and 0.25 client APIs
+- Support both Mir 0.24, 0.25 and 0.26 client APIs
- Fix crashing on arm64 (LP: #1642297)
-- Robert Ancell Thu, 17 Nov 2016 15:25:26
+1300
diff --git a/debian/patches/series b/debian/patches/series
index 50dd8f2..a00f624 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ xf86-ignore-conflicting-rr-caps.patch
disable-rotation-transform-gpuscreens.patch
xmir.patch
-xmir-desktop-file-hint-flag.patch
xi2-resize-touch.patch
randr-do-not-check-the-screen-size.diff
xmir-fixes.diff
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
deleted file mode 100644
index d41afbc..000
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9d15629dd3cdddec47f873d7bb14ed5e27f621ca Mon Sep 17 00:00:00 2001
-From: Robert Ancell
-Date: Fri, 29 Apr 2016 14:58:28 +0200
-Subject: [PATCH xserver 2/3] xmir: Ignore --desktop_file_hint flag required by
- Unity8 to decide which application is starting
-
- hw/xmir/xmir.c | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 81b0b34..332e22e 100644
a/hw/xmir/xmir.c
-+++ b/hw/xmir/xmir.c
-@@ -180,6 +180,10 @@ ddxProcessArgument(int argc, char *argv[], int i)
- else if (!strcmp(argv[i], "-novtswitch") ||
-!strncmp(argv[i], "vt", 2)) {
- return 1;
-+/* Bypass unity8 "security" */
-+}
-+else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
-+return 1;
- }
- else if (!strcmp(argv[i], "-fd")) {
- if (!seen_shared)
---
-2.10.2
-
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
index 0424712..5500dcb 100644
--- a/debian/patches/xmir-fixes.diff
+++ b/debian/patches/xmir-fixes.diff
@@ -20,7 +20,7 @@
xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display,
xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR,
(EGLClientBuffer)(intptr_t)src_pixmap_priv->fbo->tex, attribs);
if (!xmir_win->image) {
-@@ -925,12 +919,6 @@ xmir_glamor_fini(struct xmir_screen *xmi
+@@ -931,12 +925,6 @@ xmir_glamor_fini(struct xmir_screen *xmi
free(xmir_screen->device_name);
}
@@ -33,7 +33,7 @@
static void
xmir_glamor_get_name_from_bo(int drm_fd, struct gbm_bo *bo, int *name)
{
-@@ -1019,12 +1007,6 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
+@@ -1025,12 +1013,6 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
return fd;
}
@@ -46,7 +46,7 @@
static PixmapPtr
xmir_glamor_create_pixmap(ScreenPtr screen,
int width, int height, int depth, unsigned int hint)
-@@ -1105,12 +1087,6 @@ free:
+@@ -,12 +1093,6 @@ free:
return glamor_create_pixmap(screen, width, height, depth, hint);
}
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index d4fbdb2..bd9ded9 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -11,25 +11,25 @@ Contributions from:
Daniel van Vugt
Chris Townsend
---
- configure.ac| 25 +
- hw/Makefile.am |9 +-
- hw/xmir/.gitignore |1 +
- hw/xmir/Makefile.am | 61 ++
- hw/xmir/dri2/Makefile.am| 14 +
+ configure.ac| 25
+ hw/Makefile.am |9
+ hw/xmir/.gitignore |1
+ hw/xmir/Makefile.am | 59 +
+ hw/xmir/dri2/Makefile.am| 14
hw/xmir/dri2/dri2.c | 1398 +
- hw/xmir/dri2/dri2.h | 364 +
- hw/xmir/dri2/dri2ext.c | 683 +
- hw/xmir/dri2/dri2int.h | 26 +
- hw/xmir/xmir-cursor.c | 223 ++
- hw/xmir/xmir-cvt.c | 304
xorg-server: Changes to 'ubuntu'
Xi/exevents.c | 22 +-- Xi/xichangehierarchy.c |6 composite/compalloc.c |6 composite/compint.h|2 composite/compwindow.c |9 - configure.ac |6 debian/changelog | 72 ++ debian/control | 51 --- debian/patches/02_kbsd-input-devd.diff | 72 -- debian/rules | 218 +++-- dix/Makefile.am|4 dix/dispatch.c | 10 + dix/getevents.c|5 glamor/glamor.c| 11 + glamor/glamor_egl.c|4 glamor/glamor_egl.h|6 hw/xfree86/common/xf86AutoConfig.c |9 + hw/xfree86/common/xf86Option.c |2 hw/xfree86/modes/xf86EdidModes.c |5 hw/xfree86/parser/read.c | 16 ++ hw/xfree86/parser/xf86Parser.h |1 hw/xwayland/xwayland-input.c | 25 ++- include/dixstruct.h|6 miext/damage/damage.c | 121 +- os/Makefile.am |4 os/WaitFor.c |4 os/connection.c|4 present/present.c |5 randr/rrcrtc.c | 10 + randr/rrprovider.c |3 randr/rrxinerama.c |7 + test/Makefile.am |4 32 files changed, 358 insertions(+), 372 deletions(-) New commits: commit 44be511f0cf112685d58b6ab8c3265996a74d087 Author: Timo Aaltonen Date: Thu Feb 9 12:56:27 2017 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index b611f08..3040520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +xorg-server (2:1.19.1-4ubuntu1) UNRELEASED; urgency=medium + + [ Timo Aaltonen ] + * Merge from Debian experimental. +- Patches refreshed +- randr-adjust-masters-last-set-time.diff, + modesetting-unifdef-slave-support.diff: Dropped, upstream +- config-add-no-removal.patch, xf86-inactive-gpuscreen.patch, + fix-detach-gpu.patch: Dropped, more or less obsolete + * 190_cache-xkbcomp_output_for_fast_start_up.patch: Cleaned up from +the package as it wasn't used. + * 111_armel-drv-fallbacks.patch: Dropped, we don't ship these drivers +anymore. + * rules: Drop the workaround that adds lt_cv_prog_compiler_static_works=no +to confflags. + * 232-xf86compatoutput-valgrind.patch: This was added upstream +already, no need to carry a duplicate check. + * xmir.patch: Don't check for aiglx enable flag, dropped upstream. + * xmir-fixes.diff: Port to new glamor api. + + [ Robert Ancell ] + * debian/patches/xmir.patch: + * debian/patches/xmir-desktop-file-hint-flag.patch: +- Refresh +- Fix warnings when built against lp:mir/0.25 +- Support both Mir 0.24 and 0.25 client APIs +- Fix crashing on arm64 (LP: #1642297) + + -- Robert Ancell Thu, 17 Nov 2016 15:25:26 +1300 + xorg-server (2:1.19.1-4) unstable; urgency=medium * rules: Only set the suid bit on Xorg.wrap when building arch:any @@ -60,36 +90,6 @@ xorg-server (2:1.19.0-2) unstable; urgency=medium -- Emilio Pozuelo Monfort Wed, 23 Nov 2016 19:32:09 +0100 -xorg-server (2:1.19.0-1ubuntu1) UNRELEASED; urgency=medium - - [ Timo Aaltonen ] - * Merge from Debian experimental. -- Patches refreshed -- randr-adjust-masters-last-set-time.diff, - modesetting-unifdef-slave-support.diff: Dropped, upstream -- config-add-no-removal.patch, xf86-inactive-gpuscreen.patch, - fix-detach-gpu.patch: Dropped, more or less obsolete - * 190_cache-xkbcomp_output_for_fast_start_up.patch: Cleaned up from -the package as it wasn't used. - * 111_armel-drv-fallbacks.patch: Dropped, we don't ship these drivers -anymore. - * rules: Drop the workaround that adds lt_cv_prog_compiler_static_works=no -to confflags. - * 232-xf86compatoutput-valgrind.patch: This was added upstream -already, no need to carry a duplicate check. - * xmir.patch: Don't check for aiglx enable flag, dropped upstream. - * xmir-fixes.diff: Port to new glamor api. - - [ Robert Ancell ] - * debian/patches/xmir.patch: - * debian/patches/xmir-desktop-file-hint-flag.patch: -- Refresh -- Fix warnings when built against lp:mir/0.25 -- Support both Mir 0.24 and 0.25 client APIs -- Fix crashing on arm64 (LP: #1642297) - - -- Robert Ancell Thu, 17 Nov 2016 15:25:26 +1300 - xorg-server (2:1.19.0-1) unstable; urgency=medium [ Andreas Boll ] commit 20be95b1f9111bac16740bb2907d0a2d421501c1 Author: Emilio Pozuelo Monfort Date: Fri Jan 20 00:22:13 2017 +0100 Release to unstable diff --git a/debian/changelog b/debian/changelog index 4b7866a..d2f42f1 100644
xorg-server: Changes to 'ubuntu'
configure.ac |6 +++--- debian/changelog | 13 + debian/rules |1 + dix/dispatch.c |2 +- hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 32 +--- hw/xwayland/xwayland-shm.c | 10 ++ include/dixstruct.h|2 +- 7 files changed, 42 insertions(+), 24 deletions(-) New commits: commit 7f179352e41d38389ec3c90b5460f1ff1d39b6b3 Author: Timo Aaltonen Date: Thu Nov 17 10:52:26 2016 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index e6cdacc..11e41f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,4 @@ -xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium - - * New upstream release. - * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd. - - -- Andreas Boll Mon, 07 Nov 2016 14:55:16 +0100 - -xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.19.0-1ubuntu1) UNRELEASED; urgency=medium [ Timo Aaltonen ] * Merge from Debian experimental. @@ -23,6 +16,7 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium * 232-xf86compatoutput-valgrind.patch: This was added upstream already, no need to carry a duplicate check. * xmir.patch: Don't check for aiglx enable flag, dropped upstream. + * xmir-fixes.diff: Port to new glamor api. [ Robert Ancell ] * debian/patches/xmir.patch: @@ -32,11 +26,15 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium - Support both Mir 0.24 and 0.25 client APIs - Fix crashing on arm64 (LP: #1642297) - [ Timo Aaltonen ] - * xmir-fixes.diff: Port to new glamor api. - -- Robert Ancell Thu, 17 Nov 2016 15:25:26 +1300 +xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium + + * New upstream release. + * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd. + + -- Andreas Boll Mon, 07 Nov 2016 14:55:16 +0100 + xorg-server (2:1.18.99.902-1) experimental; urgency=medium [ Timo Aaltonen ] commit 20489c89c893fca4b614350901249039b0e1e5d3 Author: Andreas Boll Date: Wed Nov 16 14:29:17 2016 +0100 Bump changelog diff --git a/debian/changelog b/debian/changelog index 696cd2f..9d6b1d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -xorg-server (2:1.18.99.902-2) UNRELEASED; urgency=medium +xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium + * New upstream release. * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd. -- Andreas Boll Mon, 07 Nov 2016 14:55:16 +0100 commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c Author: Keith Packard Date: Tue Nov 15 08:12:05 2016 -0800 Bump version to 1.19.0 Signed-off-by: Keith Packard diff --git a/configure.ac b/configure.ac index 395df80..f7ab48c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.18.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2016-10-28" -RELEASE_NAME="Shigoku" +AC_INIT([xorg-server], 1.19.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2016-11-15" +RELEASE_NAME="Cioppino" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit ea8efb3a997e15d27d362762e6c85d59487f9864 Author: Keith Packard Date: Wed Nov 2 13:25:33 2016 -0700 dix: Make sure client is not in output_pending chain after closed (RH 1382444) I think it is possible that output could get queued to a client during CloseDownClient. After it is removed from the pending queue, active grabs are released, the client is awoken if sleeping and any work queue entries related to the client are processed. To fix this, move the call removing it from the output_pending chain until after clientGone has been set and then check clientGone in output_pending_mark. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444 Signed-off-by: Keith Packard Reviewed-by: Hans de Goede diff --git a/dix/dispatch.c b/dix/dispatch.c index e111377..3d0fe26 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3406,7 +3406,6 @@ CloseDownClient(ClientPtr client) UngrabServer(client); } mark_client_not_ready(client); -xorg_list_del(&client->output_pending); BITCLEAR(grabWaiters, client->index); DeleteClientFromAnySelections(client); ReleaseActiveGrabs(client); @@ -3435,6 +3434,7 @@ CloseDownClient(ClientPtr client) if (ClientIsAsleep(client)) ClientSignal(client); ProcessWorkQueueZombies(); +output_pending_clear(client); CloseDownConnection(client); /* If the client made it to the Running stage, nClients has diff --git a
xorg-server: Changes to 'ubuntu'
debian/changelog |3 ++
debian/patches/series |1
debian/patches/xmir-fixes.diff | 61 +
3 files changed, 65 insertions(+)
New commits:
commit 11836c11427241ab44cf3071d2d5df543396d9f0
Author: Timo Aaltonen
Date: Thu Nov 17 10:50:17 2016 +0200
xmir-fixes.diff: Port to new glamor api.
diff --git a/debian/changelog b/debian/changelog
index abec0da..f75d4dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
- Support both Mir 0.24 and 0.25 client APIs
- Fix crashing on arm64 (LP: #1642297)
+ [ Timo Aaltonen ]
+ * xmir-fixes.diff: Port to new glamor api.
+
-- Robert Ancell Thu, 17 Nov 2016 15:25:26
+1300
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index a111a0e..50dd8f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
xi2-resize-touch.patch
randr-do-not-check-the-screen-size.diff
+xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
new file mode 100644
index 000..0424712
--- /dev/null
+++ b/debian/patches/xmir-fixes.diff
@@ -0,0 +1,61 @@
+--- a/hw/xmir/xmir-glamor.c
b/hw/xmir/xmir-glamor.c
+@@ -245,11 +245,6 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+ glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
+ 2 * sizeof(float), texcoords);
+ glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
+-if (!fbo) {
+-glUseProgram(glamor_priv->finish_access_prog[0]);
+-glUniform1i(glamor_priv->finish_access_revert[0], REVERT_NONE);
+-glUniform1i(glamor_priv->finish_access_swap_rb[0],
SWAP_NONE_UPLOADING);
+-}
+
+ if (!swap_xy) {
+ float _tx1, _tx2, _ty1, _ty2;
+@@ -606,7 +601,6 @@ xmir_glamor_copy_egl_queue(struct xmir_s
+ * rotating back and forth.
+ */
+ glamor_set_pixmap_type(src_pixmap, GLAMOR_TEXTURE_DRM);
+-src_pixmap_priv->fbo->external = TRUE;
+
+ xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display,
xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR,
(EGLClientBuffer)(intptr_t)src_pixmap_priv->fbo->tex, attribs);
+ if (!xmir_win->image) {
+@@ -925,12 +919,6 @@ xmir_glamor_fini(struct xmir_screen *xmi
+ free(xmir_screen->device_name);
+ }
+
+-void
+-glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
+-{
+-glamor_destroy_textured_pixmap(pixmap);
+-}
+-
+ static void
+ xmir_glamor_get_name_from_bo(int drm_fd, struct gbm_bo *bo, int *name)
+ {
+@@ -1019,12 +1007,6 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
+ return fd;
+ }
+
+-unsigned int
+-glamor_egl_create_argb_based_texture(ScreenPtr screen, int w, int h, Bool
linear)
+-{
+-return 0;
+-}
+-
+ static PixmapPtr
+ xmir_glamor_create_pixmap(ScreenPtr screen,
+ int width, int height, int depth, unsigned int hint)
+@@ -1105,12 +1087,6 @@ free:
+ return glamor_create_pixmap(screen, width, height, depth, hint);
+ }
+
+-void
+-glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+-{
+-/* XXX: Unused */
+-}
+-
+ static Bool
+ xmir_glamor_destroy_pixmap(PixmapPtr pixmap)
+ {
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c70ab5620f1e8227c70a92c20d29c02a7cad4bef Author: Timo Aaltonen Date: Thu Nov 17 08:15:57 2016 +0200 fix version diff --git a/debian/changelog b/debian/changelog index 716e323..abec0da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.18.99.902-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium [ Timo Aaltonen ] * Merge from Debian experimental.
xorg-server: Changes to 'ubuntu'
debian/changelog | 13
debian/patches/xmir-desktop-file-hint-flag.patch | 22
debian/patches/xmir.patch| 576 +++
3 files changed, 410 insertions(+), 201 deletions(-)
New commits:
commit 6a23f1b3237dad65d3f1c3c3616ca91d1822bcf3
Author: Robert Ancell
Date: Thu Nov 17 15:26:39 2016 +1300
* debian/patches/xmir.patch:
* debian/patches/xmir-desktop-file-hint-flag.patch:
- Refresh
- Fix warnings when built against lp:mir/0.25
- Support both Mir 0.24 and 0.25 client APIs
- Fix crashing on arm64 (LP: #1642297)
diff --git a/debian/changelog b/debian/changelog
index 5941a97..716e323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.99.902-1ubuntu2) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* Merge from Debian experimental.
- Patches refreshed
- randr-adjust-masters-last-set-time.diff,
@@ -16,7 +17,15 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
already, no need to carry a duplicate check.
* xmir.patch: Don't check for aiglx enable flag, dropped upstream.
- -- Timo Aaltonen Tue, 08 Nov 2016 12:48:29 +0200
+ [ Robert Ancell ]
+ * debian/patches/xmir.patch:
+ * debian/patches/xmir-desktop-file-hint-flag.patch:
+- Refresh
+- Fix warnings when built against lp:mir/0.25
+- Support both Mir 0.24 and 0.25 client APIs
+- Fix crashing on arm64 (LP: #1642297)
+
+ -- Robert Ancell Thu, 17 Nov 2016 15:25:26
+1300
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 4930b55..d41afbc 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,22 +1,28 @@
-From de9e6e1d66680e717471df2c4032e590fd1b9ae0 Mon Sep 17 00:00:00 2001
+From 9d15629dd3cdddec47f873d7bb14ed5e27f621ca Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:58:28 +0200
Subject: [PATCH xserver 2/3] xmir: Ignore --desktop_file_hint flag required by
Unity8 to decide which application is starting
---
- hw/xmir/xmir.c | 3 +++
- 1 file changed, 3 insertions(+)
+ hw/xmir/xmir.c | 4
+ 1 file changed, 4 insertions(+)
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 81b0b34..332e22e 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -178,6 +178,9 @@ ddxProcessArgument(int argc, char *argv[
- } else if (!strcmp(argv[i], "-novtswitch") ||
+@@ -180,6 +180,10 @@ ddxProcessArgument(int argc, char *argv[], int i)
+ else if (!strcmp(argv[i], "-novtswitch") ||
!strncmp(argv[i], "vt", 2)) {
return 1;
+/* Bypass unity8 "security" */
-+} else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
++}
++else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
+return 1;
- } else if (!strcmp(argv[i], "-fd")) {
+ }
+ else if (!strcmp(argv[i], "-fd")) {
if (!seen_shared)
- NoListenAll = 1;
+--
+2.10.2
+
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 1d9aa40..d4fbdb2 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From 8467ede06b3b40fae1d362d73cfa313737e0defc Mon Sep 17 00:00:00 2001
+From 4d62680bb8961651be15732cc815bf8cff2535ef Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -16,20 +16,20 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.c | 1398 +
hw/xmir/dri2/dri2.h | 364 +
hw/xmir/dri2/dri2ext.c | 683 +
hw/xmir/dri2/dri2int.h | 26 +
- hw/xmir/xmir-cursor.c | 210 ++
+ hw/xmir/xmir-cursor.c | 223 ++
hw/xmir/xmir-cvt.c | 304
- hw/xmir/xmir-dri2.c | 551 ++
- hw/xmir/xmir-glamor.c | 1164 +
- hw/xmir/xmir-input.c| 611 +++
- hw/xmir/xmir-output.c | 476
- hw/xmir/xmir-thread-proxy.c | 115 +++
- hw/xmir/xmir.c | 1729 +++
+ hw/xmir/xmir-dri2.c | 558 ++
+ hw/xmir/xmir-glamor.c | 1174
+ hw/xmir/xmir-input.c| 650
+ hw/xmir/xmir-output.c | 505
+ hw/xmir/xmir-thread-proxy.c | 116 +++
+ hw/xmir/xmir.c | 1789 +++
hw/xmir/xmir.h | 232 ++
- 18 files
xorg-server: Changes to 'ubuntu'
ChangeLog |162271 -- Xext/geext.c| 22 Xext/security.c |2 Xext/shape.c|1 Xext/shm.c | 12 Xext/sleepuntil.c | 17 Xext/sync.c | 45 Xext/vidmode.c |2 Xext/xace.c | 45 Xext/xace.h | 12 Xext/xf86bigfont.c | 10 Xext/xres.c | 96 Xext/xselinux_hooks.c | 18 Xext/xvdisp.c |3 Xi/exevents.c |8 Xi/extinit.c| 17 Xi/stubs.c | 14 Xi/xiproperty.c |8 Xi/xiquerypointer.c |4 composite/compalloc.c |4 composite/compext.c | 29 config/config.c |6 config/dbus-core.c | 18 config/hal.c|4 config/udev.c | 57 config/wscons.c |2 configure.ac| 173 damageext/damageext.c | 23 debian/changelog| 53 debian/control | 24 debian/local/xvfb-run.1 |2 debian/patches/02_kbsd-input-devd.diff | 60 debian/patches/03_static-nettle.diff|8 debian/patches/05_Revert-Unload-submodules.diff |8 debian/patches/105_nvidia_autodetect.patch |2 debian/patches/111_armel-drv-fallbacks.patch| 70 debian/patches/168_glibc_trace_to_stderr.patch |8 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 469 debian/patches/191-Xorg-add-an-extra-module-path.patch |6 debian/patches/208_switch_on_release.diff | 28 debian/patches/226_fall_back_to_autoconfiguration.patch | 20 debian/patches/228_autobind_gpu.patch | 14 debian/patches/232-xf86compatoutput-valgrind.patch | 16 debian/patches/config-add-no-removal.patch | 33 debian/patches/disable-rotation-transform-gpuscreens.patch |4 debian/patches/fix-detach-gpu.patch | 93 debian/patches/modesetting-unifdef-slave-support.diff | 27 debian/patches/no-nv.patch |2 debian/patches/randr-adjust-masters-last-set-time.diff | 39 debian/patches/randr-do-not-check-the-screen-size.diff |8 debian/patches/series |8 debian/patches/xf86-ignore-conflicting-rr-caps.patch|2 debian/patches/xf86-inactive-gpuscreen.patch| 29 debian/patches/xi2-resize-touch.patch |2 debian/patches/xmir-desktop-file-hint-flag.patch|7 debian/patches/xmir.patch | 72 debian/rules|6 debian/serverminver |6 debian/watch|2 debian/xserver-xorg-core.bug.script |4 debian/xserver-xorg-legacy.config |2 debian/xserver-xorg-legacy.postinst |2 debian/xserver-xorg-legacy.postrm |2 dix/devices.c | 81 dix/dispatch.c | 227 dix/dixfonts.c | 326 dix/dixutils.c | 45 dix/events.c| 17 dix/getevents.c
xorg-server: Changes to 'ubuntu'
debian/changelog |7 debian/patches/modesetting-unifdef-slave-support.diff | 27 ++ debian/patches/series |1 3 files changed, 35 insertions(+) New commits: commit 2efc41eee297e9ef4373dccf672cfbb79c6fdf29 Author: Timo Aaltonen Date: Tue Oct 25 10:49:18 2016 +0300 release to zesty diff --git a/debian/changelog b/debian/changelog index 45c696b..0e09110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.18.4-1ubuntu7) UNRELEASED; urgency=medium +xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium * modesetting-unifdef-slave-support.diff: Fix modesetting slave output names. (LP: #1636397) - -- Timo Aaltonen Tue, 25 Oct 2016 10:47:08 +0300 + -- Timo Aaltonen Tue, 25 Oct 2016 10:48:45 +0300 xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium commit b66de0dfa0e16a6f1d35dd04b3a2fa8cd2094dfa Author: Timo Aaltonen Date: Tue Oct 25 10:48:43 2016 +0300 modesetting-unifdef-slave-support.diff: Fix modesetting slave output names. (LP: #1636397) diff --git a/debian/changelog b/debian/changelog index e9f5cb4..45c696b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.18.4-1ubuntu7) UNRELEASED; urgency=medium + + * modesetting-unifdef-slave-support.diff: Fix modesetting slave output +names. (LP: #1636397) + + -- Timo Aaltonen Tue, 25 Oct 2016 10:47:08 +0300 + xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium * debian/patches/xmir.patch: diff --git a/debian/patches/modesetting-unifdef-slave-support.diff b/debian/patches/modesetting-unifdef-slave-support.diff new file mode 100644 index 000..804aaf1 --- /dev/null +++ b/debian/patches/modesetting-unifdef-slave-support.diff @@ -0,0 +1,27 @@ +Subject: [PATCH xserver] modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT +From: Nikhil Mahale +Date: 22.10.2016 15:10 + +Commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22 had already +unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT but commit +9257b1252da9092ddc676fec9aabe2b33dfad272 didn't +notice that. + +Signed-off-by: Nikhil Mahale +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -1401,10 +1401,8 @@ drmmode_create_name(ScrnInfoPtr pScrn, d + fallback: + if (koutput->connector_type >= MS_ARRAY_SIZE(output_names)) + snprintf(name, 32, "Unknown%d-%d", koutput->connector_type, koutput->connector_type_id); +-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT + else if (pScrn->is_gpu) + snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id); +-#endif + else + snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id); + } diff --git a/debian/patches/series b/debian/patches/series index 0fbbe54..be3c87a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -52,3 +52,4 @@ xmir-desktop-file-hint-flag.patch xi2-resize-touch.patch randr-adjust-masters-last-set-time.diff randr-do-not-check-the-screen-size.diff +modesetting-unifdef-slave-support.diff
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |8 debian/patches/xmir.patch | 477 +++--- 2 files changed, 330 insertions(+), 155 deletions(-) New commits: commit d4889a21e47bc45b56e7f65feda63090fad3336f Author: Timo Aaltonen Date: Wed Sep 14 18:03:32 2016 +0300 close the microrelease bug diff --git a/debian/changelog b/debian/changelog index d59d35d..2e0673d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium - * New upstream bugfix release. + * New upstream bugfix release. (LP: #1619142) * randr-adjust-masters-last-set-time.diff, randr-do-not-check-the-screen-size.diff: Fix issues changing display mode on prime setups. (LP: #1586260) commit 5d680c9cc48b471551ab89c43eb69ccefca83769 Author: Timo Aaltonen Date: Wed Sep 14 15:41:04 2016 +0300 add new xmir patch based on yakkety diff --git a/debian/changelog b/debian/changelog index b50d00e..d59d35d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,12 @@ xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium * os-treat-ssh-as-a-non-local-client.diff: Dropped, upstream. * drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and causes issues on non-x86 archs. (LP: #1581076) + * debian/patches/xmir.patch: backport XMir fixes from Ubuntu "Yakkety Yak" +- fix button/menu focus failures (lp: #1590553) +- ignore 'unnkown 11 event' (lp: #1617925) +- don't call epoxy every frame (lp: #1617932) +- fix unclickable parts of the screen after rotation (lp: #1613708) +- fix key repeat issues (lp: #1591356) -- Timo Aaltonen Thu, 01 Sep 2016 10:28:26 +0300 diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index 3af0c45..c51aac0 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -1,4 +1,4 @@ -From d1786a76da403e240abd98f65c95a2d0a242b495 Mon Sep 17 00:00:00 2001 +From 8467ede06b3b40fae1d362d73cfa313737e0defc Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 29 Apr 2016 14:57:53 +0200 Subject: [PATCH xserver 1/3] XMir DDX @@ -16,20 +16,20 @@ Contributions from: hw/xmir/.gitignore |1 + hw/xmir/Makefile.am | 61 ++ hw/xmir/dri2/Makefile.am| 14 + - hw/xmir/dri2/dri2.c | 1398 ++ - hw/xmir/dri2/dri2.h | 364 ++ - hw/xmir/dri2/dri2ext.c | 683 +++ + hw/xmir/dri2/dri2.c | 1398 ++ + hw/xmir/dri2/dri2.h | 364 + + hw/xmir/dri2/dri2ext.c | 683 + hw/xmir/dri2/dri2int.h | 26 + hw/xmir/xmir-cursor.c | 210 ++ - hw/xmir/xmir-cvt.c | 304 + - hw/xmir/xmir-dri2.c | 545 +++ - hw/xmir/xmir-glamor.c | 1160 - hw/xmir/xmir-input.c| 592 - hw/xmir/xmir-output.c | 449 + - hw/xmir/xmir-thread-proxy.c | 109 +++ - hw/xmir/xmir.c | 1571 +++ - hw/xmir/xmir.h | 226 +++ - 18 files changed, 7745 insertions(+), 2 deletions(-) + hw/xmir/xmir-cvt.c | 304 + hw/xmir/xmir-dri2.c | 551 ++ + hw/xmir/xmir-glamor.c | 1164 + + hw/xmir/xmir-input.c| 611 +++ + hw/xmir/xmir-output.c | 476 + hw/xmir/xmir-thread-proxy.c | 115 +++ + hw/xmir/xmir.c | 1729 +++ + hw/xmir/xmir.h | 232 ++ + 18 files changed, 7971 insertions(+), 2 deletions(-) create mode 100644 hw/xmir/.gitignore create mode 100644 hw/xmir/Makefile.am create mode 100644 hw/xmir/dri2/Makefile.am @@ -47,11 +47,9 @@ Contributions from: create mode 100644 hw/xmir/xmir.c create mode 100644 hw/xmir/xmir.h -diff --git a/configure.ac b/configure.ac -index 77cf234..8bf62a0 100644 --- a/configure.ac +++ b/configure.ac -@@ -628,6 +628,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server +@@ -633,6 +633,7 @@ AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) @@ -59,7 +57,7 @@ index 77cf234..8bf62a0 100644 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin,
xorg-server: Changes to 'ubuntu'
debian/changelog | 10
debian/patches/xmir.patch | 110 ++
2 files changed, 93 insertions(+), 27 deletions(-)
New commits:
commit 8891b9fe356a24117ce5c7b601f65fad2d000d93
Author: Robert Ancell
Date: Wed Sep 7 17:07:32 2016 +1200
* debian/patches/xmir.patch:
- Don't call epoxy every frame (LP: #1617932)
- Ignore 'unknown 11 event' (LP: #1617925)
- Improve root window resizing code
- Make randr mode names simpler
diff --git a/debian/changelog b/debian/changelog
index 94e955b..e9f5cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Don't call epoxy every frame (LP: #1617932)
+- Ignore 'unknown 11 event' (LP: #1617925)
+- Improve root window resizing code
+- Make randr mode names simpler
+
+ -- Robert Ancell Wed, 07 Sep 2016 15:50:30
+1200
+
xorg-server (2:1.18.4-1ubuntu5) yakkety; urgency=medium
* drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 411585b..32f19c0 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From f270f91a106d212e5b4a920a64e88f56d40a8336 Mon Sep 17 00:00:00 2001
+From 8467ede06b3b40fae1d362d73cfa313737e0defc Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -23,13 +23,13 @@ Contributions from:
hw/xmir/xmir-cursor.c | 210 ++
hw/xmir/xmir-cvt.c | 304
hw/xmir/xmir-dri2.c | 551 ++
- hw/xmir/xmir-glamor.c | 1160 +
- hw/xmir/xmir-input.c| 609 +++
- hw/xmir/xmir-output.c | 428 +++
+ hw/xmir/xmir-glamor.c | 1164 +
+ hw/xmir/xmir-input.c| 611 +++
+ hw/xmir/xmir-output.c | 476
hw/xmir/xmir-thread-proxy.c | 115 +++
hw/xmir/xmir.c | 1729 +++
- hw/xmir/xmir.h | 230 ++
- 18 files changed, 7915 insertions(+), 2 deletions(-)
+ hw/xmir/xmir.h | 232 ++
+ 18 files changed, 7971 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -3806,10 +3806,10 @@ index 000..e1d02f0
+}
diff --git a/hw/xmir/xmir-glamor.c b/hw/xmir/xmir-glamor.c
new file mode 100644
-index 000..7ad0245
+index 000..61d4c10
--- /dev/null
+++ b/hw/xmir/xmir-glamor.c
-@@ -0,0 +1,1160 @@
+@@ -0,0 +1,1164 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -4169,7 +4169,8 @@ index 000..7ad0245
+struct xmir_screen *xmir_screen = xmir_screen_get(src->pScreen);
+DebugF("Box: (%i,%i)->(%i,%i)\n", ext->x1, ext->y1, ext->x2, ext->y2);
+
-+if (epoxy_has_gl_extension("GL_EXT_framebuffer_blit") &&
!xmir_screen->doubled && !orientation) {
++if (xmir_screen->glamor_has_GL_EXT_framebuffer_blit &&
++!xmir_screen->doubled && !orientation) {
+glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT,
src_pixmap_priv->fbo->fb);
+
+glBlitFramebuffer(ext->x1, ext->y2, ext->x2, ext->y1,
@@ -4648,6 +4649,9 @@ index 000..7ad0245
+return FALSE;
+}
+
++xmir_screen->glamor_has_GL_EXT_framebuffer_blit =
++epoxy_has_gl_extension("GL_EXT_framebuffer_blit");
++
+if (!xmir_screen->gbm && xmir_screen->glamor != glamor_egl_sync) {
+xmir_screen->swap_context =
eglCreateContext(xmir_screen->egl_display, egl_config, EGL_NO_CONTEXT,
gles2_attribs);
+if (!xmir_screen->swap_context) {
@@ -4972,10 +4976,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..21b7abe
+index 000..f9887ea
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,609 @@
+@@ -0,0 +1,611 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5527,6 +5531,8 @@ index 000..21b7abe
+case mir_event_type_keymap:
+xmir_handle_keymap_event(xmir_input, mir_event_get_keymap_event(ev));
+break;
++case mir_event_type_input_device_state:
++break;
+default:
+ErrorF("Received an unknown %u event\n", mir_event_get_type(ev));
+break;
@@ -5587,10 +5593,10 @@ index 000..21b7abe
+}
diff --git a/hw/xmir/xmir-output.c b/hw/xmir/xmir-output.c
new file mode 100644
-index 000..1927215
+index 000..860e89b
--- /dev/null
+++ b/hw/xmir/xmir-output.c
-@@ -0,0 +1,428 @@
+@@ -0,0 +1,476 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5715,8 +5721,8 @@ index 000..1927215
+/* Odd resolutions like 1366x768 don't show correctly otherwise */
+randr_mode->mode.width = mode->horizontal_resolution;
+randr_mode->mode.h
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog|2
debian/patches/drm_device_keep_trying.patch | 153
debian/patches/series |1
3 files changed, 2 insertions(+), 154 deletions(-)
New commits:
commit 2d9274f5658accdbce4f87083f3671abc9c72c54
Author: Timo Aaltonen
Date: Tue Sep 6 15:34:50 2016 +0300
drop drm_device_keep_trying.patch, reupload to sru queue
diff --git a/debian/changelog b/debian/changelog
index fd9b166..b50d00e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium
randr-do-not-check-the-screen-size.diff:
Fix issues changing display mode on prime setups. (LP: #1586260)
* os-treat-ssh-as-a-non-local-client.diff: Dropped, upstream.
+ * drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore,
+and causes issues on non-x86 archs. (LP: #1581076)
-- Timo Aaltonen Thu, 01 Sep 2016 10:28:26 +0300
diff --git a/debian/patches/drm_device_keep_trying.patch
b/debian/patches/drm_device_keep_trying.patch
deleted file mode 100644
index 59bb1cf..000
--- a/debian/patches/drm_device_keep_trying.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From: Maarten Lankhorst
-Subject: [PATCH] do not use drmGetBusid to grab the pci-id name
-
-The kernel returns EACCES or EAGAIN on drm open when the drm device is
-currently unavailable, such as if it is in use by another process
-(e.g. plymouth), or hasn't finished initializing (e.g. on a really fast
-SSD). Because the probing is done before a vt switch is completed,
-we have no way to ensure that we can own DRM master. This results
-in failing to boot.
-
-Also attrib->unowned is not initialized, always initialize it to fix
-a valgrind warning, and to prevent adding the same device a second time
-after a vt switch.
-
-Fixes: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/982889
-
-Signed-off-by: Bryce Harrington
- hw/xfree86/os-support/linux/lnx_platform.c | 29 +---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
a/config/udev.c
-+++ b/config/udev.c
-@@ -126,7 +126,7 @@ device_added(struct udev_device *udev_de
- if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum)))
- return;
-
--LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path);
-+LogMessage(X_INFO, "config/udev: Adding drm device (%s) %s %s\n",
path, sysname, syspath);
-
- config_udev_odev_setup_attribs(path, syspath, major(devnum),
-minor(devnum), NewGPUDeviceRequest);
-@@ -465,18 +465,54 @@ config_udev_fini(void)
-
- #ifdef CONFIG_UDEV_KMS
-
-+static Bool
-+get_pci_busid(const char *in, char *pci_str)
-+{
-+int ret, domain, bus, dev, func;
-+ret = sscanf(in, "/%04x:%02x:%02x.%d/drm/card%*d", &domain, &bus, &dev,
&func);
-+if (ret != 4)
-+return FALSE;
-+sprintf(pci_str, "pci:%04x:%02x:%02x.%d", domain, bus, dev, func);
-+return TRUE;
-+}
-+
- static void
- config_udev_odev_setup_attribs(const char *path, const char *syspath,
-int major, int minor,
-config_odev_probe_proc_ptr probe_callback)
- {
- struct OdevAttributes *attribs = config_odev_allocate_attributes();
-+const char *platform;
-
- attribs->path = XNFstrdup(path);
- attribs->syspath = XNFstrdup(syspath);
- attribs->major = major;
- attribs->minor = minor;
-
-+if (strstr(syspath, "/devices/pci")) {
-+char pci_str[17];
-+const char *end = strstr(syspath, "/drm/card");
-+if (strstr(syspath, "/usb"))
-+attribs->busid = strdup("");
-+else if (get_pci_busid(end - 13, pci_str))
-+attribs->busid = strdup(pci_str);
-+} else if ((platform = strstr(syspath, "/devices/platform/"))) {
-+/* OMAP relies on this, modesetting doesn't use it */
-+const char *end;
-+platform += 18;
-+end = strchr(platform, '.');
-+if (end) {
-+char *busid;
-+int ret;
-+
-+ret = asprintf(&busid, "platform:%.*s:%02li",
-+ (int)(end - platform), platform, strtol(end + 1,
NULL, 10));
-+if (ret >= 0) {
-+attribs->busid = busid;
-+}
-+}
-+}
-+
- /* ownership of attribs is passed to probe layer */
- probe_callback(attribs);
- }
a/hw/xfree86/os-support/linux/lnx_platform.c
-+++ b/hw/xfree86/os-support/linux/lnx_platform.c
-@@ -23,11 +23,8 @@
- static Bool
- get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
- {
--drmSetVersion sv;
- drmVersionPtr v;
--char *buf;
- int major, minor, fd;
--int err = 0;
- Bool paused, server_fd = FALSE;
-
- major = attribs->major;
-@@ -51,18 +48,6 @@ get_drm_info(struct OdevAttributes *attr
- if (fd == -1)
- return FALSE;
xorg-server: Changes to 'ubuntu'
debian/changelog|7 +
debian/patches/drm_device_keep_trying.patch | 153
debian/patches/series |1
3 files changed, 7 insertions(+), 154 deletions(-)
New commits:
commit e57d12c603246df58d185438f1d6a68cdaf125d5
Author: Timo Aaltonen
Date: Fri Sep 2 14:00:16 2016 +0300
release to yak
diff --git a/debian/changelog b/debian/changelog
index dbb40af..94e955b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.18.4-1ubuntu5) UNRELEASED; urgency=medium
+xorg-server (2:1.18.4-1ubuntu5) yakkety; urgency=medium
* drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
causes issues on non-x86 archs. (LP: #1581076)
- -- Timo Aaltonen Fri, 02 Sep 2016 12:56:32 +0300
+ -- Timo Aaltonen Fri, 02 Sep 2016 13:59:52 +0300
xorg-server (2:1.18.4-1ubuntu4) yakkety; urgency=medium
commit 50a0cfc7d466505093ae31721fbc757dae56debb
Author: Timo Aaltonen
Date: Fri Sep 2 13:47:56 2016 +0300
drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
causes issues on non-x86 archs. (LP: #1581076)
diff --git a/debian/changelog b/debian/changelog
index 8314f90..dbb40af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1ubuntu5) UNRELEASED; urgency=medium
+
+ * drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
+causes issues on non-x86 archs. (LP: #1581076)
+
+ -- Timo Aaltonen Fri, 02 Sep 2016 12:56:32 +0300
+
xorg-server (2:1.18.4-1ubuntu4) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/drm_device_keep_trying.patch
b/debian/patches/drm_device_keep_trying.patch
deleted file mode 100644
index 59bb1cf..000
--- a/debian/patches/drm_device_keep_trying.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From: Maarten Lankhorst
-Subject: [PATCH] do not use drmGetBusid to grab the pci-id name
-
-The kernel returns EACCES or EAGAIN on drm open when the drm device is
-currently unavailable, such as if it is in use by another process
-(e.g. plymouth), or hasn't finished initializing (e.g. on a really fast
-SSD). Because the probing is done before a vt switch is completed,
-we have no way to ensure that we can own DRM master. This results
-in failing to boot.
-
-Also attrib->unowned is not initialized, always initialize it to fix
-a valgrind warning, and to prevent adding the same device a second time
-after a vt switch.
-
-Fixes: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/982889
-
-Signed-off-by: Bryce Harrington
- hw/xfree86/os-support/linux/lnx_platform.c | 29 +---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
a/config/udev.c
-+++ b/config/udev.c
-@@ -126,7 +126,7 @@ device_added(struct udev_device *udev_de
- if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum)))
- return;
-
--LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path);
-+LogMessage(X_INFO, "config/udev: Adding drm device (%s) %s %s\n",
path, sysname, syspath);
-
- config_udev_odev_setup_attribs(path, syspath, major(devnum),
-minor(devnum), NewGPUDeviceRequest);
-@@ -465,18 +465,54 @@ config_udev_fini(void)
-
- #ifdef CONFIG_UDEV_KMS
-
-+static Bool
-+get_pci_busid(const char *in, char *pci_str)
-+{
-+int ret, domain, bus, dev, func;
-+ret = sscanf(in, "/%04x:%02x:%02x.%d/drm/card%*d", &domain, &bus, &dev,
&func);
-+if (ret != 4)
-+return FALSE;
-+sprintf(pci_str, "pci:%04x:%02x:%02x.%d", domain, bus, dev, func);
-+return TRUE;
-+}
-+
- static void
- config_udev_odev_setup_attribs(const char *path, const char *syspath,
-int major, int minor,
-config_odev_probe_proc_ptr probe_callback)
- {
- struct OdevAttributes *attribs = config_odev_allocate_attributes();
-+const char *platform;
-
- attribs->path = XNFstrdup(path);
- attribs->syspath = XNFstrdup(syspath);
- attribs->major = major;
- attribs->minor = minor;
-
-+if (strstr(syspath, "/devices/pci")) {
-+char pci_str[17];
-+const char *end = strstr(syspath, "/drm/card");
-+if (strstr(syspath, "/usb"))
-+attribs->busid = strdup("");
-+else if (get_pci_busid(end - 13, pci_str))
-+attribs->busid = strdup(pci_str);
-+} else if ((platform = strstr(syspath, "/devices/platform/"))) {
-+/* OMAP relies on this, modesetting doesn't use it */
-+const char *end;
-+platform += 18;
-+end = strchr(platform, '.');
-+if (end) {
-+char *busid;
-+int ret;
-+
-+ret = asprintf(&busid, "platform:%.*s:%02li",
-+ (int)(end - platform), platform, strtol(end + 1,
NULL, 10));
-+if (ret >= 0) {
-+
xorg-server: Changes to 'ubuntu-xenial-lts'
Xext/panoramiXprocs.c |4 Xext/saver.c |2 Xext/shm.c | 17 Xi/exevents.c |3 configure.ac | 28 - debian/changelog | 32 + debian/control |6 debian/patches/os-treat-ssh-as-a-non-local-client.diff | 97 --- debian/patches/randr-adjust-masters-last-set-time.diff | 39 + debian/patches/randr-do-not-check-the-screen-size.diff | 87 +++ debian/patches/series |8 debian/rules |2 dix/cursor.c | 23 dix/devices.c |3 dix/enterleave.c | 20 dix/ptrveloc.c | 10 exa/exa_glyphs.c |8 exa/exa_render.c |3 glamor/glamor.c| 45 + glamor/glamor.h|1 glamor/glamor_composite_glyphs.c |5 glamor/glamor_compositerects.c | 18 glamor/glamor_copy.c |8 glamor/glamor_dash.c |3 glamor/glamor_egl.c| 11 glamor/glamor_fbo.c|4 glamor/glamor_priv.h | 28 + glamor/glamor_program.c|8 glamor/glamor_render.c | 94 ++- glamor/glamor_spans.c |3 glamor/glamor_text.c | 13 glamor/glamor_transfer.c |3 glamor/glamor_transform.c | 12 glamor/glamor_transform.h |4 glx/glxext.c |6 hw/kdrive/linux/keyboard.c | 441 - hw/xfree86/common/xf86Config.c | 68 +- hw/xfree86/common/xf86Configure.c |2 hw/xfree86/common/xf86Init.c |4 hw/xfree86/common/xf86Privstr.h|1 hw/xfree86/drivers/modesetting/Makefile.am |2 hw/xfree86/drivers/modesetting/driver.c| 85 ++- hw/xfree86/drivers/modesetting/drmmode_display.c | 99 ++- hw/xfree86/drivers/modesetting/drmmode_display.h |2 hw/xfree86/drivers/modesetting/present.c |9 hw/xfree86/drivers/modesetting/sh3224.c| 140 + hw/xfree86/drivers/modesetting/sh3224.h|7 hw/xfree86/int10/xf86x86emu.c |2 hw/xfree86/man/xorg.conf.man |4 hw/xfree86/modes/xf86Crtc.c|3 hw/xfree86/os-support/linux/lnx_init.c | 10 hw/xfree86/x86emu/x86emu/regs.h|8 hw/xquartz/bundle/Info.plist.cpp | 23 hw/xquartz/bundle/Makefile.am |6 hw/xwayland/xwayland-cursor.c | 15 hw/xwayland/xwayland-glamor-xv.c |2 hw/xwayland/xwayland-glamor.c |3 hw/xwayland/xwayland-output.c | 17 hw/xwayland/xwayland-shm.c | 10 hw/xwayland/xwayland.h |2 include/xkbsrv.h |4 os/access.c| 44 + present/present.c | 33 - randr/rrprovider.c |2 render/picture.h |2 xkb/xkb.c |5 xkb/xkbEvents.c|2 xkb/xkbLEDs.c |2 68 files changed, 933 insertions(+), 784 deletions(-) New commits: commit 196add85e71375e06d22197e27dd4ef386307f86 Author: Timo Aaltonen Date: Thu Sep 1 12:31:38 2016 +0300 upload to trusty diff --git a/debian/changelog b/debian/changelog index 264e977..7e66326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server-lts-xenial (2:1.18.4-0ubuntu0.1~trusty1) trusty; urgency=medium + + * Backport for lts-xenial stack. + + -- Timo Aaltonen Thu, 01 Sep 2016 10:39:51 +0300 + xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium * New upstream bugfix re
xorg-server: Changes to 'ubuntu-xenial'
Xext/panoramiXprocs.c |4 Xext/saver.c |2 Xext/shm.c | 17 Xi/exevents.c |3 configure.ac | 28 - debian/changelog |9 debian/patches/randr-adjust-masters-last-set-time.diff | 39 + debian/patches/randr-do-not-check-the-screen-size.diff | 87 +++ debian/patches/series |2 dix/cursor.c | 23 dix/devices.c |3 dix/enterleave.c | 20 dix/ptrveloc.c | 10 exa/exa_glyphs.c |8 exa/exa_render.c |3 glamor/glamor.c| 45 + glamor/glamor.h|1 glamor/glamor_composite_glyphs.c |5 glamor/glamor_compositerects.c | 18 glamor/glamor_copy.c |8 glamor/glamor_dash.c |3 glamor/glamor_egl.c| 11 glamor/glamor_fbo.c|4 glamor/glamor_priv.h | 28 + glamor/glamor_program.c|8 glamor/glamor_render.c | 94 ++- glamor/glamor_spans.c |3 glamor/glamor_text.c | 13 glamor/glamor_transfer.c |3 glamor/glamor_transform.c | 12 glamor/glamor_transform.h |4 glx/glxext.c |6 hw/kdrive/linux/keyboard.c | 441 - hw/xfree86/common/xf86Config.c | 68 +- hw/xfree86/common/xf86Configure.c |2 hw/xfree86/common/xf86Init.c |4 hw/xfree86/common/xf86Privstr.h|1 hw/xfree86/drivers/modesetting/Makefile.am |2 hw/xfree86/drivers/modesetting/driver.c| 85 ++- hw/xfree86/drivers/modesetting/drmmode_display.c | 99 ++- hw/xfree86/drivers/modesetting/drmmode_display.h |2 hw/xfree86/drivers/modesetting/present.c |9 hw/xfree86/drivers/modesetting/sh3224.c| 140 + hw/xfree86/drivers/modesetting/sh3224.h|7 hw/xfree86/int10/xf86x86emu.c |2 hw/xfree86/man/xorg.conf.man |4 hw/xfree86/modes/xf86Crtc.c|3 hw/xfree86/os-support/linux/lnx_init.c | 10 hw/xfree86/x86emu/x86emu/regs.h|8 hw/xquartz/bundle/Info.plist.cpp | 23 hw/xquartz/bundle/Makefile.am |6 hw/xwayland/xwayland-cursor.c | 15 hw/xwayland/xwayland-glamor-xv.c |2 hw/xwayland/xwayland-glamor.c |3 hw/xwayland/xwayland-output.c | 17 hw/xwayland/xwayland-shm.c | 10 hw/xwayland/xwayland.h |2 include/xkbsrv.h |4 os/access.c| 44 + present/present.c | 33 - randr/rrprovider.c |2 render/picture.h |2 xkb/xkb.c |5 xkb/xkbEvents.c|2 xkb/xkbLEDs.c |2 65 files changed, 902 insertions(+), 681 deletions(-) New commits: commit 08ac7a85d7dd1b1ea19ee6632a6ccd7c744f1745 Author: Timo Aaltonen Date: Thu Sep 1 10:08:35 2016 +0300 release to xenial diff --git a/debian/changelog b/debian/changelog index 7053a70..4b59371 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xorg-server (2:1.18.4-0ubuntu0.1) UNRELEASED; urgency=medium +xorg-server (2:1.18.4-0ubuntu0.1) xenial; urgency=medium - * New upstream bugfix release. + * New upstream bugfix release. (LP: #1619142) * randr-adjust-masters-last-set-time.diff, randr-do-not-check-the-screen-size.diff: Fix issues changing display mode on prime setups. (LP: #1586260) - -- Timo Aaltonen Mon, 01 Aug 2016 14:36:15 +0300 + -- Timo Aaltonen Thu, 01 S
xorg-server: Changes to 'ubuntu-xenial-lts'
debian/changelog | 10
debian/control | 20
debian/include/Xpoll.h | 227
debian/patches/dont-depend-on-new-coreproto.patch | 22
debian/patches/revert-configurable-maximum-number-of-clients.patch | 497
--
debian/patches/series |2
debian/rules |2
7 files changed, 262 insertions(+), 518 deletions(-)
New commits:
commit 049e49b665ac00e1338f59d34b3ba660dcda6147
Author: Timo Aaltonen
Date: Wed Aug 3 14:38:37 2016 +0300
Don't build -legacy-lts-xenial, the wrapper is still in x11-common and this
is not needed on trusty.
diff --git a/debian/changelog b/debian/changelog
index 7283e84..b58e9ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server-lts-xenial (2:1.18.3-1ubuntu2.2~trusty2)
UNRELEASED; urgency=medium
* Don't revert configurable maxclients, just revert needing the new
coreproto and use an internal copy of Xpoll.h from x11proto-core-dev
v7.0.28. Fixes nvidia.
+ * Don't build -legacy-lts-xenial, the wrapper is still in x11-common
+and this is not needed on trusty.
-- Timo Aaltonen Wed, 03 Aug 2016 11:05:22 +0300
diff --git a/debian/control b/debian/control
index 47babf9..af1b365 100644
--- a/debian/control
+++ b/debian/control
@@ -440,23 +440,3 @@ Description: Xwayland X server
Replaces: xwayland
Provides: xwayland, xorg-renamed-package, xorg-renamed-package-lts-xenial
Conflicts: xwayland, xorg-renamed-package-lts-utopic,
xorg-renamed-package-lts-vivid, xorg-renamed-package-lts-wily,
-
-Package: xserver-xorg-legacy-lts-xenial
-Architecture: any
-Priority: extra
-Depends:
- xserver-common,
- ${shlibs:Depends},
- ${misc:Depends},
-Breaks:
- x11-common (<< 1:7.7+10~),
- xserver-xorg-core-lts-xenial (<< 2:1.17.2-3~),
-Replaces:
- xserver-xorg-legacy,
- x11-common (<< 1:7.7+10~),
- xserver-xorg-core-lts-xenial (<< 2:1.17.2-3~),
-Description: setuid root Xorg server wrapper
- This package provides a wrapper for the Xorg X server, which is
- necessary for legacy drivers and non-Linux kernels.
-Provides: xserver-xorg-legacy, xorg-renamed-package,
xorg-renamed-package-lts-xenial
-Conflicts: xserver-xorg-legacy, xorg-renamed-package-lts-utopic,
xorg-renamed-package-lts-vivid, xorg-renamed-package-lts-wily,
commit 324735fe1a8056af6d5927697b8972a10c4fcd8c
Author: Timo Aaltonen
Date: Wed Aug 3 13:30:17 2016 +0300
use an internal copy of Xpoll.h to fix nvidia
diff --git a/debian/changelog b/debian/changelog
index 1d4c01b..7283e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server-lts-xenial (2:1.18.3-1ubuntu2.2~trusty2) UNRELEASED; urgency=medium
+
+ * Don't revert configurable maxclients, just revert needing the new
+coreproto and use an internal copy of Xpoll.h from x11proto-core-dev
+v7.0.28. Fixes nvidia.
+
+ -- Timo Aaltonen Wed, 03 Aug 2016 11:05:22 +0300
+
xorg-server-lts-xenial (2:1.18.3-1ubuntu2.2~trusty1) trusty; urgency=medium
* Backport for lts-xenial stack.
diff --git a/debian/include/Xpoll.h b/debian/include/Xpoll.h
new file mode 100644
index 000..3ffc15c
--- /dev/null
+++ b/debian/include/Xpoll.h
@@ -0,0 +1,227 @@
+/*
+
+Copyright 1994, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+/*
+ * Copyright © 2005 Daniel Stone
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Daniel Stone not be used in advertising
xorg-server: Changes to 'ubuntu-xenial-lts'
New branch 'ubuntu-xenial-lts' available with the following commits: commit e5b74d97ce99ed9b5df61273a19e1c1284ad72ce Author: Timo Aaltonen Date: Mon Jul 4 23:23:50 2016 +0300 relax dev package dep on coreproto commit b381655e209efad59b1e19f7157231283552c0cd Author: Timo Aaltonen Date: Wed Jun 29 00:02:31 2016 +0300 first upload to trusty commit 86350c308b6290fce0fcda8a6e1ce5b9e07ade75 Author: Timo Aaltonen Date: Wed Jun 29 00:02:10 2016 +0300 rules: work around ftbfs on ppc64el commit 61f766bc640d6b6b787fe4b3e4248a0333d090e8 Author: Timo Aaltonen Date: Tue Jun 28 17:16:23 2016 +0300 don't depend on newer coreproto commit 8eef939979fc0d9fee163eb8b8ef075ebbb1c713 Author: Timo Aaltonen Date: Tue Jun 28 13:24:36 2016 +0300 don't depend on libsystemd-dev commit 4e7f0c1196439d4132d368fb2b773c9827c5ccf3 Author: Timo Aaltonen Date: Tue Jun 28 13:20:10 2016 +0300 lts-xenial packaging
xorg-server: Changes to 'ubuntu'
debian/changelog | 11
debian/patches/xmir.patch | 114 +++---
2 files changed, 80 insertions(+), 45 deletions(-)
New commits:
commit 9932b3a4ba4b36fc896ebe8a8cc5d30c878c6da8
Author: Robert Ancell
Date: Thu Jul 28 14:51:17 2016 +1200
* debian/patches/xmir.patch:
- Fix button/menu focus failures (LP: #1590553)
- Implement XWMHints properly
- Add smooth touchpad scroll support (LP: #1603917)
- Fix key repeat order
- Remove links to Unity8 bugs that are now fixed.
diff --git a/debian/changelog b/debian/changelog
index 70d2704..8314f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.18.4-1ubuntu4) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix button/menu focus failures (LP: #1590553)
+- Implement XWMHints properly
+- Add smooth touchpad scroll support (LP: #1603917)
+- Fix key repeat order
+- Remove links to Unity8 bugs that are now fixed.
+
+ -- Robert Ancell Thu, 28 Jul 2016 14:31:22
+1200
+
xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index d4eccf3..411585b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From c93f490c0c560c82ffc2dd3b6095f6e390b0fb81 Mon Sep 17 00:00:00 2001
+From f270f91a106d212e5b4a920a64e88f56d40a8336 Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -16,7 +16,7 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 +++
+ hw/xmir/dri2/dri2.c | 1398 ++
hw/xmir/dri2/dri2.h | 364 +
hw/xmir/dri2/dri2ext.c | 683 +
hw/xmir/dri2/dri2int.h | 26 +
@@ -24,12 +24,12 @@ Contributions from:
hw/xmir/xmir-cvt.c | 304
hw/xmir/xmir-dri2.c | 551 ++
hw/xmir/xmir-glamor.c | 1160 +
- hw/xmir/xmir-input.c| 595 +++
+ hw/xmir/xmir-input.c| 609 +++
hw/xmir/xmir-output.c | 428 +++
hw/xmir/xmir-thread-proxy.c | 115 +++
- hw/xmir/xmir.c | 1719 +++
+ hw/xmir/xmir.c | 1729 +++
hw/xmir/xmir.h | 230 ++
- 18 files changed, 7891 insertions(+), 2 deletions(-)
+ 18 files changed, 7915 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -4972,10 +4972,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..e62e16c
+index 000..21b7abe
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,595 @@
+@@ -0,0 +1,609 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5020,7 +5020,7 @@ index 000..e62e16c
+xmir_pointer_proc(DeviceIntPtr device, int what)
+{
+#define NBUTTONS 10
-+#define NAXES 2
++#define NAXES 4
+BYTE map[NBUTTONS + 1];
+int i = 0;
+Atom btn_labels[NBUTTONS] = { 0 };
@@ -5044,8 +5044,10 @@ index 000..e62e16c
+
+axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
++axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_HWHEEL);
++axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_WHEEL);
+
-+if (!InitValuatorClassDeviceStruct(device, 2, btn_labels,
++if (!InitValuatorClassDeviceStruct(device, NAXES, btn_labels,
+ GetMotionHistorySize(), Absolute))
+return BadValue;
+
@@ -5054,6 +5056,13 @@ index 000..e62e16c
+ 0, 0x, 1, 0, 1, Absolute);
+InitValuatorAxisStruct(device, 1, axes_labels[1],
+ 0, 0x, 1, 0, 1, Absolute);
++InitValuatorAxisStruct(device, 2, axes_labels[2],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0,
Relative);
++InitValuatorAxisStruct(device, 3, axes_labels[3],
++ NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0,
Relative);
++
++SetScrollValuator(device, 2, SCROLL_TYPE_HORIZONTAL, 1.0,
SCROLL_FLAG_NONE);
++SetScrollValuator(device, 3, SCROLL_TYPE_VERTICAL, 1.0,
SCROLL_FLAG_PREFERRED);
+
+if (!InitPtrFeedbackClassDeviceStruct(device, xmir_pointer_control))
+return BadValue;
@@ -5198,7 +5207,7 @@ index 000..e62e16c
+{
+int sx = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
+int sy =
xorg-server: Changes to 'ubuntu'
debian/changelog | 12 ++ debian/patches/xmir.patch | 248 +++--- 2 files changed, 180 insertions(+), 80 deletions(-) New commits: commit 858b1addb8c1a46c427a6199d7f631ef79af651e Author: Robert Ancell Date: Thu Jul 21 15:17:26 2016 +0200 Update xmir.patch diff --git a/debian/changelog b/debian/changelog index ff9b686..70d2704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium + + * debian/patches/xmir.patch: +- Fix bottom/right edge corruption. (LP: #1510849) +- Fix key repeat. (LP: #1591356) +- Don't delete outputs without replacing them. (LP: #1504422) (LP: #1602561) +- Xmir -debug: Log WM types by name and number. +- Implement fake GLX frame notification/timing. +- Improve focus tracking. + + -- Robert Ancell Thu, 21 Jul 2016 11:42:03 +0200 + xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium * debian/control, debian/rules: diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index e7ff8d7..d4eccf3 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -1,4 +1,4 @@ -From eb0fb72f618ea17a90d6c535d38e12b5f95fcec8 Mon Sep 17 00:00:00 2001 +From c93f490c0c560c82ffc2dd3b6095f6e390b0fb81 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 29 Apr 2016 14:57:53 +0200 Subject: [PATCH xserver 1/3] XMir DDX @@ -16,20 +16,20 @@ Contributions from: hw/xmir/.gitignore |1 + hw/xmir/Makefile.am | 61 ++ hw/xmir/dri2/Makefile.am| 14 + - hw/xmir/dri2/dri2.c | 1398 + - hw/xmir/dri2/dri2.h | 364 ++ - hw/xmir/dri2/dri2ext.c | 683 ++ + hw/xmir/dri2/dri2.c | 1398 +++ + hw/xmir/dri2/dri2.h | 364 + + hw/xmir/dri2/dri2ext.c | 683 + hw/xmir/dri2/dri2int.h | 26 + hw/xmir/xmir-cursor.c | 210 ++ hw/xmir/xmir-cvt.c | 304 - hw/xmir/xmir-dri2.c | 551 +++ - hw/xmir/xmir-glamor.c | 1160 +++ - hw/xmir/xmir-input.c| 592 - hw/xmir/xmir-output.c | 449 - hw/xmir/xmir-thread-proxy.c | 109 +++ - hw/xmir/xmir.c | 1622 +++ - hw/xmir/xmir.h | 227 ++ - 18 files changed, 7803 insertions(+), 2 deletions(-) + hw/xmir/xmir-dri2.c | 551 ++ + hw/xmir/xmir-glamor.c | 1160 + + hw/xmir/xmir-input.c| 595 +++ + hw/xmir/xmir-output.c | 428 +++ + hw/xmir/xmir-thread-proxy.c | 115 +++ + hw/xmir/xmir.c | 1719 +++ + hw/xmir/xmir.h | 230 ++ + 18 files changed, 7891 insertions(+), 2 deletions(-) create mode 100644 hw/xmir/.gitignore create mode 100644 hw/xmir/Makefile.am create mode 100644 hw/xmir/dri2/Makefile.am @@ -48,10 +48,10 @@ Contributions from: create mode 100644 hw/xmir/xmir.h diff --git a/configure.ac b/configure.ac -index 77cf234..8bf62a0 100644 +index 868e859..dac8887 100644 --- a/configure.ac +++ b/configure.ac -@@ -628,6 +628,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server +@@ -638,6 +638,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) @@ -59,7 +59,7 @@ index 77cf234..8bf62a0 100644 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no]) -@@ -746,6 +747,7 @@ case $host_os in +@@ -756,6 +757,7 @@ case $host_os in XVFB=no XNEST=no XWAYLAND=no @@ -67,7 +67,7 @@ index 77cf234..8bf62a0 100644 COMPOSITE=no DGA=no -@@ -2482,6 +2484,27 @@ if test "x$XWAYLAND" = xyes; then +@@ -2492,6 +2494,27 @@ if test "x$XWAYLAND" = xyes; then
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |9 +++--
debian/control |6 +++---
debian/rules |2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 93b5b3bf09b2c82f168b73097bfe2d43ca0572d6
Author: Timo Aaltonen
Date: Thu Jul 21 08:29:03 2016 +0300
release to xenial
diff --git a/debian/changelog b/debian/changelog
index ed6b1f8..8d51676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu2.3) xenial; urgency=medium
[ Timo Aaltonen ]
* control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl.
@@ -8,7 +8,7 @@ xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
* debian/control, debian/rules:
- Build xmir for arm64 (LP: #1604851).
- -- Timo Aaltonen Tue, 05 Jul 2016 01:53:51 +0300
+ -- Timo Aaltonen Thu, 21 Jul 2016 08:27:07 +0300
xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
commit 63aa20ed8198bda44f93ff5f0725a7af0ab5a15b
Author: Timo Aaltonen
Date: Thu Jul 21 06:09:32 2016 +0300
control, rules: Build xmir for arm64
diff --git a/debian/changelog b/debian/changelog
index 429139c..ed6b1f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl.
(LP: #1574320)
+ [ Łukasz 'sil2100' Zemczak ]
+ * debian/control, debian/rules:
+- Build xmir for arm64 (LP: #1604851).
+
-- Timo Aaltonen Tue, 05 Jul 2016 01:53:51 +0300
xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
diff --git a/debian/control b/debian/control
index 9f5e9f0..9843ce2 100644
--- a/debian/control
+++ b/debian/control
@@ -103,7 +103,7 @@ Build-Depends:
# systemd-daemon
libsystemd-dev [linux-any],
# XMir
- libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x],
+ libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],
mir-client-platform-mesa-dev,
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
@@ -224,7 +224,7 @@ Depends:
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
- libmirclient-dev [!arm64 !powerpc !ppc64el],
+ libmirclient-dev [!powerpc !ppc64el],
mir-client-platform-mesa-dev,
${misc:Depends},
Description: Xorg X server - development files
@@ -384,7 +384,7 @@ Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
Package: xmir
-Architecture: amd64 armhf i386
+Architecture: amd64 arm64 armhf i386
Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
diff --git a/debian/rules b/debian/rules
index 9169ed7..f3ddb43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
+ifneq (,$(filter $(DEB_HOST_ARCH), powerpc ppc64el s390x))
build_xmir = --disable-xmir
endif
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |6 +++---
debian/rules |2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 015df102d657e90b26a9e4b70876b7e9fc8651d7
Author: Timo Aaltonen
Date: Thu Jul 21 06:09:32 2016 +0300
control, rules: Build xmir for arm64
diff --git a/debian/changelog b/debian/changelog
index 73cfddf..ff9b686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium
+
+ * debian/control, debian/rules:
+- Build xmir for arm64 (LP: #1604851).
+
+ -- Łukasz 'sil2100' Zemczak Wed, 20 Jul 2016
18:55:21 +0200
+
xorg-server (2:1.18.4-1ubuntu1) yakkety; urgency=medium
* Merge from debian.
diff --git a/debian/control b/debian/control
index 629be03..2b9849d 100644
--- a/debian/control
+++ b/debian/control
@@ -103,7 +103,7 @@ Build-Depends:
# systemd-daemon
libsystemd-dev [linux-any],
# XMir
- libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x],
+ libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],
mir-client-platform-mesa-dev,
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
@@ -222,7 +222,7 @@ Depends:
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
- libmirclient-dev [!arm64 !powerpc !ppc64el],
+ libmirclient-dev [!powerpc !ppc64el],
mir-client-platform-mesa-dev,
${misc:Depends},
Description: Xorg X server - development files
@@ -382,7 +382,7 @@ Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
Package: xmir
-Architecture: amd64 armhf i386
+Architecture: amd64 arm64 armhf i386
Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
diff --git a/debian/rules b/debian/rules
index 9169ed7..f3ddb43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
+ifneq (,$(filter $(DEB_HOST_ARCH), powerpc ppc64el s390x))
build_xmir = --disable-xmir
endif
xorg-server: Changes to 'ubuntu'
Xext/panoramiXprocs.c |4 Xext/saver.c|2 Xext/shm.c | 17 Xi/exevents.c |3 configure.ac| 28 debian/changelog| 22 debian/patches/glamor-disable-logic-ops-when-doing-compositing.diff | 57 - debian/patches/os-treat-ssh-as-a-non-local-client.diff | 97 -- debian/patches/series |4 debian/xserver-xorg-core.NEWS | 14 dix/cursor.c| 23 dix/devices.c |3 dix/enterleave.c| 20 dix/ptrveloc.c | 10 exa/exa_glyphs.c|8 exa/exa_render.c|3 glamor/glamor.c | 45 + glamor/glamor.h |1 glamor/glamor_composite_glyphs.c|5 glamor/glamor_compositerects.c | 18 glamor/glamor_copy.c|8 glamor/glamor_dash.c|3 glamor/glamor_egl.c | 11 glamor/glamor_fbo.c |4 glamor/glamor_priv.h| 28 glamor/glamor_program.c |8 glamor/glamor_render.c | 94 +- glamor/glamor_spans.c |3 glamor/glamor_text.c| 13 glamor/glamor_transfer.c|3 glamor/glamor_transform.c | 12 glamor/glamor_transform.h |4 glx/glxext.c|6 hw/kdrive/linux/keyboard.c | 441 -- hw/xfree86/common/xf86Config.c | 68 + hw/xfree86/common/xf86Configure.c |2 hw/xfree86/common/xf86Init.c|4 hw/xfree86/common/xf86Privstr.h |1 hw/xfree86/drivers/modesetting/Makefile.am |2 hw/xfree86/drivers/modesetting/driver.c | 85 + hw/xfree86/drivers/modesetting/drmmode_display.c| 99 +- hw/xfree86/drivers/modesetting/drmmode_display.h|2 hw/xfree86/drivers/modesetting/present.c|9 hw/xfree86/drivers/modesetting/sh3224.c | 140 +++ hw/xfree86/drivers/modesetting/sh3224.h |7 hw/xfree86/int10/xf86x86emu.c |2 hw/xfree86/man/xorg.conf.man|4 hw/xfree86/modes/xf86Crtc.c |3 hw/xfree86/os-support/linux/lnx_init.c | 10 hw/xfree86/x86emu/x86emu/regs.h |8 hw/xquartz/bundle/Info.plist.cpp| 23 hw/xquartz/bundle/Makefile.am |6 hw/xwayland/xwayland-cursor.c | 15 hw/xwayland/xwayland-glamor-xv.c|2 hw/xwayland/xwayland-glamor.c |3 hw/xwayland/xwayland-output.c | 17 hw/xwayland/xwayland-shm.c | 10 hw/xwayland/xwayland.h |2 include/xkbsrv.h|4 os/access.c | 44 present/present.c | 33 randr/rrprovider.c |2 render/picture.h|2 xkb/xkb.c |5 xkb/xkbEvents.c
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |7 +++
debian/control |2 ++
2 files changed, 9 insertions(+)
New commits:
commit b15db4ee1224819f2d1f23f2d6d4d713fb13068a
Author: Timo Aaltonen
Date: Tue Jul 5 01:54:11 2016 +0300
control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl. (LP:
#1574320)
diff --git a/debian/changelog b/debian/changelog
index b31bc7c..429139c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
+
+ * control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl.
+(LP: #1574320)
+
+ -- Timo Aaltonen Tue, 05 Jul 2016 01:53:51 +0300
+
xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/control b/debian/control
index 629be03..9f5e9f0 100644
--- a/debian/control
+++ b/debian/control
@@ -156,10 +156,12 @@ Breaks:
xserver-xorg (<< 1:7.7+10~),
systemd (<< 226-4~),
Replaces:
+ xserver-xorg-video-glamoregl,
xserver-xorg-video-modesetting,
xserver-xorg (<< 1:7.7+10~),
Conflicts:
xserver-xorg-input-evtouch,
+ xserver-xorg-video-glamoregl,
xserver-xorg-video-modesetting,
Provides:
${videoabi},
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +++
debian/patches/06_use-intel-only-on-pre-gen4.diff | 30 ++
debian/patches/08_xfree86_fix_ia64_inx_outx.diff | 66 --
debian/patches/series |2
4 files changed, 40 insertions(+), 67 deletions(-)
New commits:
commit 192254841ab79e102c18fc299f18af0e27d5b517
Author: Timo Aaltonen
Date: Wed Jul 6 14:28:01 2016 +0300
06_use-intel-only-on-pre-gen4.diff: Use modesetting driver on intel gen4
and newer.
diff --git a/debian/changelog b/debian/changelog
index e292425..0d99e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.18.3-2) UNRELEASED; urgency=medium
* Drop 08_xfree86_fix_ia64_inx_outx.diff from the tree, it wasn't
applied anyway since Dec'14.
+ * 06_use-intel-only-on-pre-gen4.diff: Use modesetting driver on intel
+gen4 and newer.
-- Timo Aaltonen Thu, 12 May 2016 18:22:02 +0300
diff --git a/debian/patches/06_use-intel-only-on-pre-gen4.diff
b/debian/patches/06_use-intel-only-on-pre-gen4.diff
new file mode 100644
index 000..4994492
--- /dev/null
+++ b/debian/patches/06_use-intel-only-on-pre-gen4.diff
@@ -0,0 +1,30 @@
+Description: Use intel ddx only on pre-gen4 hw, newer ones will fall back to
modesetting
+Author: Timo Aaltonen
+
+--- a/hw/xfree86/common/xf86pciBus.c
b/hw/xfree86/common/xf86pciBus.c
+@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_devi
+ case 0x0bef:
+ /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
+ break;
+- default:
++ /* Default to intel only on pre-gen4 chips */
++ case 0x3577:
++ case 0x2562:
++ case 0x3582:
++ case 0x358e:
++ case 0x2572:
++ case 0x2582:
++ case 0x258a:
++ case 0x2592:
++ case 0x2772:
++ case 0x27a2:
++ case 0x27ae:
++ case 0x29b2:
++ case 0x29c2:
++ case 0x29d2:
++ case 0xa001:
++ case 0xa011:
+ driverList[0] = "intel";
+ break;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index fbdd595..ef422b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@
02_kbsd-input-devd.diff
03_static-nettle.diff
05_Revert-Unload-submodules.diff
+06_use-intel-only-on-pre-gen4.diff
os-treat-ssh-as-a-non-local-client.diff
commit d3a8cda2f683dbc661ff9f4ae9c2d8bafb490264
Author: Timo Aaltonen
Date: Thu May 12 18:22:07 2016 +0300
Drop 08_xfree86_fix_ia64_inx_outx.diff from the tree, it wasn't applied
anyway since Dec'14.
diff --git a/debian/changelog b/debian/changelog
index ec0468a..e292425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-2) UNRELEASED; urgency=medium
+
+ * Drop 08_xfree86_fix_ia64_inx_outx.diff from the tree, it wasn't
+applied anyway since Dec'14.
+
+ -- Timo Aaltonen Thu, 12 May 2016 18:22:02 +0300
+
xorg-server (2:1.18.3-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
deleted file mode 100644
index 8c506aa..000
--- a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephan Schreiber
-Subject: xfree86: restore {in,out}{b,w,l} on linux/ia64
-
-Call the equivalent glibc functions.
-
-Debian bug #685750
-
-Index: xorg-server/hw/xfree86/common/compiler.h
-===
xorg-server.orig/hw/xfree86/common/compiler.h
-+++ xorg-server/hw/xfree86/common/compiler.h
-@@ -439,6 +439,54 @@ extern _X_EXPORT unsigned int inl(unsign
- #include
- #endif /* __NetBSD__ */
-
-+#elif defined(linux) && defined(__ia64__)
-+/* for Linux on ia64, we use the LIBC _inx/_outx routines */
-+/* note that the appropriate setup via "ioperm" needs to be done */
-+/* *before* any inx/outx is done. */
-+
-+extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
-+extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
-+extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
-+extern _X_EXPORT unsigned int _inb(unsigned long port);
-+extern _X_EXPORT unsigned int _inw(unsigned long port);
-+extern _X_EXPORT unsigned int _inl(unsigned long port);
-+
-+static __inline__ void
-+outb(unsigned long port, unsigned char val)
-+{
-+_outb(val, port);
-+}
-+
-+static __inline__ void
-+outw(unsigned long port, unsigned short val)
-+{
-+_outw(val, port);
-+}
-+
-+static __inline__ void
-+outl(unsigned long port, unsigned int val)
-+{
-+_outl(val, port);
-+}
-+
-+static __inline__ unsigned int
-+inb(unsigned long port)
-+{
-+return _inb(port);
-+}
-+
xorg-server: Changes to 'ubuntu'
debian/changelog|7 +
debian/patches/glamor-disable-logic-ops-when-doing-compositing.diff | 57
++
debian/patches/series |1
3 files changed, 65 insertions(+)
New commits:
commit c503e43e3ef697223e4ebdc6df646ecba8b7bce3
Author: Timo Aaltonen
Date: Tue Jul 5 02:08:12 2016 +0300
release to yakkety
diff --git a/debian/changelog b/debian/changelog
index 62ce0e6..38e28bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.18.3-1ubuntu7) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu7) yakkety; urgency=medium
* glamor-disable-logic-ops-when-doing-compositing.diff: Fix
libreoffice with glamor. (LP: #1575000)
- -- Timo Aaltonen Tue, 05 Jul 2016 02:06:06 +0300
+ -- Timo Aaltonen Tue, 05 Jul 2016 02:08:01 +0300
xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium
commit 5eefb353f1a60ef1b25e224008bd185f2b5865b7
Author: Timo Aaltonen
Date: Tue Jul 5 02:06:36 2016 +0300
glamor-disable-logic-ops-when-doing-compositing.diff: Fix libreoffice with
glamor.
diff --git a/debian/changelog b/debian/changelog
index 50209bc..62ce0e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu7) UNRELEASED; urgency=medium
+
+ * glamor-disable-logic-ops-when-doing-compositing.diff: Fix
+libreoffice with glamor. (LP: #1575000)
+
+ -- Timo Aaltonen Tue, 05 Jul 2016 02:06:06 +0300
+
xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git
a/debian/patches/glamor-disable-logic-ops-when-doing-compositing.diff
b/debian/patches/glamor-disable-logic-ops-when-doing-compositing.diff
new file mode 100644
index 000..9f1ecc0
--- /dev/null
+++ b/debian/patches/glamor-disable-logic-ops-when-doing-compositing.diff
@@ -0,0 +1,57 @@
+commit 743b6f231e999d8b2909228412266dc13cc433c5
+Author: Keith Packard
+Date: Fri May 13 04:25:43 2016 -0700
+
+glamor: Disable logic ops when doing compositing [v4]
+
+If the logic op gets left enabled, it overrides the blending
+operation, causing incorrect contents on the display.
+
+v2: Disable only on non-ES2, but disable even for PictOpSrc
+
+v3: Found another place this is needed in
+glamor_composite_set_shader_blend
+
+v4: Remove change dependent on new glamor_set_composite_texture
+API. This belongs in a different patch.
+Found by Emil Velikov
+
+Signed-off-by: Keith Packard
+Reviewed-by: Michel Dänzer
+
+diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c
+index 0a94de6..322d198 100644
+--- a/glamor/glamor_program.c
b/glamor/glamor_program.c
+@@ -445,6 +445,7 @@ static struct blendinfo composite_op_info[] = {
+ static void
+ glamor_set_blend(CARD8 op, glamor_program_alpha alpha, PicturePtr dst)
+ {
++glamor_screen_private *glamor_priv =
glamor_get_screen_private(dst->pDrawable->pScreen);
+ GLenum src_blend, dst_blend;
+ struct blendinfo *op_info;
+
+@@ -459,6 +460,9 @@ glamor_set_blend(CARD8 op, glamor_program_alpha alpha,
PicturePtr dst)
+ break;
+ }
+
++if (glamor_priv->gl_flavor != GLAMOR_GL_ES2)
++glDisable(GL_COLOR_LOGIC_OP);
++
+ if (op == PictOpSrc)
+ return;
+
+diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
+index 88781d9..aa3a566 100644
+--- a/glamor/glamor_render.c
b/glamor/glamor_render.c
+@@ -1091,6 +1091,9 @@ glamor_composite_set_shader_blend(glamor_screen_private
*glamor_priv,
+ }
+ }
+
++if (glamor_priv->gl_flavor != GLAMOR_GL_ES2)
++glDisable(GL_COLOR_LOGIC_OP);
++
+ if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) {
+ glDisable(GL_BLEND);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index c204c32..72699de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ drm_device_keep_trying.patch
xi2-resize-touch.patch
randr-adjust-masters-last-set-time.diff
randr-do-not-check-the-screen-size.diff
+glamor-disable-logic-ops-when-doing-compositing.diff
xorg-server: Changes to 'ubuntu'
debian/changelog |7 ++
debian/patches/xmir.patch | 117 ++
2 files changed, 95 insertions(+), 29 deletions(-)
New commits:
commit 06448c36b89b794b407bfcbb895d6ce981d6690f
Author: Robert Ancell
Date: Wed Jun 1 11:32:40 2016 +1200
* debian/patches/xmir.patch:
- Add focus/unfocus event passing (LP: #1582471)
diff --git a/debian/changelog b/debian/changelog
index a12f0ce..50209bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Add focus/unfocus event passing (LP: #1582471)
+
+ -- Robert Ancell Wed, 01 Jun 2016 11:07:46
+1200
+
xorg-server (2:1.18.3-1ubuntu5) yakkety; urgency=medium
* randr-adjust-masters-last-set-time.diff,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 2ce304b..e7ff8d7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From b91d0ee0a8f92865dbf0ab6b402ff15a19aa6992 Mon Sep 17 00:00:00 2001
+From eb0fb72f618ea17a90d6c535d38e12b5f95fcec8 Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -9,26 +9,27 @@ Contributions from:
Robert Ancell
Andreas Pokorny
Daniel van Vugt
+ Chris Townsend
---
configure.ac| 25 +
hw/Makefile.am |9 +-
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.c | 1398 +
hw/xmir/dri2/dri2.h | 364 ++
- hw/xmir/dri2/dri2ext.c | 683 +++
+ hw/xmir/dri2/dri2ext.c | 683 ++
hw/xmir/dri2/dri2int.h | 26 +
hw/xmir/xmir-cursor.c | 210 ++
- hw/xmir/xmir-cvt.c | 304 +
- hw/xmir/xmir-dri2.c | 545 +++
- hw/xmir/xmir-glamor.c | 1160
+ hw/xmir/xmir-cvt.c | 304
+ hw/xmir/xmir-dri2.c | 551 +++
+ hw/xmir/xmir-glamor.c | 1160 +++
hw/xmir/xmir-input.c| 592
- hw/xmir/xmir-output.c | 449 +
+ hw/xmir/xmir-output.c | 449
hw/xmir/xmir-thread-proxy.c | 109 +++
- hw/xmir/xmir.c | 1571 +++
- hw/xmir/xmir.h | 226 +++
- 18 files changed, 7745 insertions(+), 2 deletions(-)
+ hw/xmir/xmir.c | 1622 +++
+ hw/xmir/xmir.h | 227 ++
+ 18 files changed, 7803 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -3248,10 +3249,10 @@ index 000..6070d77
+}
diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
new file mode 100644
-index 000..b24d4b9
+index 000..e1d02f0
--- /dev/null
+++ b/hw/xmir/xmir-dri2.c
-@@ -0,0 +1,545 @@
+@@ -0,0 +1,551 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -3743,10 +3744,16 @@ index 000..b24d4b9
+
+static int xmir_dri_get_msc(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
+{
-+/* TODO: Implement this?
-+ * At least doing nothing like this is enough to shut up Chromium
-+ * error messages.
-+ */
++/* TODO: Implement this properly after Mir implements it. */
++const uint64_t now_us = GetTimeInMicros();
++const uint64_t fake_frame_rate_hz = 60;
++const uint64_t fake_frame_time_us = 100 / fake_frame_rate_hz;
++const uint64_t fake_msc = now_us / fake_frame_time_us;
++const uint64_t fake_ust = fake_msc * fake_frame_time_us;
++if (ust)
++*(uint64_t*)ust = fake_ust;
++if (msc)
++*(uint64_t*)msc = fake_msc;
+return Success;
+}
+
@@ -6133,10 +6140,10 @@ index 000..dbb187f
+}
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
new file mode 100644
-index 000..34f78c9
+index 000..ee5fff5
--- /dev/null
+++ b/hw/xmir/xmir.c
-@@ -0,0 +1,1571 @@
+@@ -0,0 +1,1622 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -6767,17 +6774,20 @@ index 000..34f78c9
+wm_type = xmir_get_window_prop_atom(window,
GET_ATOM(_NET_WM_WINDOW_TYPE));
+wm_transient_for = xmir_get_window_prop_window(window,
XA_WM_TRANSIENT_FOR);
+
-+XMIR_DEBUG(("Realize %swindow %p \"%s\": %dx%d %+d%+d parent=%p\n"
++XMIR_DEBUG(("Realize %swindow %p id=0x%x \"%s\": %dx%d %+d%+d parent=%p\n"
+ "\tdepth=%d redir=%u type=%hu class=%u visibility=%u viewable=%u\n"
-+ "\toverride=%d _NET_WM_WINDOW_TYPE=%lu WM_TRANSIENT_FOR=%p\n",
++ "\toverride=%d _NET_WM_WINDOW_TYPE=%lu(%s)\n"
++ "\tWM_TRANSIENT_FOR=%p\n",
+ window == screen->r
xorg-server: Changes to 'ubuntu-vivid-lts'
debian/changelog |8 +
debian/patches/randr-adjust-masters-last-set-time.diff | 39 +++
debian/patches/randr-do-not-check-the-screen-size.diff | 87 +
debian/patches/series |2
4 files changed, 136 insertions(+)
New commits:
commit 58d765d94e7809c11b18a92a7ecc0fe2e3b7ba55
Author: Timo Aaltonen
Date: Mon May 30 16:41:37 2016 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index dd5d998..dfcd87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server-lts-vivid (2:1.17.1-0ubuntu3.1~trusty1.1) UNRELEASED;
urgency=medium
+xorg-server-lts-vivid (2:1.17.1-0ubuntu3.1~trusty1.1) trusty; urgency=medium
* randr-adjust-masters-last-set-time.diff,
randr-do-not-check-the-screen-size.diff:
Fix issues changing display mode on prime setups. (LP: #1586260)
- -- Timo Aaltonen Fri, 27 May 2016 11:50:02 +0300
+ -- Timo Aaltonen Mon, 30 May 2016 16:41:23 +0300
xorg-server-lts-vivid (2:1.17.1-0ubuntu3.1~trusty1) trusty; urgency=medium
commit 0eaece88a2dae2e018cf9f6e33f761b9526d44b7
Author: Timo Aaltonen
Date: Fri May 27 11:51:46 2016 +0300
randr-adjust-masters-last-set-time.diff,
randr-do-not-check-the-screen-size.diff: Fix issues changing display mode on
prime setups. (LP: #1586260)
diff --git a/debian/changelog b/debian/changelog
index 6a6da59..dd5d998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server-lts-vivid (2:1.17.1-0ubuntu3.1~trusty1.1) UNRELEASED;
urgency=medium
+
+ * randr-adjust-masters-last-set-time.diff,
+randr-do-not-check-the-screen-size.diff:
+Fix issues changing display mode on prime setups. (LP: #1586260)
+
+ -- Timo Aaltonen Fri, 27 May 2016 11:50:02 +0300
+
xorg-server-lts-vivid (2:1.17.1-0ubuntu3.1~trusty1) trusty; urgency=medium
* Backport vivid package for lts-vivid stack.
diff --git a/debian/patches/randr-adjust-masters-last-set-time.diff
b/debian/patches/randr-adjust-masters-last-set-time.diff
new file mode 100644
index 000..15f8404
--- /dev/null
+++ b/debian/patches/randr-adjust-masters-last-set-time.diff
@@ -0,0 +1,39 @@
+Subject: [PATCH xserver] randr: Adjust master's last set time with slaves
+From: Nikhil Mahale
+Date: 20.05.2016 08:01
+To:
+CC: Nikhil Mahale
+
+In prime configurations master's last set time may not be latest
+and greatest, adjust it with slaves last set time, pick up greatest
+one. Otherwise xserver may end with events which has
+lastSetTime < lastConfigTime even if that's not
+the case and confuse xrandr client.
+
+Signed-off-by: Nikhil Mahale
+---
+ randr/randr.c | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/randr/randr.c b/randr/randr.c
+index 3aabb19..c07def1 100644
+--- a/randr/randr.c
b/randr/randr.c
+@@ -584,6 +585,15 @@ RRTellChanged(ScreenPtr pScreen)
+ mastersp = pScrPriv;
+ }
+
++xorg_list_for_each_entry(iter, &master->output_slave_list, output_head) {
++pSlaveScrPriv = rrGetScrPriv(iter);
++
++if (CompareTimeStamps(mastersp->lastSetTime,
++ pSlaveScrPriv->lastSetTime) == EARLIER) {
++mastersp->lastSetTime = pSlaveScrPriv->lastSetTime;
++}
++}
++
+ if (mastersp->changed) {
+ UpdateCurrentTimeIf();
+ if (mastersp->configChanged) {
+-- 2.8.2
---
This email message is for the sole use of the intended recipient(s) and may
contain confidential information. Any unauthorized review, use, disclosure or
distribution is prohibited. If you are not the intended recipient, please
contact the sender by reply email and destroy all copies of the original
message.
---
___ xorg-de...@lists.x.org: X.Org
development Archives: http://lists.x.org/archives/xorg-devel Info:
https://lists.x.org/mailman/listinfo/xorg-devel
+
diff --git a/debian/patches/randr-do-not-check-the-screen-size.diff
b/debian/patches/randr-do-not-check-the-screen-size.diff
new file mode 100644
index 000..ca294b7
--- /dev/null
+++ b/debian/patches/randr-do-not-check-the-screen-size.diff
@@ -0,0 +1,87 @@
+Subject: [PATCH xserver] randr: Do not check the screen size bound for gpu
screens
+From: Nikhil Mahale
+Date: 20.05.2016 08:00
+To:
+CC: Nikhil Mahale
+
+For gpu screen, CrtcSet set/adjust the master screen size along
+mode in following callstack -
+
+ ProcRRSetCrtcConfig()
+|
+-> RRCrtcSet()
+|
+-> rrCheckPixmapBounding()
+|
+-> pScrPriv->rrScreenSetSize()
+
+Checking screen size bound for gpus screen cause some configurations
+to fails, e.g
+
+ $ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
+ --mode 2560x1440 --pos 0x0
+
+ Here xrandr utility
xorg-server: Changes to 'ubuntu'
debian/changelog |8 +
debian/patches/randr-adjust-masters-last-set-time.diff | 39 +++
debian/patches/randr-do-not-check-the-screen-size.diff | 87 +
debian/patches/series |2
4 files changed, 136 insertions(+)
New commits:
commit db2053c9547c17d70d987d402638849e560acd6c
Author: Timo Aaltonen
Date: Fri May 27 11:52:06 2016 +0300
release to yakkety
diff --git a/debian/changelog b/debian/changelog
index 60aa5ec..a12f0ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.3-1ubuntu5) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu5) yakkety; urgency=medium
* randr-adjust-masters-last-set-time.diff,
randr-do-not-check-the-screen-size.diff:
Fix issues changing display mode on prime setups. (LP: #1586260)
- -- Timo Aaltonen Fri, 27 May 2016 11:50:02 +0300
+ -- Timo Aaltonen Fri, 27 May 2016 11:51:56 +0300
xorg-server (2:1.18.3-1ubuntu4) yakkety; urgency=medium
commit 0b147483478d792ccbf5fca0f8b51436f920500e
Author: Timo Aaltonen
Date: Fri May 27 11:51:46 2016 +0300
randr-adjust-masters-last-set-time.diff,
randr-do-not-check-the-screen-size.diff: Fix issues changing display mode on
prime setups. (LP: #1586260)
diff --git a/debian/changelog b/debian/changelog
index 6c47fac..60aa5ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.18.3-1ubuntu5) UNRELEASED; urgency=medium
+
+ * randr-adjust-masters-last-set-time.diff,
+randr-do-not-check-the-screen-size.diff:
+Fix issues changing display mode on prime setups. (LP: #1586260)
+
+ -- Timo Aaltonen Fri, 27 May 2016 11:50:02 +0300
+
xorg-server (2:1.18.3-1ubuntu4) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/randr-adjust-masters-last-set-time.diff
b/debian/patches/randr-adjust-masters-last-set-time.diff
new file mode 100644
index 000..15f8404
--- /dev/null
+++ b/debian/patches/randr-adjust-masters-last-set-time.diff
@@ -0,0 +1,39 @@
+Subject: [PATCH xserver] randr: Adjust master's last set time with slaves
+From: Nikhil Mahale
+Date: 20.05.2016 08:01
+To:
+CC: Nikhil Mahale
+
+In prime configurations master's last set time may not be latest
+and greatest, adjust it with slaves last set time, pick up greatest
+one. Otherwise xserver may end with events which has
+lastSetTime < lastConfigTime even if that's not
+the case and confuse xrandr client.
+
+Signed-off-by: Nikhil Mahale
+---
+ randr/randr.c | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/randr/randr.c b/randr/randr.c
+index 3aabb19..c07def1 100644
+--- a/randr/randr.c
b/randr/randr.c
+@@ -584,6 +585,15 @@ RRTellChanged(ScreenPtr pScreen)
+ mastersp = pScrPriv;
+ }
+
++xorg_list_for_each_entry(iter, &master->output_slave_list, output_head) {
++pSlaveScrPriv = rrGetScrPriv(iter);
++
++if (CompareTimeStamps(mastersp->lastSetTime,
++ pSlaveScrPriv->lastSetTime) == EARLIER) {
++mastersp->lastSetTime = pSlaveScrPriv->lastSetTime;
++}
++}
++
+ if (mastersp->changed) {
+ UpdateCurrentTimeIf();
+ if (mastersp->configChanged) {
+-- 2.8.2
---
This email message is for the sole use of the intended recipient(s) and may
contain confidential information. Any unauthorized review, use, disclosure or
distribution is prohibited. If you are not the intended recipient, please
contact the sender by reply email and destroy all copies of the original
message.
---
___ xorg-de...@lists.x.org: X.Org
development Archives: http://lists.x.org/archives/xorg-devel Info:
https://lists.x.org/mailman/listinfo/xorg-devel
+
diff --git a/debian/patches/randr-do-not-check-the-screen-size.diff
b/debian/patches/randr-do-not-check-the-screen-size.diff
new file mode 100644
index 000..ca294b7
--- /dev/null
+++ b/debian/patches/randr-do-not-check-the-screen-size.diff
@@ -0,0 +1,87 @@
+Subject: [PATCH xserver] randr: Do not check the screen size bound for gpu
screens
+From: Nikhil Mahale
+Date: 20.05.2016 08:00
+To:
+CC: Nikhil Mahale
+
+For gpu screen, CrtcSet set/adjust the master screen size along
+mode in following callstack -
+
+ ProcRRSetCrtcConfig()
+|
+-> RRCrtcSet()
+|
+-> rrCheckPixmapBounding()
+|
+-> pScrPriv->rrScreenSetSize()
+
+Checking screen size bound for gpus screen cause some configurations
+to fails, e.g
+
+ $ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
+ --mode 2560x1440 --pos 0x0
+
+ Here xrandr utility first sets screen size to 2560x1440 which
+ gets resized to 1920x1080 on RRSetCrtcConfig request for eDP,
+ and then R
xorg-server: Changes to 'ubuntu-xenial'
debian/changelog |9 +
debian/patches/series |1
debian/patches/xmir-fixes.diff | 149
debian/patches/xmir.patch | 216 +
4 files changed, 122 insertions(+), 253 deletions(-)
New commits:
commit 328cfba3ee6c5dbc17e68957ebb45cf0e3d82309
Author: Robert Ancell
Date: Wed May 4 12:28:26 2016 +1200
* debian/patches/xmir.patch:
- Fix recently added keymap code
* debian/patches/xmir-fixes.diff:
- Merged into xmir.patch
diff --git a/debian/changelog b/debian/changelog
index 8517549..b31bc7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix recently added keymap code
+ * debian/patches/xmir-fixes.diff:
+- Merged into xmir.patch
+
+ -- Robert Ancell Wed, 04 May 2016 12:19:14
+1200
+
xorg-server (2:1.18.3-1ubuntu2.1) xenial; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 80c0c56..891be0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
-xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
deleted file mode 100644
index 1f95270..000
--- a/debian/patches/xmir-fixes.diff
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: port xmir to 1.18
-
a/hw/xmir/xmir-output.c
-+++ b/hw/xmir/xmir-output.c
-@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
-
- if (xmir_screen->glamor) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClearColor(0., 0., 0., 1.);
- glClear(GL_COLOR_BUFFER_BIT);
--glamor_copy_n_to_n_nf(&screen->root->drawable, &pixmap->drawable,
-+glamor_copy(&screen->root->drawable, &pixmap->drawable,
- NULL, ©_box, 1, 0, 0, FALSE, FALSE, 0,
NULL);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- } else {
a/hw/xmir/xmir.c
-+++ b/hw/xmir/xmir.c
-@@ -1246,7 +1246,7 @@ xmir_create_screen_resources(ScreenPtr s
- if (xmir_screen->glamor && !xmir_screen->rootless) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
-
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
a/hw/xmir/xmir-glamor.c
-+++ b/hw/xmir/xmir-glamor.c
-@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale);
-
--if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
-+if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
- FatalError("aeiou\n");
-
- glViewport(dx, dy, width + dx, height + dy);
-@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- if (!fbo) {
-glActiveTexture(GL_TEXTURE0);
-- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
-+ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
-
- if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_BORDER);
-@@ -272,13 +272,8 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
- _tx1 = v_from_x_coord_x(dst_xscale, dbox.x1);
- _tx2 = v_from_x_coord_x(dst_xscale, dbox.x2);
-
--if (xmir_screen->gbm) {
--_ty1 = v_from_x_coord_y_inverted(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y_inverted(dst_yscale, dbox.y2);
--} else {
--_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
--}
-+_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
-+_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
-
- /* upper left */
- vertices[0] = _tx1;
-@@ -317,13 +312,8 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
- _tx1 = v_from_x_coord_x(dst_xscale, dbox.x1);
- _tx2 = v_from_x_coord_x(dst_xscale, dbox.x2);
-
--if (xmir_screen->gbm) {
--_ty1 = v_from_x_coord_y_inverted(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y_inverted(dst_yscale, dbox.y2);
--} else {
--_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
--_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
--}
-+_ty1 = v_from_x_coord_y(dst_yscale, dbox.y1);
-+_ty2 = v_from_x_coord_y(dst_yscale, dbox.y2);
-
- /* upper right */
- vertices[0] = _tx2;
-@@ -368,7 +358,7 @@ xmir_glamor_copy_egl_commo
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++
debian/patches/xmir.patch | 27 ---
2 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit d844958990525442322f83937f2fca2701b922c8
Author: Robert Ancell
Date: Wed May 4 12:04:26 2016 +1200
* debian/patches/xmir.patch:
- Fix recently added keymap code
diff --git a/debian/changelog b/debian/changelog
index a6337c6..6c47fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-1ubuntu4) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix recently added keymap code
+
+ -- Robert Ancell Wed, 04 May 2016 09:11:32
+1200
+
xorg-server (2:1.18.3-1ubuntu3) yakkety; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 4e772a9..2ce304b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From b97cd5fc8d76dcb45fac1965c8251e7d31e641b3 Mon Sep 17 00:00:00 2001
+From b91d0ee0a8f92865dbf0ab6b402ff15a19aa6992 Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 29 Apr 2016 14:57:53 +0200
Subject: [PATCH xserver 1/3] XMir DDX
@@ -23,12 +23,12 @@ Contributions from:
hw/xmir/xmir-cvt.c | 304 +
hw/xmir/xmir-dri2.c | 545 +++
hw/xmir/xmir-glamor.c | 1160
- hw/xmir/xmir-input.c| 594
+ hw/xmir/xmir-input.c| 592
hw/xmir/xmir-output.c | 449 +
hw/xmir/xmir-thread-proxy.c | 109 +++
- hw/xmir/xmir.c | 1564 +++
+ hw/xmir/xmir.c | 1571 +++
hw/xmir/xmir.h | 226 +++
- 18 files changed, 7740 insertions(+), 2 deletions(-)
+ 18 files changed, 7745 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -94,7 +94,7 @@ index 77cf234..8bf62a0 100644
dnl and the rest of these are generic, so they're in config.h
dnl
-@@ -2622,6 +2645,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2630,6 +2653,8 @@ hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
@@ -4965,10 +4965,10 @@ index 000..7ad0245
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..e5fd2d5
+index 000..14c4709
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,594 @@
+@@ -0,0 +1,592 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5447,8 +5447,6 @@ index 000..e5fd2d5
+
+mir_keymap_event_get_keymap_buffer(ev, (char const **)&buffer, &length);
+
-+buffer[length] = '\0';
-+
+xkb = XkbCompileKeymapFromString(xmir_input->keyboard, buffer, length);
+
+XkbUpdateDescActions(xkb, xkb->min_key_code, XkbNumKeys(xkb), &changes);
@@ -6135,10 +6133,10 @@ index 000..dbb187f
+}
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
new file mode 100644
-index 000..5526958
+index 000..34f78c9
--- /dev/null
+++ b/hw/xmir/xmir.c
-@@ -0,0 +1,1564 @@
+@@ -0,0 +1,1571 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -7541,6 +7539,13 @@ index 000..5526958
+
+mir_connection_get_available_surface_formats(xmir_screen->conn,
+format, sizeof(format)/sizeof(format[0]), &formats);
++
++#if 0 /* Emulate the Mir Android graphics platform for LP: #1573470 */
++format[0] = mir_pixel_format_abgr_;
++format[1] = mir_pixel_format_xbgr_;
++formats = 2;
++#endif
++
+for (f = 0; f < formats; ++f) {
+switch (format[f]) {
+case mir_pixel_format_argb_:
xorg-server: Changes to 'ubuntu-xenial'
New branch 'ubuntu-xenial' available with the following commits: commit 242ec8b9121e7a4fbbed596c38b4d4f7612f202e Author: Robert Ancell Date: Fri Apr 29 16:07:25 2016 +0200 release to xenial
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +
debian/patches/series|1
debian/patches/xmir-desktop-file-hint-flag.patch | 15 +-
debian/patches/xmir-fixes.diff | 149 ---
debian/patches/xmir.patch| 111 +
5 files changed, 82 insertions(+), 203 deletions(-)
New commits:
commit 49995bc9b0af37782d06b55731eab54621008b97
Author: Robert Ancell
Date: Fri Apr 29 15:03:30 2016 +0200
Update xmir.patch
diff --git a/debian/changelog b/debian/changelog
index dc35c4f..a6337c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.3-1ubuntu3) yakkety; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Pass keymap from Mir to Xkb (LP: #1566487)
+ * debian/patches/xmir-fixes.diff:
+- Merged into xmir.patch
+
+ -- Robert Ancell Fri, 29 Apr 2016 14:36:49
+0200
+
xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium
* Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
diff --git a/debian/patches/series b/debian/patches/series
index 80c0c56..891be0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
-xmir-fixes.diff
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 16e3152..f015ca3 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,16 +1,18 @@
-From 938313b76b0e3279a94af931cbe5fd34b8cb580c Mon Sep 17 00:00:00 2001
+From de9e6e1d66680e717471df2c4032e590fd1b9ae0 Mon Sep 17 00:00:00 2001
From: Robert Ancell
-Date: Mon, 13 Jul 2015 15:54:32 +1200
-Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
- to decide which application is starting
+Date: Fri, 29 Apr 2016 14:58:28 +0200
+Subject: [PATCH xserver 2/3] xmir: Ignore --desktop_file_hint flag required by
+ Unity8 to decide which application is starting
---
hw/xmir/xmir.c | 3 +++
1 file changed, 3 insertions(+)
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 5526958..ea85f1a 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -168,6 +168,9 @@ ddxProcessArgument(int argc, char *argv[
+@@ -172,6 +172,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
} else if (!strcmp(argv[i], "-novtswitch") ||
!strncmp(argv[i], "vt", 2)) {
return 1;
@@ -20,3 +22,6 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag
required by Unity8
} else if (!strcmp(argv[i], "-fd")) {
if (!seen_shared)
NoListenAll = 1;
+--
+2.7.4
+
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
deleted file mode 100644
index 1f95270..000
--- a/debian/patches/xmir-fixes.diff
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: port xmir to 1.18
-
a/hw/xmir/xmir-output.c
-+++ b/hw/xmir/xmir-output.c
-@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
-
- if (xmir_screen->glamor) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClearColor(0., 0., 0., 1.);
- glClear(GL_COLOR_BUFFER_BIT);
--glamor_copy_n_to_n_nf(&screen->root->drawable, &pixmap->drawable,
-+glamor_copy(&screen->root->drawable, &pixmap->drawable,
- NULL, ©_box, 1, 0, 0, FALSE, FALSE, 0,
NULL);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- } else {
a/hw/xmir/xmir.c
-+++ b/hw/xmir/xmir.c
-@@ -1246,7 +1246,7 @@ xmir_create_screen_resources(ScreenPtr s
- if (xmir_screen->glamor && !xmir_screen->rootless) {
- glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
-
--glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
-+glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
- glClear(GL_COLOR_BUFFER_BIT);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
a/hw/xmir/xmir-glamor.c
-+++ b/hw/xmir/xmir-glamor.c
-@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale);
-
--if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
-+if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
- FatalError("aeiou\n");
-
- glViewport(dx, dy, width + dx, height + dy);
-@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
-
- if (!fbo) {
-glActiveTexture(GL_TEXTURE0);
-- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
-+ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
-
- if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
- glTexParamete
xorg-server: Changes to 'ubuntu'
debian/changelog |8 debian/patches/series |2 +- 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 6be74d068f96e5d0278fc3c1fdda4e36cd42501a Author: Timo Aaltonen Date: Thu Apr 7 12:10:29 2016 +0300 release to xenial diff --git a/debian/changelog b/debian/changelog index 11a0145..dc35c4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xorg-server (2:1.18.3-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium * Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now, compiling the keymap fails in current xenial for some reason. (LP: #1566878) - -- Timo Aaltonen Thu, 07 Apr 2016 11:59:55 +0300 + -- Timo Aaltonen Thu, 07 Apr 2016 12:10:12 +0300 xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium commit 758c13cc951f870a6ff08b3ab71225e016fdfbe8 Author: Timo Aaltonen Date: Thu Apr 7 12:10:11 2016 +0300 Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now, compiling the keymap fails in current xenial for some reason. (LP: #1566878) diff --git a/debian/changelog b/debian/changelog index 6de2250..11a0145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg-server (2:1.18.3-1ubuntu2) UNRELEASED; urgency=medium + + * Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now, +compiling the keymap fails in current xenial for some reason. +(LP: #1566878) + + -- Timo Aaltonen Thu, 07 Apr 2016 11:59:55 +0300 + xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium * Merge from Debian. diff --git a/debian/patches/series b/debian/patches/series index 8281f58..80c0c56 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,7 @@ os-treat-ssh-as-a-non-local-client.diff 105_nvidia_autodetect.patch 168_glibc_trace_to_stderr.patch 188_default_primary_to_first_busid.patch -190_cache-xkbcomp_output_for_fast_start_up.patch +#190_cache-xkbcomp_output_for_fast_start_up.patch 191-Xorg-add-an-extra-module-path.patch 226_fall_back_to_autoconfiguration.patch
xorg-server: Changes to 'ubuntu'
Xext/vidmode.c| 212
++---
configure.ac |6
debian/changelog |9
debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff| 31
debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff | 36
debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff | 35
debian/patches/series |7
debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff | 372
--
glamor/glamor_fbo.c |4
hw/vfb/Makefile.am|1
hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h| 10
hw/xfree86/modes/xf86Crtc.c |6
hw/xwayland/xwayland-cvt.c|4
hw/xwayland/xwayland-vidmode.c| 19
present/present.c |2
15 files changed, 155 insertions(+), 599 deletions(-)
New commits:
commit 85236bf70047a8eb00df7714329c153b68c24539
Author: Timo Aaltonen
Date: Tue Apr 5 17:59:30 2016 +0300
release to xenial
diff --git a/debian/changelog b/debian/changelog
index 344e2d8..6de2250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,4 @@
-xorg-server (2:1.18.3-1) unstable; urgency=medium
-
- * New upstream release.
- * Drop patches included upstream.
-
- -- Timo Aaltonen Tue, 05 Apr 2016 09:12:50 +0300
-
-xorg-server (2:1.18.2-3ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium
* Merge from Debian.
* fix-xineramaqueryscreens-for-reverse-prime.diff,
@@ -18,6 +11,13 @@ xorg-server (2:1.18.2-3ubuntu1) UNRELEASED; urgency=medium
-- Timo Aaltonen Sat, 12 Mar 2016 08:59:43 +0200
+xorg-server (2:1.18.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop patches included upstream.
+
+ -- Timo Aaltonen Tue, 05 Apr 2016 09:12:50 +0300
+
xorg-server (2:1.18.2-3) unstable; urgency=medium
* regression fixes part2:
commit 028e14472e5311ba1d961080ded843e34887453c
Author: Timo Aaltonen
Date: Tue Apr 5 09:13:00 2016 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index c6fe4ee..ec0468a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.18.3-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1) unstable; urgency=medium
* New upstream release.
* Drop patches included upstream.
- -- Timo Aaltonen Tue, 05 Apr 2016 07:46:11 +0300
+ -- Timo Aaltonen Tue, 05 Apr 2016 09:12:50 +0300
xorg-server (2:1.18.2-3) unstable; urgency=medium
commit 995268add6347bf32657444d0ba251536c29d888
Author: Timo Aaltonen
Date: Tue Apr 5 09:12:45 2016 +0300
Drop patches included upstream.
diff --git a/debian/changelog b/debian/changelog
index 198ed64..c6fe4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.18.3-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches included upstream.
-- Timo Aaltonen Tue, 05 Apr 2016 07:46:11 +0300
diff --git a/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff
b/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff
deleted file mode 100644
index e7220a9..000
--- a/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-commit a288cf58a0dc0f965a6f964c76bb86bb1989d797
-Author: Dave Airlie
-Date: Wed Mar 16 10:45:54 2016 +1000
-
-glamor: swizzle RED to 0 for alpha textures
-
-I'm pretty sure Eric suspected this could cause a problem, and we
-couldn't find a test. Well loading feedly in firefox seems to trigger
-badness that this solves.
-
-bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554
-Reviewed-by: Adam Jackson
-Signed-off-by: Dave Airlie
-Tested-by: Timo Aaltonen
-
-diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
-index a531f60..f4f8749 100644
a/glamor/glamor_fbo.c
-+++ b/glamor/glamor_fbo.c
-@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
- glBindTexture(GL_TEXTURE_2D, tex);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
--if (format == glamor_priv->one_channel_format && format == GL_RED)
-+if (format == glamor_priv->one_channel_format && format == GL_RED) {
-+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
-+}
- glamor_priv->suppress_gl_out_of_memory_logging = true;
- glTexImage2D(GL_TEXTURE_2D, 0, format,
xorg-server: Changes to 'ubuntu'
debian/changelog | 22 debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff| 31 debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff | 36 debian/patches/os-treat-ssh-as-a-non-local-client.diff| 97 ++ debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff | 35 debian/patches/series |8 debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff | 372 ++ 7 files changed, 600 insertions(+), 1 deletion(-) New commits: commit f490b1a14ae0b562fcce67b2daac7656a906ff83 Author: Timo Aaltonen Date: Tue Mar 29 10:46:07 2016 +0300 update changelog diff --git a/debian/changelog b/debian/changelog index 0e160a0..7615660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,4 @@ -xorg-server (2:1.18.2-3) unstable; urgency=medium - - * regression fixes part2: -- replace revert-eb5108b870.diff with patch from upstream -- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an - extra cursor in some cases - * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work -with DRI3. - - -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 - -xorg-server (2:1.18.2-2ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.18.2-3ubuntu1) UNRELEASED; urgency=medium * Merge from Debian. * fix-xineramaqueryscreens-for-reverse-prime.diff, @@ -22,6 +11,17 @@ xorg-server (2:1.18.2-2ubuntu1) UNRELEASED; urgency=medium -- Timo Aaltonen Sat, 12 Mar 2016 08:59:43 +0200 +xorg-server (2:1.18.2-3) unstable; urgency=medium + + * regression fixes part2: +- replace revert-eb5108b870.diff with patch from upstream +- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an + extra cursor in some cases + * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work +with DRI3. + + -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 + xorg-server (2:1.18.2-2) unstable; urgency=medium * regression fixes/workarounds: commit fe1d88778d3940550f30b85a7323fc1e3935eaaa Author: Timo Aaltonen Date: Tue Mar 29 10:39:02 2016 +0300 release to unstable diff --git a/debian/changelog b/debian/changelog index 2374ba2..9169531 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium +xorg-server (2:1.18.2-3) unstable; urgency=medium * regression fixes part2: - replace revert-eb5108b870.diff with patch from upstream @@ -7,7 +7,7 @@ xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work with DRI3. - -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300 + -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 xorg-server (2:1.18.2-2) unstable; urgency=medium commit 99ea495eaeacfcbe5defa412d6922a0966c27c3a Author: Timo Aaltonen Date: Tue Mar 29 10:34:50 2016 +0300 more regression fixes, plus fix remote clients with DRI3 diff --git a/debian/changelog b/debian/changelog index 24902b1..2374ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium + + * regression fixes part2: +- replace revert-eb5108b870.diff with patch from upstream +- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an + extra cursor in some cases + * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work +with DRI3. + + -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300 + xorg-server (2:1.18.2-2) unstable; urgency=medium * regression fixes/workarounds: diff --git a/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff new file mode 100644 index 000..4e1b26b --- /dev/null +++ b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff @@ -0,0 +1,36 @@ +commit 418fe365b45a143680d3b4143dc60f7cdc5a3507 +Author: Michel Dänzer +Date: Thu Mar 24 17:34:23 2016 +0900 + +xfree86/modes: Make sure the HW cursor is hidden when it should be + +When the HW cursor is hidden (e.g. because xf86CursorResetCursor +triggers a switch from HW cursor to SW cursor), the driver isn't +notified of this for disabled CRTCs. If the HW cursor was shown when the +CRTC was disabled, it may still be displayed when the CRTC is enabled +again. + +Prevent this by explicitly hiding the HW cursor again after setting a +mode if it's currently supposed to be hidden. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560 +Reviewed-by: Adam Jackson +Signed-off-by: Michel Dänzer + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 2639a30..6091b5e 100644 +--- a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +@@ -368,6 +368,12 @@ xf86CrtcSet
xorg-server: Changes to 'ubuntu'
debian/changelog |3 +
debian/patches/105_nvidia_autodetect.patch | 42 +
debian/patches/105_nvidia_fglrx_autodetect.patch | 56 ---
debian/patches/series|2
debian/patches/xmir-fixes.diff | 44 +++---
5 files changed, 84 insertions(+), 63 deletions(-)
New commits:
commit 1fee81e737874f623fcf9aff411c34efd871b1cb
Author: Timo Aaltonen
Date: Sat Mar 12 12:01:39 2016 +0200
105_nvidia_autodetect.patch: Modified and renamed since it doesn't need to
handle fglrx anymore.
diff --git a/debian/changelog b/debian/changelog
index d71c1d7..9990efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.18.2-1ubuntu1) UNRELEASED; urgency=medium
glamor-source-pictures-are-always-depth-32.diff:
Deleted, upstream.
* xmir-fixes.diff: Updated for glamor changes.
+ * 105_nvidia_autodetect.patch: Modified and renamed since it doesn't
+need to handle fglrx anymore.
-- Timo Aaltonen Sat, 12 Mar 2016 08:59:43 +0200
diff --git a/debian/patches/105_nvidia_autodetect.patch
b/debian/patches/105_nvidia_autodetect.patch
new file mode 100644
index 000..f500ba6
--- /dev/null
+++ b/debian/patches/105_nvidia_autodetect.patch
@@ -0,0 +1,42 @@
+Description: Load proprietary drivers automatically when installed.
+Author: Robert Hooker
+
+--- a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+@@ -76,6 +76,13 @@
+ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
+ "EndSection\n\n"
+
++#define BUILTIN_SCREEN_SECTION_PROPRIETARY \
++ "Section \"Screen\"\n" \
++ "\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \
++ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
++ "\tDefaultDepth\t24\n" \
++ "EndSection\n\n"
++
+ #define BUILTIN_LAYOUT_SECTION_PRE \
+ "Section \"ServerLayout\"\n" \
+ "\tIdentifier\t\"Builtin Default Layout\"\n"
+@@ -154,7 +161,11 @@ xf86AutoConfig(void)
+ for (p = deviceList; *p; p++) {
+ snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
+ AppendToConfig(buf);
+-snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
++if (strcmp(*p, "nvidia") == 0)
++snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_PROPRIETARY, *p,
++ 0, *p, 0);
++else
++snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
+ AppendToConfig(buf);
+ }
+
+--- a/hw/xfree86/common/xf86pciBus.c
b/hw/xfree86/common/xf86pciBus.c
+@@ -1189,6 +1189,7 @@ xf86VideoPtrToDriverList(struct pci_devi
+ {
+ int idx = 0;
+
++driverList[idx++] = "nvidia";
+ #ifdef __linux__
+ driverList[idx++] = "nouveau";
+ #endif
diff --git a/debian/patches/105_nvidia_fglrx_autodetect.patch
b/debian/patches/105_nvidia_fglrx_autodetect.patch
deleted file mode 100644
index a205e71..000
--- a/debian/patches/105_nvidia_fglrx_autodetect.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Load proprietary drivers automatically when installed.
-Author: Robert Hooker
-
-Index: xorg-server-1.17.2/hw/xfree86/common/xf86AutoConfig.c
-===
xorg-server-1.17.2.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86AutoConfig.c
-@@ -76,6 +76,13 @@
- "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
- "EndSection\n\n"
-
-+#define BUILTIN_SCREEN_SECTION_PROPRIETARY \
-+ "Section \"Screen\"\n" \
-+ "\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \
-+ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
-+ "\tDefaultDepth\t24\n" \
-+ "EndSection\n\n"
-+
- #define BUILTIN_LAYOUT_SECTION_PRE \
- "Section \"ServerLayout\"\n" \
- "\tIdentifier\t\"Builtin Default Layout\"\n"
-@@ -154,7 +161,11 @@ xf86AutoConfig(void)
- for (p = deviceList; *p; p++) {
- snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
- AppendToConfig(buf);
--snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
-+if (strcmp(*p, "fglrx") == 0 || strcmp(*p, "nvidia") == 0)
-+snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_PROPRIETARY, *p,
-+ 0, *p, 0);
-+else
-+snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
- AppendToConfig(buf);
- }
-
-Index: xorg-server-1.17.2/hw/xfree86/common/xf86pciBus.c
-===
xorg-server-1.17.2.orig/hw/xfree86/common/xf86pciBus.c
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86pciBus.c
-@@ -1105,7 +1105,8 @@ xf86VideoPtrToDriverList(struct pci_devi
- driverList[0] = "ast";
- break;
- case 0x1002:
--driverList[0] = "ati";
-+driverList[0] = "fglrx";
-+driverList[1] = "ati";
- break;
- case 0x102c:
-
xorg-server: Changes to 'ubuntu'
Xext/Makefile.am |7 Xext/vidmode.c | 2151 ++ Xext/xvmain.c | 11 Xext/xvmc.c| 17 autogen.sh |3 configure.ac | 29 debian/changelog | 16 debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff | 70 debian/patches/glamor-factor-out-glamor-set-color.diff | 58 debian/patches/glamor-source-pictures-are-always-depth-32.diff | 30 debian/patches/series |4 dix/dixutils.c | 22 dix/window.c | 32 dri3/dri3_request.c|4 glamor/Makefile.am |6 glamor/glamor.c| 16 glamor/glamor.h|4 glamor/glamor_composite_glyphs.c | 14 glamor/glamor_copy.c | 15 glamor/glamor_core.c | 22 glamor/glamor_dash.c |6 glamor/glamor_egl.c| 189 glamor/glamor_egl_stubs.c |6 glamor/glamor_fbo.c| 43 glamor/glamor_glyphblt.c | 12 glamor/glamor_gradient.c | 33 glamor/glamor_lines.c |6 glamor/glamor_picture.c| 49 glamor/glamor_points.c |7 glamor/glamor_priv.h | 50 glamor/glamor_program.c| 49 glamor/glamor_program.h|1 glamor/glamor_rects.c |7 glamor/glamor_render.c | 424 - glamor/glamor_segs.c |6 glamor/glamor_spans.c | 23 glamor/glamor_text.c |8 glamor/glamor_transfer.c | 18 glamor/glamor_transform.c | 23 glamor/glamor_transform.h | 15 glamor/glamor_utils.h | 52 glamor/glamor_vbo.c|9 glamor/glamor_xv.c | 224 - glx/extension_string.c |2 glx/extension_string.h |2 glx/glxcmds.c | 59 glx/glxdri2.c |6 glx/glxdriswrast.c |1 hw/dmx/glxProxy/glxcmds.c |5 hw/kdrive/ephyr/ephyr_glamor_glx.c | 122 hw/kdrive/linux/evdev.c| 11 hw/kdrive/src/kdrive.c |4 hw/vfb/InitOutput.c|4 hw/xfree86/Makefile.am |4 hw/xfree86/common/Makefile.am |5 hw/xfree86/common/vidmodeproc.h| 83 hw/xfree86/common/xf86Config.c |8 hw/xfree86/common/xf86Extensions.c |3 hw/xfree86/common/xf86Helper.c |4 hw/xfree86/common/xf86Init.c |1 hw/xfree86/common/xf86Privstr.h| 10 hw/xfree86/common/xf86VidMode.c| 582 -- hw/xfree86/common/xf86str.h| 92 hw/xfree86/common/xf86vmode.c | 1955 - hw/xfree86/dri/dri.c |8 hw/xfree86/dri2/dri2.c | 130 hw/xfree86/dri2/pci_ids/Makefile.am|1 hw/xfree86/dri2/pci_ids/pci_id_driver_map.h|7 hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h |2 hw/xfr
xorg-server: Changes to 'ubuntu'
debian/changelog |6 +
debian/patches/glamor-factor-out-glamor-set-color.diff | 58
++
debian/patches/glamor-source-pictures-are-always-depth-32.diff | 30 +
debian/patches/series |3
4 files changed, 97 insertions(+)
New commits:
commit cbcc49baa97d1645dd088e7cef68bf65a2f2288a
Author: Timo Aaltonen
Date: Fri Mar 11 09:39:20 2016 +0200
release to xenial
diff --git a/debian/changelog b/debian/changelog
index 27228e8..483eda7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.18.1-1ubuntu4) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1ubuntu4) xenial; urgency=medium
* glamor: Fix font rendering issue. (LP: #1555960)
- -- Timo Aaltonen Fri, 11 Mar 2016 08:20:50 +0200
+ -- Timo Aaltonen Fri, 11 Mar 2016 09:36:40 +0200
xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
commit da266b5c3a94a9c942dc8676f65743128503567f
Author: Timo Aaltonen
Date: Fri Mar 11 09:36:21 2016 +0200
glamor: Fix font rendering issue. (LP: #1555960)
diff --git a/debian/changelog b/debian/changelog
index 18cd204..27228e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.1-1ubuntu4) UNRELEASED; urgency=medium
+
+ * glamor: Fix font rendering issue. (LP: #1555960)
+
+ -- Timo Aaltonen Fri, 11 Mar 2016 08:20:50 +0200
+
xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
diff --git a/debian/patches/glamor-factor-out-glamor-set-color.diff
b/debian/patches/glamor-factor-out-glamor-set-color.diff
new file mode 100644
index 000..b799d3d
--- /dev/null
+++ b/debian/patches/glamor-factor-out-glamor-set-color.diff
@@ -0,0 +1,58 @@
+commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a
+Author: Michel Dänzer
+Date: Tue Feb 23 17:19:02 2016 +0900
+
+glamor: Factor out glamor_set_color_depth from glamor_set_color
+
+The former takes explicit screen and depth parameters instead of
+deriving them from a pixmap.
+
+Reviewed-by: Adam Jackson
+Signed-off-by: Michel Dänzer
+
+--- a/glamor/glamor_transform.c
b/glamor/glamor_transform.c
+@@ -107,15 +107,16 @@ glamor_set_destination_drawable(Drawable
+ */
+
+ void
+-glamor_set_color(PixmapPtr pixmap,
+- CARD32 pixel,
+- GLint uniform)
++glamor_set_color_depth(ScreenPtr pScreen,
++ intdepth,
++ CARD32 pixel,
++ GLint uniform)
+ {
+ float color[4];
+
+ glamor_get_rgba_from_pixel(pixel,
+&color[0], &color[1], &color[2], &color[3],
+- format_for_pixmap(pixmap));
++ format_for_depth(depth));
+
+ glUniform4fv(uniform, 1, color);
+ }
+--- a/glamor/glamor_transform.h
b/glamor/glamor_transform.h
+@@ -34,9 +34,19 @@ glamor_set_destination_drawable(Drawable
+ int *p_off_y);
+
+ void
++glamor_set_color_depth(ScreenPtr pScreen,
++ intdepth,
++ CARD32 pixel,
++ GLint uniform);
++
++static inline void
+ glamor_set_color(PixmapPtr pixmap,
+ CARD32 pixel,
+- GLint uniform);
++ GLint uniform)
++{
++glamor_set_color_depth(pixmap->drawable.pScreen,
++ pixmap->drawable.depth, pixel, uniform);
++}
+
+ Bool
+ glamor_set_texture_pixmap(PixmapPtrtexture);
diff --git a/debian/patches/glamor-source-pictures-are-always-depth-32.diff
b/debian/patches/glamor-source-pictures-are-always-depth-32.diff
new file mode 100644
index 000..d64fa84
--- /dev/null
+++ b/debian/patches/glamor-source-pictures-are-always-depth-32.diff
@@ -0,0 +1,30 @@
+commit a3e681eafa5355b8bb3b099d47983f14f0d5e197
+Author: Michel Dänzer
+Date: Tue Feb 23 17:19:03 2016 +0900
+
+glamor: Source pictures are always depth 32
+
+We were using the destination pixmap depth to determine the source
+picture format.
+
+Fixes incorrect text rendering with some MATE desktop GTK3 themes.
+
+Reviewed-by: Adam Jackson
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246
+Signed-off-by: Michel Dänzer
+
+--- a/glamor/glamor_program.c
b/glamor/glamor_program.c
+@@ -491,9 +491,9 @@ use_source_solid(CARD8 op, PicturePtr sr
+
+ glamor_set_blend(op, prog->alpha, dst);
+
+-glamor_set_color(glamor_get_drawable_pixmap(dst->pDrawable),
+- src->pSourcePict->solidFill.color,
+- prog->fg_uniform);
++glamor_set_color_depth(dst->pDrawable->pScreen, 32,
++ src->pSourcePict->solidFill.color,
++
xorg-server: Changes to 'ubuntu'
ChangeLog | 7920 +++--- Xext/geext.c | 10 Xext/geint.h | 5 Xext/hashtable.c | 4 Xext/panoramiX.c | 10 Xext/panoramiXprocs.c | 21 Xext/saver.c | 2 Xext/security.c| 24 Xext/shape.c | 2 Xext/sync.c| 4 Xext/xace.c| 13 Xext/xace.h| 2 Xext/xcmisc.c | 2 Xext/xf86bigfont.c | 4 Xext/xres.c| 10 Xext/xselinux_hooks.c | 1 Xext/xselinux_label.c | 2 Xext/xtest.c | 2 Xext/xvmain.c | 84 Xi/exevents.c | 9 Xi/getprop.c | 2 Xi/xichangehierarchy.c | 6 Xi/xiproperty.c| 8 Xi/xiquerypointer.c| 4 autogen.sh | 8 composite/compinit.c | 35 composite/compwindow.c | 2 config/10-evdev.conf | 40 config/Makefile.am | 4 config/config.c| 3 configure.ac | 150 dbe/dbe.c | 14 dbe/midbe.c| 2 debian/changelog | 70 debian/control | 13 debian/patches/02_kbsd-input-devd.diff | 8 debian/patches/03_static-nettle.diff | 2 debian/patches/05_Revert-Unload-submodules.diff| 2 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch| 4 debian/patches/191-Xorg-add-an-extra-module-path.patch | 6 debian/patches/208_switch_on_release.diff | 14 debian/patches/227_null_ptr_midispcur.patch| 8 debian/patches/228_autobind_gpu.patch | 4 debian/patches/fix-detach-gpu.patch| 16 debian/patches/fix-ftbfs-ppc64el.patch | 16 debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff | 70 debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff | 63 debian/patches/series | 7 debian/patches/xext-fix-udeb-build.diff| 37 debian/patches/xf86-ignore-conflicting-rr-caps.patch | 2 debian/patches/xfree86-no-xv-for-gpuscreens.patch | 14 debian/patches/xi2-resize-touch.patch | 12 debian/patches/xmir-desktop-file-hint-flag.patch | 7 debian/patches/xmir-fixes.diff | 117 debian/patches/xrandr-rroutputchanged-main.patch | 63 debian/rules | 19 debian/serverminver| 6 dix/atom.c | 10 dix/colormap.c
xorg-server: Changes to 'ubuntu+1'
debian/changelog | 15 ++
debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff | 70
++
debian/patches/series |1
debian/patches/xmir.patch | 22 ---
4 files changed, 92 insertions(+), 16 deletions(-)
New commits:
commit 61e8748c7bc97a7fdc350ea8787e0205995e2f21
Author: Timo Aaltonen
Date: Thu Feb 25 11:50:31 2016 +0200
upload to staging ppa
diff --git a/debian/changelog b/debian/changelog
index d6c20e7..18cd204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
* fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
crash with nvidia prime.
- -- Timo Aaltonen Fri, 19 Feb 2016 12:02:30 +0200
+ -- Timo Aaltonen Thu, 25 Feb 2016 11:49:23 +0200
xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
commit d99c495632d9bf762fa88ae04f241e42f0b96c0a
Author: Timo Aaltonen
Date: Thu Feb 25 11:49:13 2016 +0200
fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter crash
with nvidia prime.
diff --git a/debian/changelog b/debian/changelog
index 7fc8d2b..d6c20e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.18.1-1ubuntu3) UNRELEASED; urgency=medium
* Merge xmir changes from 2:1.17.3-2ubuntu4.
+ * fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
+crash with nvidia prime.
-- Timo Aaltonen Fri, 19 Feb 2016 12:02:30 +0200
diff --git a/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
new file mode 100644
index 000..cf253d0
--- /dev/null
+++ b/debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff
@@ -0,0 +1,70 @@
+commit 7bb64d8c1de9659f11da7917772919b071e9db82
+Author: Jan Burgmeier
+Date: Thu Feb 4 14:06:43 2016 +0100
+
+Fix XineramaQueryScreens for reverse prime
+
+Make sure we account for slave CRTCs when building the monitor list,
+since that's what rrxinerama uses to fake Xinerama geometry.
+
+[ajax: Slightly more informative commit message.]
+
+Bugzilla: https://bugs.freedesktop.org/92313
+Reviewed-by: Dave Airlie
+
+diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
+index c37dcf8..58041bb 100644
+--- a/randr/rrmonitor.c
b/randr/rrmonitor.c
+@@ -326,7 +326,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active,
RRMonitorPtr *monitors_ret,
+ RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);
+ mon++;
+ } else if (list.server_primary >= 0) {
+-RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
++RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon);
+ mon++;
+ }
+
+@@ -354,8 +354,8 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active,
RRMonitorPtr *monitors_ret,
+
+ /* And finish with the list of crtc-inspired monitors
+ */
+-for (c = 0; c < pScrPriv->numCrtcs; c++) {
+-RRCrtcPtr crtc = pScrPriv->crtcs[c];
++for (c = 0; c < list.num_crtcs; c++) {
++RRCrtcPtr crtc = list.server_crtc[c];
+ if (c == list.server_primary && list.client_primary < 0)
+ continue;
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index d12b9ba..686ae49 100644
+--- a/randr/rroutput.c
b/randr/rroutput.c
+@@ -543,6 +543,7 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ WindowPtr pWin;
+ rrScrPrivPtr pScrPriv;
+ int ret;
++ScreenPtr slave;
+
+ REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
+
+@@ -565,8 +566,19 @@ ProcRRSetOutputPrimary(ClientPtr client)
+
+ pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
+ if (pScrPriv)
++{
+ RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
+
++xorg_list_for_each_entry(slave,
++ &pWin->drawable.pScreen->output_slave_list,
++ output_head) {
++rrScrPrivPtr pSlavePriv;
++pSlavePriv = rrGetScrPriv(slave);
++
++RRSetPrimaryOutput(slave, pSlavePriv, output);
++}
++}
++
+ return Success;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index d3b62d0..6ee13f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,4 @@ xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
xmir-fixes.diff
+fix-xineramaqueryscreens-for-reverse-prime.diff
commit 15cc6a09a9b794bb85ad46c654c2c7e179df34ba
Author: Timo Aaltonen
Date: Fri Feb 19 12:04:16 2016 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index c90c5f3..7fc8d2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++ debian/patches/xmir.patch | 22 ++ 2 files changed, 13 insertions(+), 16 deletions(-) New commits: commit b8fa2c2ad4c2e8f27366f5f17eb6cc123ef61caf Author: Robert Ancell Date: Tue Feb 16 09:39:21 2016 -0800 * debian/patches/xmir.patch: - Revert swapinterval 0 change diff --git a/debian/changelog b/debian/changelog index e7fc71b..7730b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.17.3-2ubuntu4) xenial; urgency=medium + + * debian/patches/xmir.patch: +- Revert swapinterval 0 change + + -- Robert Ancell Tue, 16 Feb 2016 09:35:17 -0800 + xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium * debian/patches/xmir.patch: diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index aa7d1a7..af257ce 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -1,4 +1,4 @@ -From 47d65374fdc820777aaf84018574b8ce0d303dac Mon Sep 17 00:00:00 2001 +From efc26decfbefc45cdb36110c019272fbaf41284f Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 15 May 2015 14:58:59 +1200 Subject: [PATCH 1/3] XMir DDX @@ -24,11 +24,11 @@ Contributions from: hw/xmir/xmir-dri2.c | 545 +++ hw/xmir/xmir-glamor.c | 1173 hw/xmir/xmir-input.c| 566 - hw/xmir/xmir-output.c | 449 + hw/xmir/xmir-output.c | 449 + hw/xmir/xmir-thread-proxy.c | 109 +++ - hw/xmir/xmir.c | 1574 +++ + hw/xmir/xmir.c | 1564 +++ hw/xmir/xmir.h | 226 +++ - 18 files changed, 7735 insertions(+), 2 deletions(-) + 18 files changed, 7725 insertions(+), 2 deletions(-) create mode 100644 hw/xmir/.gitignore create mode 100644 hw/xmir/Makefile.am create mode 100644 hw/xmir/dri2/Makefile.am @@ -6120,10 +6120,10 @@ index 000..dbb187f +} diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c new file mode 100644 -index 000..12abaef +index 000..033ae92 --- /dev/null +++ b/hw/xmir/xmir.c -@@ -0,0 +1,1574 @@ +@@ -0,0 +1,1564 @@ +/* + * Copyright © 2015 Canonical Ltd + * @@ -6908,16 +6908,6 @@ index 000..12abaef +xmir_screen->flatten_top = xmir_window; +mir_surface_set_event_handler(xmir_window->surface, xmir_surface_handle_event, xmir_window); + -+/* -+ * Traditional X apps actually get zero throttling, so an interval of -+ * zero is most appropriate, and of course avoids lag and provides -+ * maximum frame rates. -+ * This does however overclock DRI2 GLX clients who want an interval of -+ * one, but they are a tiny minority and much less important than -+ * minimizing lag right now. We'll fix that later. (LP: #1211186) -+ */ -+mir_surface_set_swapinterval(xmir_window->surface, 0); -+ +xmir_window_enable_damage_tracking(xmir_window); + +if (xmir_screen->glamor)
xorg-server: Changes to 'ubuntu+1'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit 41bb5bf140d81edc4ae7db2e84d70eae392c7fc0 Author: Timo Aaltonen Date: Tue Feb 16 10:02:48 2016 +0200 Merge xmir changes from 2:1.17.3-2ubuntu3. diff --git a/debian/changelog b/debian/changelog index 9440892..f91dad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium + + * Merge xmir changes from 2:1.17.3-2ubuntu3. + + -- Timo Aaltonen Tue, 16 Feb 2016 10:02:03 +0200 + xorg-server (2:1.18.1-1ubuntu1) xenial; urgency=medium * Merge from Debian experimental
xorg-server: Changes to 'ubuntu+1'
debian/changelog |9 +
debian/patches/xmir-fixes.diff |2
debian/patches/xmir.patch | 190 ++---
3 files changed, 152 insertions(+), 49 deletions(-)
New commits:
commit 11602a83f60d8adcc53551832c2aeddc46e6a0aa
Author: Timo Aaltonen
Date: Tue Feb 16 08:15:43 2016 +0200
refresh xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
index ea5b035..6b547e6 100644
--- a/debian/patches/xmir-fixes.diff
+++ b/debian/patches/xmir-fixes.diff
@@ -17,7 +17,7 @@ Description: port xmir to 1.18
} else {
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
-@@ -1211,7 +1211,7 @@ xmir_create_screen_resources(ScreenPtr s
+@@ -1256,7 +1256,7 @@ xmir_create_screen_resources(ScreenPtr s
if (xmir_screen->glamor && !xmir_screen->rootless) {
glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
commit 01ff19d871603204c9bbf6a920a78a2fefa722f5
Author: Robert Ancell
Date: Mon Feb 15 18:08:57 2016 -0800
Add in missing released commit
diff --git a/debian/changelog b/debian/changelog
index 6152b8e..e7fc71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium
* debian/patches/xmir.patch:
- Add ability to set title for XMir (LP: #1542028)
@@ -7,6 +7,12 @@ xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
-- Robert Ancell Mon, 15 Feb 2016 17:32:21
-0800
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+ * Disable mir on s390x.
+
+ -- Dimitri John Ledkov Wed, 25 Nov 2015 16:11:38 +
+
xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
[ Robert Ancell ]
diff --git a/debian/control b/debian/control
index 6d63639..ddbe447 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,7 @@ Build-Depends:
#logind
libdbus-1-dev (>= 1.0) [linux-any],
# XMir
- libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el],
+ libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x],
mir-client-platform-mesa-dev,
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
diff --git a/debian/rules b/debian/rules
index 5d1f9a7..040282e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
build_xmir = --disable-xmir
endif
commit d7d8c7fa904add6792729e1bd517e0861c5967ca
Author: Robert Ancell
Date: Mon Feb 15 17:47:03 2016 -0800
* debian/patches/xmir.patch:
- Add ability to set title for XMir (LP: #1542028)
- Use swapinterval 0 (LP: #1502738)
- Add sufficient traversal hacks for Matchbox
diff --git a/debian/changelog b/debian/changelog
index 006962c..6152b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Add ability to set title for XMir (LP: #1542028)
+- Use swapinterval 0 (LP: #1502738)
+- Add sufficient traversal hacks for Matchbox
+
+ -- Robert Ancell Mon, 15 Feb 2016 17:32:21
-0800
+
xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
[ Robert Ancell ]
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 79b7d1c..aa7d1a7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From debdda3bfd737885c4fbbbcff06518c507009077 Mon Sep 17 00:00:00 2001
+From 47d65374fdc820777aaf84018574b8ce0d303dac Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 15 May 2015 14:58:59 +1200
Subject: [PATCH 1/3] XMir DDX
@@ -15,20 +15,20 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 +++
- hw/xmir/dri2/dri2.h | 364 +++
+ hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.h | 364 ++
hw/xmir/dri2/dri2ext.c | 683 +++
hw/xmir/dri2/dri2int.h | 26 +
hw/xmir/xmir-cursor.c | 210 ++
hw/xmir/xmir-cvt.c | 304 +
- hw/xmir/xmir-dri2.c | 545
- hw/xmir/xmir-glamor.c | 1173 +
- hw/xmir/xmir-input.c| 577
- hw/xmir/xmir-output.c | 456 +
- hw/xmir/xmir-thread-proxy.c | 109
- hw/xmir/xmir.c | 1518 +++
- hw/xmir/xmir.h | 225 +++
- 18 files changed, 7696 insertions(+), 2 deletions(-)
+ hw/xmir/xmir-dri2.c | 545 +++
+ hw/xmir/xmir-glamor.c | 1173
+ hw/xm
xorg-server: Changes to 'ubuntu'
debian/changelog |8 +++- debian/control |2 +- debian/rules |2 +- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 01ff19d871603204c9bbf6a920a78a2fefa722f5 Author: Robert Ancell Date: Mon Feb 15 18:08:57 2016 -0800 Add in missing released commit diff --git a/debian/changelog b/debian/changelog index 6152b8e..e7fc71b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium +xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium * debian/patches/xmir.patch: - Add ability to set title for XMir (LP: #1542028) @@ -7,6 +7,12 @@ xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium -- Robert Ancell Mon, 15 Feb 2016 17:32:21 -0800 +xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium + + * Disable mir on s390x. + + -- Dimitri John Ledkov Wed, 25 Nov 2015 16:11:38 + + xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium [ Robert Ancell ] diff --git a/debian/control b/debian/control index 6d63639..ddbe447 100644 --- a/debian/control +++ b/debian/control @@ -101,7 +101,7 @@ Build-Depends: #logind libdbus-1-dev (>= 1.0) [linux-any], # XMir - libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el], + libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x], mir-client-platform-mesa-dev, Standards-Version: 3.9.6 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git diff --git a/debian/rules b/debian/rules index 5d1f9a7..040282e 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ else endif # Mir isn't built on PPC -ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el)) +ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x)) build_xmir = --disable-xmir endif
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +++
debian/patches/xmir.patch | 137 +-
2 files changed, 97 insertions(+), 49 deletions(-)
New commits:
commit d7d8c7fa904add6792729e1bd517e0861c5967ca
Author: Robert Ancell
Date: Mon Feb 15 17:47:03 2016 -0800
* debian/patches/xmir.patch:
- Add ability to set title for XMir (LP: #1542028)
- Use swapinterval 0 (LP: #1502738)
- Add sufficient traversal hacks for Matchbox
diff --git a/debian/changelog b/debian/changelog
index 006962c..6152b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Add ability to set title for XMir (LP: #1542028)
+- Use swapinterval 0 (LP: #1502738)
+- Add sufficient traversal hacks for Matchbox
+
+ -- Robert Ancell Mon, 15 Feb 2016 17:32:21
-0800
+
xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
[ Robert Ancell ]
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 79b7d1c..aa7d1a7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,4 +1,4 @@
-From debdda3bfd737885c4fbbbcff06518c507009077 Mon Sep 17 00:00:00 2001
+From 47d65374fdc820777aaf84018574b8ce0d303dac Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Fri, 15 May 2015 14:58:59 +1200
Subject: [PATCH 1/3] XMir DDX
@@ -15,20 +15,20 @@ Contributions from:
hw/xmir/.gitignore |1 +
hw/xmir/Makefile.am | 61 ++
hw/xmir/dri2/Makefile.am| 14 +
- hw/xmir/dri2/dri2.c | 1398 +++
- hw/xmir/dri2/dri2.h | 364 +++
+ hw/xmir/dri2/dri2.c | 1398 ++
+ hw/xmir/dri2/dri2.h | 364 ++
hw/xmir/dri2/dri2ext.c | 683 +++
hw/xmir/dri2/dri2int.h | 26 +
hw/xmir/xmir-cursor.c | 210 ++
hw/xmir/xmir-cvt.c | 304 +
- hw/xmir/xmir-dri2.c | 545
- hw/xmir/xmir-glamor.c | 1173 +
- hw/xmir/xmir-input.c| 577
- hw/xmir/xmir-output.c | 456 +
- hw/xmir/xmir-thread-proxy.c | 109
- hw/xmir/xmir.c | 1518 +++
- hw/xmir/xmir.h | 225 +++
- 18 files changed, 7696 insertions(+), 2 deletions(-)
+ hw/xmir/xmir-dri2.c | 545 +++
+ hw/xmir/xmir-glamor.c | 1173
+ hw/xmir/xmir-input.c| 566
+ hw/xmir/xmir-output.c | 449
+ hw/xmir/xmir-thread-proxy.c | 109 +++
+ hw/xmir/xmir.c | 1574 +++
+ hw/xmir/xmir.h | 226 +++
+ 18 files changed, 7735 insertions(+), 2 deletions(-)
create mode 100644 hw/xmir/.gitignore
create mode 100644 hw/xmir/Makefile.am
create mode 100644 hw/xmir/dri2/Makefile.am
@@ -4978,10 +4978,10 @@ index 000..2438013
+}
diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
new file mode 100644
-index 000..2c3bb77
+index 000..727fc56
--- /dev/null
+++ b/hw/xmir/xmir-input.c
-@@ -0,0 +1,577 @@
+@@ -0,0 +1,566 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -5489,17 +5489,6 @@ index 000..2c3bb77
+xmir_close_surface(xmir_window);
+break;
+case mir_event_type_surface_output:
-+{
-+ScreenPtr screen = xmir_screen->screen;
-+MirSurfaceOutputEvent const* soe =
-+mir_event_get_surface_output_event(ev);
-+int dpi = mir_surface_output_event_get_dpi(soe);
-+xmir_screen->dpi = dpi;
-+screen->mmWidth = screen->width * 254 / (10 * dpi);
-+screen->mmHeight = screen->height * 254 / (10 * dpi);
-+XMIR_DEBUG(("Now screen is %hdx%hd mm\n",
-+screen->mmWidth, screen->mmHeight));
-+}
+break;
+default:
+ErrorF("Received an unknown %u event\n", mir_event_get_type(ev));
@@ -5561,10 +5550,10 @@ index 000..2c3bb77
+}
diff --git a/hw/xmir/xmir-output.c b/hw/xmir/xmir-output.c
new file mode 100644
-index 000..5a54cf2
+index 000..bde0940
--- /dev/null
+++ b/hw/xmir/xmir-output.c
-@@ -0,0 +1,456 @@
+@@ -0,0 +1,449 @@
+/*
+ * Copyright © 2015 Canonical Ltd
+ *
@@ -6001,13 +5990,6 @@ index 000..5a54cf2
+
+snprintf(name, sizeof name, "%s-%d", output_type_str, type_count);
+xmir_output_create(xmir_screen, mir_output, name);
-+
-+if (mir_output->connected) {
-+MirDisplayMode *mode =
&mir_output->modes[mir_output->current_mode];
-+xmir_screen->dpi = mode->horizontal_resolution * 254 /
-+(10 * mir_output->physical_width_mm);
-+XMIR_DEBUG(("Initial DPI is %d\n", xmir_screen->dpi));
-+}
+}
+
+RRScreenSetSizeRan
xorg-server: Changes to 'ubuntu+1'
configure.ac | 34 debian/changelog | 12 debian/patches/add_support_new_libsystemd.patch | 11 debian/patches/glamor-disable-debugging-msgs.diff | 32 debian/patches/series |3 debian/patches/update-intel-pciids.diff | 87 dix/pixmap.c | 21 dix/window.c | 126 + glamor/glamor.c | 10 glamor/glamor_composite_glyphs.c |9 glamor/glamor_copy.c |3 glamor/glamor_egl.c |4 glamor/glamor_fbo.c | 18 glamor/glamor_font.c | 35 glamor/glamor_font.h |2 glamor/glamor_picture.c | 37 glamor/glamor_priv.h |4 glamor/glamor_render.c| 24 glamor/glamor_text.c | 10 glamor/glamor_vbo.c | 16 glx/createcontext.c | 31 glx/extension_string.c|1 glx/extension_string.h|1 glx/glxdri2.c |4 glx/glxdriswrast.c|2 hw/dmx/config/dmxcompat.c |2 hw/dmx/config/dmxconfig.c |2 hw/dmx/config/dmxparse.h |2 hw/dmx/config/dmxtodmx.c |1 hw/dmx/config/parser.y|1 hw/dmx/config/scanner.l |6 hw/dmx/config/xdmxconfig.c|1 hw/dmx/doxygen/doxygen.conf.in| 2429 ++ hw/dmx/glxProxy/glxsingle.c |5 hw/dmx/glxProxy/render2swap.c | 34 hw/dmx/glxProxy/renderpixswap.c |3 hw/kdrive/src/kinput.c|2 hw/vfb/InitOutput.c | 123 + hw/xfree86/common/xf86Xinput.c|5 hw/xfree86/dixmods/xkbPrivate.c |2 hw/xfree86/dri2/pci_ids/i915_pci_ids.h|4 hw/xfree86/dri2/pci_ids/i965_pci_ids.h| 56 hw/xfree86/drivers/modesetting/driver.c | 59 hw/xfree86/drivers/modesetting/driver.h |3 hw/xfree86/drivers/modesetting/present.c |6 hw/xfree86/os-support/linux/systemd-logind.c |3 hw/xfree86/x86emu/ops.c | 192 + hw/xfree86/xorg-wrapper.c |1 hw/xnest/Keyboard.c |5 hw/xwayland/xwayland-glamor.c |4 hw/xwayland/xwayland-input.c | 22 hw/xwayland/xwayland-output.c | 93 hw/xwayland/xwayland-shm.c|4 hw/xwayland/xwayland.c| 35 include/list.h|8 include/os.h |2 include/window.h |1 os/connection.c |1 os/log.c | 126 - present/present.c | 79 present/present_priv.h|2 61 files changed, 2648 insertions(+), 1213 deletions(-) New commits: commit 91e73c64a139a423e1ab07ebb2fb6ef8a3c3e90d Author: Timo Aaltonen Date: Tue Feb 9 10:54:40 2016 +0200 release to ppa diff --git a/debian/changelog b/debian/changelog index 7a9cd96..cc537ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.18.1-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.18.1-1ubuntu1) xenial; urgency=medium * Merge from Debian experimental * patches: Refreshed, dropped what's upstream. commit 80bbd5bc8f276cd24561308d02bfb5e2d6b7d2e5 Author: Timo Aaltonen Date: Tue Feb 9 10:54:02 2016 +0200 update the changelog diff --git a/debian/changelog b/debian/changelog index 0ccbcfa..7a9cd96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.18.1-1ubuntu1) UNRELEASED; urgency=medium + + * Merge from Debian experimental + * patches: Refreshed, dropped what's upstream. + * xmir-fixes.diff: Port xmir to 1.18. + * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore. + + -- Timo Aaltonen Tue, 08 Dec 2015 19:47:06 +0200 + xorg-server (2:1.18.1-1) unstable; urgency=medium * New upstream release. @@ -8,15 +17,6 @@ xorg-server (2:1.18.1-1) unstable; urgency=medium -- Timo Aaltonen Tue, 09 Feb 2016 10:27:18 +0200 -xorg-server (2:1.18.0-3ubuntu1) UNRELE
xorg-server: Changes to 'ubuntu+1'
debian/changelog | 15 +++ debian/patches/fix-ftbfs-ppc64el.patch| 16 debian/patches/glamor-disable-debugging-msgs.diff | 32 debian/patches/series |4 - debian/patches/update-intel-pciids.diff | 87 ++ 5 files changed, 134 insertions(+), 20 deletions(-) New commits: commit a92eb5f6454085c39d751da0a77677d2b1123fe2 Author: Timo Aaltonen Date: Thu Jan 28 14:53:59 2016 +0200 drop fix-ftbfs-ppc64el.patch, update changelog diff --git a/debian/changelog b/debian/changelog index 8c36692..77650de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.18.0-3ubuntu1) UNRELEASED; urgency=medium + + * Merge from Debian experimental + * patches: Refreshed, dropped what's upstream. + * xmir-fixes.diff: Port xmir to 1.18. + * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore. + + -- Timo Aaltonen Tue, 08 Dec 2015 19:47:06 +0200 + xorg-server (2:1.18.0-3) unstable; urgency=medium * update-intel-pciids.diff: Sync dri2 mapping ids for intel. @@ -6,14 +15,6 @@ xorg-server (2:1.18.0-3) unstable; urgency=medium -- Timo Aaltonen Wed, 27 Jan 2016 16:41:59 +0200 -xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium - - * Merge from Debian experimental - * patches: Refreshed, dropped what's upstream. - * xmir-fixes.diff: Port xmir to 1.18. - - -- Timo Aaltonen Tue, 08 Dec 2015 19:47:06 +0200 - xorg-server (2:1.18.0-2) unstable; urgency=medium [ Laurent Bigonville ] diff --git a/debian/patches/fix-ftbfs-ppc64el.patch b/debian/patches/fix-ftbfs-ppc64el.patch deleted file mode 100644 index fa452c1..000 --- a/debian/patches/fix-ftbfs-ppc64el.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix ftbfs on ppc64el -Author: Maarten Lankhorst - -diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c -index a9a9fa5..f88cdc0 100644 a/hw/kdrive/src/kinput.c -+++ b/hw/kdrive/src/kinput.c -@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close) - if (do_close) - close(kdInputFds[i].fd); - kdNumInputFds--; --for (j = i; j < (kdNumInputFds - 1); j++) -+for (j = i; j < (kdNumInputFds - 1) && j < (KD_MAX_INPUT_FDS - 1); j++) - kdInputFds[j] = kdInputFds[j + 1]; - break; - } diff --git a/debian/patches/series b/debian/patches/series index 4426023..7cf15e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,7 +48,6 @@ xf86-ignore-conflicting-rr-caps.patch fix-detach-gpu.patch disable-rotation-transform-gpuscreens.patch -fix-ftbfs-ppc64el.patch xmir.patch xmir-desktop-file-hint-flag.patch drm_device_keep_trying.patch commit 36288f4297b1779383916b357091eddbb203fb79 Author: Timo Aaltonen Date: Wed Jan 27 16:42:10 2016 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index 8503cce..be300ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xorg-server (2:1.18.0-3) UNRELEASED; urgency=medium +xorg-server (2:1.18.0-3) unstable; urgency=medium * update-intel-pciids.diff: Sync dri2 mapping ids for intel. * glamor-disable-debugging-msgs.diff: Make glamor less noisy with recent mesa. - -- Timo Aaltonen Wed, 27 Jan 2016 14:21:32 +0200 + -- Timo Aaltonen Wed, 27 Jan 2016 16:41:59 +0200 xorg-server (2:1.18.0-2) unstable; urgency=medium commit 31dc999cb909eaaff5ccde9e9b3224d5b1119816 Author: Timo Aaltonen Date: Wed Jan 27 16:41:15 2016 +0200 glamor-disable-debugging-msgs.diff: Make glamor less noisy with recent mesa. diff --git a/debian/changelog b/debian/changelog index a27212d..8503cce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xorg-server (2:1.18.0-3) UNRELEASED; urgency=medium * update-intel-pciids.diff: Sync dri2 mapping ids for intel. + * glamor-disable-debugging-msgs.diff: Make glamor less noisy with +recent mesa. -- Timo Aaltonen Wed, 27 Jan 2016 14:21:32 +0200 diff --git a/debian/patches/glamor-disable-debugging-msgs.diff b/debian/patches/glamor-disable-debugging-msgs.diff new file mode 100644 index 000..6556848 --- /dev/null +++ b/debian/patches/glamor-disable-debugging-msgs.diff @@ -0,0 +1,32 @@ +commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b +Author: Michel Dänzer +Date: Tue Jan 12 15:42:47 2016 +0900 + +glamor: Disable debugging messages other than GL API errors + +According to Nicolai Hähnle, the relevant specification says "All +messages are initially enabled unless their assigned severity is +DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we +don't want to get. Failing that, we were accidentally logging e.g. +shader stats intended for shader-db. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659 +Tested-by: Laurent Carlier +Reviewed-by: Emil Velikov +Signed
xorg-server: Changes to 'ubuntu+1'
debian/changelog| 12 ++
debian/control |3
debian/patches/add_support_new_libsystemd.patch | 11 ++
debian/patches/series |2
debian/patches/xmir-fixes.diff | 117
debian/rules| 16 ++-
6 files changed, 155 insertions(+), 6 deletions(-)
New commits:
commit c0f92327f0aa2ca28f0fb0941135f5ebba31e9bf
Author: Timo Aaltonen
Date: Mon Jan 18 11:35:37 2016 +0200
xmir-fixes.diff: Port xmir to 1.18.
diff --git a/debian/changelog b/debian/changelog
index 33aa763..cd7b2a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge from Debian experimental
* patches: Refreshed, dropped what's upstream.
+ * xmir-fixes.diff: Port xmir to 1.18.
-- Timo Aaltonen Tue, 08 Dec 2015 19:47:06 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 1216060..b63041e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
+xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
new file mode 100644
index 000..ea5b035
--- /dev/null
+++ b/debian/patches/xmir-fixes.diff
@@ -0,0 +1,117 @@
+Description: port xmir to 1.18
+
+--- a/hw/xmir/xmir-output.c
b/hw/xmir/xmir-output.c
+@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
+
+ if (xmir_screen->glamor) {
+ glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(pixmap);
+-glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ glClearColor(0., 0., 0., 1.);
+ glClear(GL_COLOR_BUFFER_BIT);
+-glamor_copy_n_to_n_nf(&screen->root->drawable, &pixmap->drawable,
++glamor_copy(&screen->root->drawable, &pixmap->drawable,
+ NULL, ©_box, 1, 0, 0, FALSE, FALSE, 0,
NULL);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ } else {
+--- a/hw/xmir/xmir.c
b/hw/xmir/xmir.c
+@@ -1211,7 +1211,7 @@ xmir_create_screen_resources(ScreenPtr s
+ if (xmir_screen->glamor && !xmir_screen->rootless) {
+ glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(screen->devPrivate);
+
+-glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+--- a/hw/xmir/xmir-glamor.c
b/hw/xmir/xmir-glamor.c
+@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+
+ pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale);
+
+-if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
++if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
+ FatalError("aeiou\n");
+
+ glViewport(dx, dy, width + dx, height + dy);
+@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+
+ if (!fbo) {
+glActiveTexture(GL_TEXTURE0);
+- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
++ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
+
+ if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_BORDER);
+@@ -368,7 +368,7 @@ xmir_glamor_copy_egl_common(DrawablePtr
+ DebugF("Box: (%i,%i)->(%i,%i)\n", ext->x1, ext->y1, ext->x2, ext->y2);
+
+ if (epoxy_has_gl_extension("GL_EXT_framebuffer_blit") &&
!xmir_screen->doubled && !orientation) {
+-glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT,
src_pixmap_priv->base.fbo->fb);
++glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT,
src_pixmap_priv->fbo->fb);
+
+ glBlitFramebuffer(ext->x1, ext->y2, ext->x2, ext->y1,
+ ext->x1 + dx, ext->y2 + dy, ext->x2 + dx, ext->y1 +
dy,
+@@ -404,7 +404,7 @@ xmir_glamor_copy_gbm(struct xmir_screen
+ PixmapPtr from = screen->GetWindowPixmap(window);
+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(back);
+
+-glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ xmir_glamor_copy_egl_common(&window->drawable, from,
glamor_get_pixmap_private(from),
+ RegionExtents(dirty),
+ back->drawable.width,
back->drawable.height, 0, 0, xmir_win->orientation);
+@@ -607,9 +607,9 @@ xmir_glamor_copy_egl_queue(struct xmir_s
+ * rotating back and forth.
+ */
+ glamor_set_pixmap_type(src_pixmap, GLAMOR_TEXTURE_DRM);
+-src_pixmap_priv->base.fbo->external = TRUE;
++src_pixmap_priv->fbo->external
xorg-server: Changes to 'ubuntu+1'
ChangeLog | 6692 +++ Xext/geext.c| 10 Xext/geint.h|5 Xext/hashtable.c|4 Xext/panoramiX.c| 10 Xext/panoramiXprocs.c | 21 Xext/saver.c|2 Xext/security.c | 24 Xext/shape.c|2 Xext/shm.c | 10 Xext/sync.c |4 Xext/xace.c | 28 Xext/xace.h |5 Xext/xcmisc.c |2 Xext/xf86bigfont.c |4 Xext/xres.c | 10 Xext/xselinux_hooks.c |9 Xext/xselinux_label.c |2 Xext/xtest.c|2 Xext/xvmain.c | 84 Xi/exevents.c | 21 Xi/getprop.c|2 Xi/xichangehierarchy.c |6 Xi/xiproperty.c |8 Xi/xiquerypointer.c |4 autogen.sh |8 composite/compinit.c| 35 composite/compwindow.c |2 config/10-evdev.conf| 40 config/Makefile.am |4 config/config.c |3 configure.ac| 141 dbe/dbe.c | 14 dbe/midbe.c |2 debian/changelog| 287 debian/compat |2 debian/control | 98 debian/copyright| 27 debian/patches/02_kbsd-input-devd.diff | 14 debian/patches/03_static-nettle.diff|2 debian/patches/05_Revert-Unload-submodules.diff |2 debian/patches/105_nvidia_fglrx_autodetect.patch| 27 debian/patches/111_armel-drv-fallbacks.patch| 13 debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 17 debian/patches/168_glibc_trace_to_stderr.patch | 14 debian/patches/188_default_primary_to_first_busid.patch |4 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 44 debian/patches/191-Xorg-add-an-extra-module-path.patch | 28 debian/patches/208_switch_on_release.diff | 16 debian/patches/226_fall_back_to_autoconfiguration.patch | 33 debian/patches/227_null_ptr_midispcur.patch |9 debian/patches/228_autobind_gpu.patch | 10 debian/patches/232-xf86compatoutput-valgrind.patch | 17 debian/patches/config-add-no-removal.patch | 20 debian/patches/disable-rotation-transform-gpuscreens.patch | 41 debian/patches/drm_device_keep_trying.patch | 12 debian/patches/fix-detach-gpu.patch | 20 debian/patches/fix-ftbfs-ppc64el.patch |3 debian/patches/mi-dont-process-disabled.patch | 62 debian/patches/no-nv.patch |4 debian/patches/pixman-validate.patch| 27 debian/patches/series |4 debian/patches/xf86-ignore-conflicting-rr-caps.patch|6 debian/patches/xf86-inactive-gpuscreen.patch| 15 debian/patches/xfree86-no-xv-for-gpuscreens.patch | 14 debian/patches/xi2-resize-touch.patch | 15 debian/patches/xmir-desktop-file-hint-flag.patch| 22 debian/patches/xmir.patch | 8779 -- debian/patches/x
xorg-server: Changes to 'ubuntu'
debian/changelog | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) New commits: commit 949c994e73f9efc6d5a6e4be365495c212f89d13 Author: Timo Aaltonen Date: Tue Nov 10 18:21:09 2015 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index 799a0e4..006962c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.3-2ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium [ Robert Ancell ] * debian/patches/xmir.patch: @@ -12,7 +12,7 @@ xorg-server (2:1.17.3-2ubuntu1) UNRELEASED; urgency=medium linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Dropped, upstream. - -- Robert Ancell Tue, 03 Nov 2015 10:23:16 +1300 + -- Timo Aaltonen Tue, 10 Nov 2015 18:20:55 +0200 xorg-server (2:1.17.3-2) unstable; urgency=medium commit c645e5ed373e2daf60f24650bbc9864336336d9e Author: Timo Aaltonen Date: Tue Nov 10 18:20:13 2015 +0200 update the changelog, close a bug diff --git a/debian/changelog b/debian/changelog index f3db260..799a0e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ xorg-server (2:1.17.3-2ubuntu1) UNRELEASED; urgency=medium + [ Robert Ancell ] * debian/patches/xmir.patch: - Update to latest version * debian/patches/xmir-rootless.patch: - Merged into xmir.patch + [ Timo Aaltonen ] + * Merge from Debian. (LP: #1511649) + * glamor-make-current-in-prepare-paths.diff, +linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: +Dropped, upstream. + -- Robert Ancell Tue, 03 Nov 2015 10:23:16 +1300 xorg-server (2:1.17.3-2) unstable; urgency=medium
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 426edc3ad9dd901888fe47f4c0c9fb2fcf3dd8ab Author: Robert Ancell Date: Tue Nov 3 11:10:45 2015 +1300 Mark as unreleased diff --git a/debian/changelog b/debian/changelog index a1f463a..f3db260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium +xorg-server (2:1.17.3-2ubuntu1) UNRELEASED; urgency=medium * debian/patches/xmir.patch: - Update to latest version
xorg-server: Changes to 'ubuntu'
debian/changelog |9
debian/patches/series |1
debian/patches/xmir-rootless.patch | 296 ---
debian/patches/xmir.patch | 1549 ++---
4 files changed, 1109 insertions(+), 746 deletions(-)
New commits:
commit d607125530d7e0589f16dd7e4db57838fdc1352f
Author: Robert Ancell
Date: Tue Nov 3 10:24:20 2015 +1300
* debian/patches/xmir.patch:
- Update to latest version
* debian/patches/xmir-rootless.patch:
- Merged into xmir.patch
diff --git a/debian/changelog b/debian/changelog
index 7ea1038..a1f463a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Update to latest version
+ * debian/patches/xmir-rootless.patch:
+- Merged into xmir.patch
+
+ -- Robert Ancell Tue, 03 Nov 2015 10:23:16
+1300
+
xorg-server (2:1.17.3-2) unstable; urgency=medium
* Finalize xserver-xorg-core.NEWS. Thanks, Michael Biebl!
diff --git a/debian/patches/series b/debian/patches/series
index 6945191..75b075f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,7 +48,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
-xmir-rootless.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
deleted file mode 100644
index f3bef1e..000
--- a/debian/patches/xmir-rootless.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From a7b78b9c0eee1a53e0fed309474aa6cc76656ffc Mon Sep 17 00:00:00 2001
-From: Robert Ancell
-Date: Thu, 9 Jul 2015 14:03:49 +1200
-Subject: [PATCH 2/4] xmir: Support rootless
-
-Contributions from:
- Maarten Lankhorst
- Robert Ancell
- composite/compalloc.c| 6 ++
- composite/compositeext.h | 3 +++
- hw/xmir/xmir-cursor.c| 5 -
- hw/xmir/xmir-dri2.c | 4
- hw/xmir/xmir-input.c | 34 ++
- hw/xmir/xmir-output.c| 8
- hw/xmir/xmir.c | 48 +++-
- hw/xmir/xmir.h | 2 +-
- 8 files changed, 99 insertions(+), 11 deletions(-)
-
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index 8daded0..fb1b476 100644
a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -46,6 +46,7 @@
- #endif
-
- #include "compint.h"
-+#include "compositeext.h"
-
- static void
- compScreenUpdate(ScreenPtr pScreen)
-@@ -411,6 +412,11 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin,
int update)
- return Success;
- }
-
-+int CompositeRedirectSubwindows (WindowPtr pWin, int update)
-+{
-+return compRedirectSubwindows (serverClient, pWin, update);
-+}
-+
- /*
- * Free one of the per-client per-subwindows resources,
- * which frees one redirect per subwindow
-diff --git a/composite/compositeext.h b/composite/compositeext.h
-index b96cb1d..f279013 100644
a/composite/compositeext.h
-+++ b/composite/compositeext.h
-@@ -35,6 +35,9 @@ extern _X_EXPORT Bool
CompositeRegisterAlternateVisuals(ScreenPtr pScreen,
- VisualID * vids,
- int nVisuals);
-
-+extern _X_EXPORT int CompositeRedirectSubwindows(WindowPtr pWin,
-+ int update);
-+
- extern _X_EXPORT Bool CompositeRegisterImplicitRedirectionException(ScreenPtr
pScreen,
- VisualID
parentVisual,
- VisualID
winVisual);
-diff --git a/hw/xmir/xmir-cursor.c b/hw/xmir/xmir-cursor.c
-index 459f9ac..c311d88 100644
a/hw/xmir/xmir-cursor.c
-+++ b/hw/xmir/xmir-cursor.c
-@@ -134,7 +134,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
- config = mir_cursor_configuration_from_buffer_stream(stream,
cursor->bits->xhot, cursor->bits->yhot);
-
- apply:
--
mir_wait_for(mir_surface_configure_cursor(xmir_window_get(xmir_input->xmir_screen->screen->root)->surface,
config));
-+if (!xmir_input->xmir_screen->rootless)
-+
mir_wait_for(mir_surface_configure_cursor(xmir_window_get(xmir_input->xmir_screen->screen->root)->surface,
config));
-+else if (xmir_input->focus_window)
-+
mir_wait_for(mir_surface_configure_cursor(xmir_input->focus_window->surface,
config));
- mir_cursor_configuration_destroy(config);
-
- if (stream)
-diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
-index 1f7c1b0..4f95006 100644
a/hw/xmir/xmir-dri2.c
-+++ b/hw/xmir/xmir-dri2.c
-@@ -90,8 +90,12 @@ static struct xmir_window *
- xmir_window_swappable_parent(WindowPtr win)
- {
- ScreenPtr screen = win->drawable.pScreen;
-+struct xmir_screen *xmir_screen = xmir_screen_get(screen);
- PixmapPtr root, pixmap;
-
-+if
xorg-server: Changes to 'ubuntu'
ChangeLog | 2626 ++ Xext/xace.c | 15 Xext/xace.h |3 Xext/xselinux_hooks.c |8 Xi/exevents.c | 12 configure.ac| 13 debian/changelog| 74 debian/control | 37 debian/patches/02_kbsd-input-devd.diff | 14 debian/patches/03_static-nettle.diff|2 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 20 debian/patches/191-Xorg-add-an-extra-module-path.patch | 32 debian/patches/228_autobind_gpu.patch | 10 debian/patches/disable-rotation-transform-gpuscreens.patch |4 debian/patches/drm_device_keep_trying.patch | 12 debian/patches/fix-detach-gpu.patch | 28 debian/patches/glamor-make-current-in-prepare-paths.diff| 32 debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch | 80 debian/patches/no-nv.patch |4 debian/patches/series |3 debian/patches/xext-fix-udeb-build.diff | 37 debian/patches/xf86-ignore-conflicting-rr-caps.patch|8 debian/patches/xmir.patch | 80 debian/po/POTFILES.in |1 debian/po/ar.po | 62 debian/po/ast.po| 64 debian/po/be.po | 58 debian/po/bg.po | 80 debian/po/bn.po | 60 debian/po/bs.po | 70 debian/po/ca.po | 79 debian/po/cs.po | 79 debian/po/da.po | 98 debian/po/de.po | 78 debian/po/dz.po | 73 debian/po/el.po | 84 debian/po/eo.po | 61 debian/po/es.po | 88 debian/po/eu.po | 82 debian/po/fi.po | 62 debian/po/fr.po | 87 debian/po/gl.po | 68 debian/po/gu.po | 59 debian/po/he.po | 61 debian/po/hr.po | 56 debian/po/hu.po | 56 debian/po/id.po | 74 debian/po/it.po | 85 debian/po/ja.po | 81 debian/po/kk.po | 55 debian/po/km.po | 70 debian/po/ko.po | 58 debian/po/ku.po | 56 debian/po/lt.po | 71 debian/po/ml.po | 70 debian/po/mr.po | 60 debian/po/nb.po | 63 debian/po/ne.po | 63 debian/po/nl.po | 82 debian/po/nn.po | 70 debian/po/pl.po | 66 debian/po/pothead.in
xorg-server: Changes to 'ubuntu'
debian/changelog|9
+
debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch | 80
++
debian/patches/series |1
debian/patches/xmir.patch |2
4 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit c60a9b670326660ce120d43e703da56dc50450d9
Author: Timo Aaltonen
Date: Tue Oct 27 07:02:29 2015 +0200
import changes from 2:1.17.2-1ubuntu10
* debian/patches:
- linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Fix crashers
often occuring on shutdown (LP: #1237904)
- xmir.patch: Fix typo causing FTBFS
diff --git a/debian/changelog b/debian/changelog
index 9f04da8..f753c0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.2-1ubuntu10) xenial; urgency=medium
+
+ * debian/patches:
+- linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Fix crashers
+ often occuring on shutdown (LP: #1237904)
+- xmir.patch: Fix typo causing FTBFS
+
+ -- Tim Lunn Mon, 26 Oct 2015 12:24:30 +1100
+
xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git
a/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
b/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
new file mode 100644
index 000..9419f9d
--- /dev/null
+++ b/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
@@ -0,0 +1,80 @@
+From 2092f12a243b9f7682f542b593b77c96d455ec89 Mon Sep 17 00:00:00 2001
+From: Hans de Goede
+Date: Wed, 21 Oct 2015 11:36:06 +0200
+Subject: linux: Do not call FatalError from xf86CloseConsole
+
+FatalError ends up calling xf86CloseConsole itself, so calling FatalError
+from within xf86CloseConsole is not a good idea.
+
+Make switch_to log errors using xf86Msg(X_WARNING, ...) and return success
+(or failure).
+
+This makes switch_to match the other error checking done in xf86CloseConsole
+which all logs warnings and continues.
+
+Add checking of the return value in xf86OpenConsole and call
+FatalError there when switch_to fails, to preserve the error-handling
+behavior of xf86OpenConsole.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
+Reviewed-by: Adam Jackson
+Signed-off-by: Hans de Goede
+
+diff --git a/hw/xfree86/os-support/linux/lnx_init.c
b/hw/xfree86/os-support/linux/lnx_init.c
+index ec06a05..1ed213c 100644
+--- a/hw/xfree86/os-support/linux/lnx_init.c
b/hw/xfree86/os-support/linux/lnx_init.c
+@@ -63,18 +63,24 @@ drain_console(int fd, void *closure)
+ }
+ }
+
+-static void
++static int
+ switch_to(int vt, const char *from)
+ {
+ int ret;
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
+-if (ret < 0)
+-FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
++if (ret < 0) {
++xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from,
strerror(errno));
++return 0;
++}
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
+-if (ret < 0)
+-FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
++if (ret < 0) {
++xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from,
strerror(errno));
++return 0;
++}
++
++return 1;
+ }
+
+ #pragma GCC diagnostic push
+@@ -233,7 +239,8 @@ xf86OpenConsole(void)
+ /*
+ * now get the VT. This _must_ succeed, or else fail completely.
+ */
+-switch_to(xf86Info.vtno, "xf86OpenConsole");
++if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
++FatalError("xf86OpenConsole: Switching VT failed\n");
+
+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
+ if (ret < 0)
+@@ -294,7 +301,8 @@ xf86OpenConsole(void)
+ else { /* serverGeneration != 1 */
+ if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
+ /* now get the VT */
+-switch_to(xf86Info.vtno, "xf86OpenConsole");
++if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
++FatalError("xf86OpenConsole: Switching VT failed\n");
+ }
+ }
+ }
+--
+cgit v0.10.2
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 9327629..1532d9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ drm_device_keep_trying.patch
xi2-resize-touch.patch
os-make-sure-the-clientswritable-fd-set-is-initialized.diff
glamor-make-current-in-prepare-paths.diff
+linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index fd421ae..a14956b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -71,7 +71,7 @@ Index: xorg-server-1.17.2/configure.ac
+dnl Xmir DDX
+
-+PKG_CHECK_MODULES(XM
xorg-server: Changes to 'ubuntu'
debian/changelog | 21 ++
debian/control |1
debian/patches/glamor-make-current-in-prepare-paths.diff | 32 +++
debian/patches/series|1
debian/patches/xmir.patch| 141 ++-
5 files changed, 116 insertions(+), 80 deletions(-)
New commits:
commit 20ab8d0971b20d8b79da97cffbb41c99e851e899
Author: Robert Ancell
Date: Tue Oct 27 11:23:29 2015 +1300
* debian/patches/xmir.patch:
- Fix FTBFS due to change in Mir headers
diff --git a/debian/changelog b/debian/changelog
index 0074e9a..9f04da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix FTBFS due to change in Mir headers
+
+ -- Robert Ancell Wed, 30 Sep 2015 16:15:39
+1300
+
xorg-server (2:1.17.2-1ubuntu8) wily; urgency=medium
* debian/control:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f0c8bef..fd421ae 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -45,11 +45,11 @@ Contributions from:
create mode 100644 hw/xmir/xmir.c
create mode 100644 hw/xmir/xmir.h
-diff --git a/configure.ac b/configure.ac
-index d8f0e74..75d74ae 100644
a/configure.ac
-+++ b/configure.ac
-@@ -624,6 +624,7 @@ AC_ARG_ENABLE(xvfb,
AS_HELP_STRING([--enable-xvfb], [Build Xvfb server
+Index: xorg-server-1.17.2/configure.ac
+===
+--- xorg-server-1.17.2.orig/configure.ac
xorg-server-1.17.2/configure.ac
+@@ -629,6 +629,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_ST
AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build
Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build
Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build
Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
@@ -57,7 +57,7 @@ index d8f0e74..75d74ae 100644
AC_ARG_ENABLE(standalone-xpbproxy,
AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in
addition to the one integrated into Xquartz as a separate thread) (default:
no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build
XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor
dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no])
-@@ -745,6 +746,7 @@ case $host_os in
+@@ -750,6 +751,7 @@ case $host_os in
XVFB=no
XNEST=no
XWAYLAND=no
@@ -65,13 +65,13 @@ index d8f0e74..75d74ae 100644
COMPOSITE=no
DGA=no
-@@ -2474,6 +2476,27 @@ if test "x$XWAYLAND" = xyes; then
+@@ -2495,6 +2497,27 @@ if test "x$XWAYLAND" = xyes; then
[${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
fi
+dnl Xmir DDX
+
-+PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1 libdrm epoxy],
[have_xmir=yes], [have_xmir=no])
++PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1
mir-client-platform-mesa-dev libdrm epoxy], [have_xmir=yes], [have_xmir=no])
+AC_MSG_CHECKING([whether to build Xmir DDX])
+if test "x$XMIR" = xauto; then
+ XMIR="$have_xmir"
@@ -93,7 +93,7 @@ index d8f0e74..75d74ae 100644
dnl and the rest of these are generic, so they're in config.h
dnl
-@@ -2622,6 +2645,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2643,6 +2666,8 @@ hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
@@ -102,10 +102,10 @@ index d8f0e74..75d74ae 100644
test/Makefile
test/xi1/Makefile
test/xi2/Makefile
-diff --git a/hw/Makefile.am b/hw/Makefile.am
-index 19895dc..b7b958c 100644
a/hw/Makefile.am
-+++ b/hw/Makefile.am
+Index: xorg-server-1.17.2/hw/Makefile.am
+===
+--- xorg-server-1.17.2.orig/hw/Makefile.am
xorg-server-1.17.2/hw/Makefile.am
@@ -30,6 +30,10 @@ if XWAYLAND
XWAYLAND_SUBDIRS = xwayland
endif
@@ -130,18 +130,16 @@ index 19895dc..b7b958c 100644
relink:
$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ;
done
-diff --git a/hw/xmir/.gitignore b/hw/xmir/.gitignore
-new file mode 100644
-index 000..b6a16d4
+Index: xorg-server-1.17.2/hw/xmir/.gitignore
+===
--- /dev/null
-+++ b/hw/xmir/.gitignore
xorg-server-1.17.2/hw/xmir/.gitignore
@@ -0,0 +1 @@
+Xmir
-diff --git a/hw/xmir/Makefile.am b/hw/xmir/Makefile.am
-new file mode 100644
-index 0
xorg-server: Changes to 'ubuntu'
debian/changelog | 7 + debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff | 63 ++ debian/patches/series | 1 3 files changed, 71 insertions(+) New commits: commit 90d42c38b455afbe55579612f7e59a151bcb465e Author: Timo Aaltonen Date: Tue Sep 8 10:30:46 2015 +0300 release to wily diff --git a/debian/changelog b/debian/changelog index 229ceff..2448815 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.17.2-1ubuntu6) UNRELEASED; urgency=medium +xorg-server (2:1.17.2-1ubuntu6) wily; urgency=medium * os-make-sure-the-clientswritable-fd-set-is-initialized.diff: Fix crashers caused by newer xproto bumping XFD_SETSIZE. (LP: #1484380) - -- Timo Aaltonen Tue, 08 Sep 2015 10:16:29 +0300 + -- Timo Aaltonen Tue, 08 Sep 2015 10:30:31 +0300 xorg-server (2:1.17.2-1ubuntu5) wily; urgency=medium commit aef44943b6730c8f3800dbef6ff55b36657b5d5e Author: Timo Aaltonen Date: Tue Sep 8 10:30:22 2015 +0300 os-make-sure-the-clientswritable-fd-set-is-initialized.diff: Fix crashers caused by newer xproto bumping XFD_SETSIZE. (LP: #1484380) diff --git a/debian/changelog b/debian/changelog index fe8c4d1..229ceff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.17.2-1ubuntu6) UNRELEASED; urgency=medium + + * os-make-sure-the-clientswritable-fd-set-is-initialized.diff: Fix +crashers caused by newer xproto bumping XFD_SETSIZE. (LP: #1484380) + + -- Timo Aaltonen Tue, 08 Sep 2015 10:16:29 +0300 + xorg-server (2:1.17.2-1ubuntu5) wily; urgency=medium * disable-rotation-transform-gpuscreens.patch: Revert back to disabling diff --git a/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff b/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff new file mode 100644 index 000..b3a7d2e --- /dev/null +++ b/debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff @@ -0,0 +1,63 @@ +From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 +From: Martin Peres +Date: Fri, 17 Jul 2015 17:21:26 +0300 +Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized + before use + +In WaitForSomething(), the fd_set clientsWritable may be used unitialized when +the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to +a crash in FlushAllOutput() after x11proto's commit +2c94cdb453bc641246cc8b9a876da9799bee1ce7. + +The problem did not manifest before because both the XFD_SIZE and the maximum +number of clients were set to 256. As the connectionTranslation table was +initalized for the 256 clients to 0, the test on the index not being 0 was +aborting before dereferencing the client #0. + +As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE +got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 +to be uninitialized which in turns lead to reading an index after the end of +the ConnectionTranslation table. This index would then be used to find the +client corresponding to the fd marked as pending writes and would also result +to an out-of-bound access which would usually be the fatal one. + +Fix this by zeroing the clientsWritable fd_set at the beginning of +WaitForSomething(). In this case, the bottom part of the loop, which would +indirectly call FlushAllOutput, will not do any work but the next call to +select will result in the execution of the right codepath. This is exactly what +we want because we need to know the writable clients before handling them. In +the end, it also makes sure that the fds above MaxClient are initialized, +preventing the crash in FlushAllOutput(). + +Thanks to everyone involved in tracking this one down! + +Reported-by: Karol Herbst +Reported-by: Tobias Klausmann +Signed-off-by: Martin Peres +Tested-by: Martin Peres +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 +Cc: Ilia Mirkin +Cc: Martin Peres +Cc: Olivier Fourdan +Cc: Alan Coopersmith +--- + os/WaitFor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/os/WaitFor.c b/os/WaitFor.c +index 431f1a6..993c14e 100644 +--- a/os/WaitFor.c b/os/WaitFor.c +@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) + Bool someReady = FALSE; + + FD_ZERO(&clientsReadable); ++FD_ZERO(&clientsWritable); + + if (nready) + SmartScheduleStopTimer(); +-- +2.4.5 + diff --git a/debian/patches/series b/debian/patches/series index bbac1ac..e1f102b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,3 +51,4 @@ xmir-rootless.patch xmir-desktop-file-hint-flag.patch drm_device_keep_trying.patch xi2-resize-touch.patch +os-make-sure-the-clientswritable-fd-set-is-initialized.diff
xorg-server: Changes to 'ubuntu'
debian/changelog |7 ++
debian/patches/disable-rotation-transform-gpuscreens.patch | 36 -
2 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 6e30360f9a6cd950b7acf7164cee0aacbede9d29
Author: Timo Aaltonen
Date: Wed Sep 2 16:17:14 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index c124287..fe8c4d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.17.2-1ubuntu5) UNRELEASED; urgency=medium
+xorg-server (2:1.17.2-1ubuntu5) wily; urgency=medium
* disable-rotation-transform-gpuscreens.patch: Revert back to disabling
rotations on GPU screens. It won't work before 1.18. (LP: #1489696)
- -- Timo Aaltonen Wed, 02 Sep 2015 15:39:08 +0300
+ -- Timo Aaltonen Wed, 02 Sep 2015 15:56:03 +0300
xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
commit 586a8b1ff752312d869982f7308cf60f585caece
Author: Timo Aaltonen
Date: Wed Sep 2 15:47:48 2015 +0300
disable-rotation-transform-gpuscreens.patch:
Revert back to disabling rotations on GPU screens.
It won't work before 1.18. (LP: #1489696)
diff --git a/debian/changelog b/debian/changelog
index 5d373f1..c124287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu5) UNRELEASED; urgency=medium
+
+ * disable-rotation-transform-gpuscreens.patch: Revert back to disabling
+rotations on GPU screens. It won't work before 1.18. (LP: #1489696)
+
+ -- Timo Aaltonen Wed, 02 Sep 2015 15:39:08 +0300
+
xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
* debian/patches/xmir-rootless.patch:
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch
b/debian/patches/disable-rotation-transform-gpuscreens.patch
index fb83137..6fd829c 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -2,17 +2,27 @@ Description: Disable support for rotations and transforms on
gpu screens.
Author: Maarten Lankhorst
Bug-Ubuntu: https://launchpad.net/bugs/1386620
Bug-Ubuntu: https://launchpad.net/bugs/1308515
+Bug-Ubuntu: https://launchpad.net/bugs/1489696
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index a441fd1..9147a26 100644
a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -778,7 +778,7 @@ xf86CrtcScreenInit(ScreenPtr screen)
- if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
- break;
- }
--if (c == config->num_crtc) {
-+if (c == config->num_crtc && !screen->isGPU) {
- xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
- RR_Rotate_180 | RR_Rotate_270 |
- RR_Reflect_X | RR_Reflect_Y);
+--- a/hw/xfree86/modes/xf86RandR12.c
b/hw/xfree86/modes/xf86RandR12.c
+@@ -927,6 +927,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
+ if (xf86RandR12Key == NULL)
+ return;
+
++if (pScreen->isGPU)
++rotations = RR_Rotate_0;
++
+ randrp = XF86RANDRINFO(pScreen);
+ #if RANDR_12_INTERFACE
+ for (c = 0; c < config->num_crtc; c++) {
+@@ -947,6 +950,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ #endif
+
++if (pScreen->isGPU)
++transforms = FALSE;
++
+ if (xf86RandR12Key == NULL)
+ return;
+
xorg-server: Changes to 'ubuntu-vivid-lts'
New branch 'ubuntu-vivid-lts' available with the following commits: commit 439b4b7c736fb97754a42409305f7e436b9ad874 Author: Timo Aaltonen Date: Wed Sep 2 16:32:29 2015 +0300 release to trusty commit 78fb5b28609ce98bea38b059f923db94251cafa3 Merge: 9223eba e02d20e Author: Timo Aaltonen Date: Wed Sep 2 16:22:33 2015 +0300 Merge branch 'ubuntu-vivid' into lts-vivid commit 9223ebaa26bb30b7cb32a77a88bf5da87aaf376b Author: Timo Aaltonen Date: Wed May 13 07:23:59 2015 +0300 Backport vivid package for lts-vivid stack.
xorg-server: Changes to 'ubuntu-vivid'
New branch 'ubuntu-vivid' available with the following commits: commit e02d20e6c9433b2b7cb6f67bf5423e0808322186 Author: Timo Aaltonen Date: Wed Sep 2 16:21:27 2015 +0300 release to vivid commit 9d9fe62276d554ded165cc73032632dc49aee50c Author: Timo Aaltonen Date: Wed Sep 2 16:20:55 2015 +0300 disable-rotation-transform-gpuscreens.patch: Revert back to disabling rotations on GPU screens. (LP: #1489696)
xorg-server: Changes to 'ubuntu'
debian/changelog | 14
debian/patches/xmir-desktop-file-hint-flag.patch |4 +-
debian/patches/xmir-rootless.patch | 34 ++---
debian/patches/xmir.patch| 36 +--
4 files changed, 60 insertions(+), 28 deletions(-)
New commits:
commit 57450213538280a57d6601fc4d4e5f493b6df0d5
Author: Robert Ancell
Date: Fri Aug 21 14:51:34 2015 +1200
debian/patches/xmir-rootless.patch:
* debian/patches/xmir-rootless.patch:
- Fix crash when running XMir in rootless mode (LP: #1472097)
diff --git a/debian/changelog b/debian/changelog
index 3f37f39..5d373f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
+
+ * debian/patches/xmir-rootless.patch:
+- Fix crash when running XMir in rootless mode (LP: #1472097)
+
+ -- Robert Ancell Thu, 20 Aug 2015 16:31:37
+1200
+
xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index b6b7bbd..f3bef1e 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
+From a7b78b9c0eee1a53e0fed309474aa6cc76656ffc Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Thu, 9 Jul 2015 14:03:49 +1200
Subject: [PATCH 2/4] xmir: Support rootless
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen->windowed = 1;
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 4afd66e..ef78cca 100644
+index 4afd66e..13224aa 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -33,6 +33,7 @@
@@ -202,14 +202,14 @@ index 4afd66e..ef78cca 100644
-if (window->parent)
-return ret;
-+if (xmir_screen->rootless) {
-+if (!window->parent) {
-+CompositeRedirectSubwindows(window,
/*CompositeRedirectManual*/TRUE); // WTF? Where is this defined
-+RegionNull(&window->clipList);
-+RegionNull(&window->borderClip);
-+RegionNull(&window->winSize);
-+}
++if (xmir_screen->rootless && !window->parent) {
++RegionNull(&window->clipList);
++RegionNull(&window->borderClip);
++RegionNull(&window->winSize);
++}
+
++if (xmir_screen->rootless) {
++CompositeRedirectSubwindows(window, /*CompositeRedirectManual*/TRUE);
// WTF? Where is this defined
+if (window->redirectDraw != RedirectDrawManual)
+return ret;
+}
@@ -292,5 +292,5 @@ index e43fa40..b67f3a1 100644
CreateScreenResourcesProcPtr CreateScreenResources;
CloseScreenProcPtr CloseScreen;
--
-2.4.6
+2.5.0
commit e66034f70fbf0962877cfd3adfe18d3503d54aa9
Author: Robert Ancell
Date: Fri Aug 21 14:51:20 2015 +1200
debian/patches/xmir.patch:
* debian/patches/xmir.patch:
- Fix red and blue channels being swapped on Android drivers (LP:
#1471146)
diff --git a/debian/changelog b/debian/changelog
index 6b05edc..3f37f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix red and blue channels being swapped on Android drivers (LP: #1471146)
+
+ -- Robert Ancell Thu, 30 Jul 2015 15:31:29
+1200
+
xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 8b3a1dd..7dbc73a 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,4 +1,4 @@
-From cc91948d4be69af96ddf9417a4b3cfac5d0f0f35 Mon Sep 17 00:00:00 2001
+From 938313b76b0e3279a94af931cbe5fd34b8cb580c Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Mon, 13 Jul 2015 15:54:32 +1200
Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
@@ -9,7 +9,7 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag
required by Unity8
1 file changed, 3 insertions(+)
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 2a7227e..810b715 100644
+index ef78cca..b9b7f2d 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index 4f0196a..b6b7bbd 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 3c705fcf4a68de1276d1a2f6ee176ec7e62eb9df Mon Sep 17 00:00:00 2001
+From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Thu, 9 Jul 2015 14:03:49 +1200
Subject: [PATCH 2/4] xmir: Support rootless
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen->windowed =
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af329b148c1b01d2edf90483ef219e8b7fb41b82 Author: Robert Ancell Date: Wed Jul 29 15:43:41 2015 +1200 releasing package xorg-server version 2:1.17.2-1ubuntu2 diff --git a/debian/changelog b/debian/changelog index 827c9da..6b05edc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.2-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium * debian/patches/xmir.patch: - Fix cursor crash -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zkiht-0002cx...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |9 +
debian/patches/series|1
debian/patches/xmir-desktop-file-hint-flag.patch | 27 +++
debian/patches/xmir-rootless.patch | 24 +--
debian/patches/xmir.patch| 179 ---
5 files changed, 147 insertions(+), 93 deletions(-)
New commits:
commit f904788ee3b0403680352c87e05245928d7df702
Author: Robert Ancell
Date: Wed Jul 29 15:13:39 2015 +1200
* debian/patches/xmir.patch:
- Fix cursor crash
* debian/patches/xmir-desktop-file-hint-flag.patch:
- Split Unity8 hack out from xmir.patch
diff --git a/debian/changelog b/debian/changelog
index d1d2f1b..827c9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.2-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix cursor crash
+ * debian/patches/xmir-desktop-file-hint-flag.patch:
+- Split Unity8 hack out from xmir.patch
+
+ -- Robert Ancell Wed, 29 Jul 2015 14:18:31
+1200
+
xorg-server (2:1.17.2-1ubuntu1) wily; urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/patches/series b/debian/patches/series
index cf2fcbe..bbac1ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,5 +48,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
xmir-rootless.patch
+xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
new file mode 100644
index 000..8b3a1dd
--- /dev/null
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -0,0 +1,27 @@
+From cc91948d4be69af96ddf9417a4b3cfac5d0f0f35 Mon Sep 17 00:00:00 2001
+From: Robert Ancell
+Date: Mon, 13 Jul 2015 15:54:32 +1200
+Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
+ to decide which application is starting
+
+---
+ hw/xmir/xmir.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
+index 2a7227e..810b715 100644
+--- a/hw/xmir/xmir.c
b/hw/xmir/xmir.c
+@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
+ } else if (!strcmp(argv[i], "-novtswitch") ||
+!strncmp(argv[i], "vt", 2)) {
+ return 1;
++/* Bypass unity8 "security" */
++} else if (!strncmp(argv[i], "--desktop_file_hint=",
strlen("--desktop_file_hint="))) {
++return 1;
+ } else if (!strcmp(argv[i], "-fd")) {
+ if (!seen_shared)
+ NoListenAll = 1;
+--
+2.4.6
+
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index 82b20b1..4f0196a 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,7 +1,7 @@
-From ae3f0599114144c26ab1de02320f000c86b2d042 Mon Sep 17 00:00:00 2001
+From 3c705fcf4a68de1276d1a2f6ee176ec7e62eb9df Mon Sep 17 00:00:00 2001
From: Robert Ancell
Date: Thu, 9 Jul 2015 14:03:49 +1200
-Subject: [PATCH 2/3] xmir: Support rootless
+Subject: [PATCH 2/4] xmir: Support rootless
Contributions from:
Maarten Lankhorst
@@ -56,10 +56,10 @@ index b96cb1d..f279013 100644
VisualID
parentVisual,
VisualID
winVisual);
diff --git a/hw/xmir/xmir-cursor.c b/hw/xmir/xmir-cursor.c
-index 143f008..dd9a8a7 100644
+index 459f9ac..c311d88 100644
--- a/hw/xmir/xmir-cursor.c
+++ b/hw/xmir/xmir-cursor.c
-@@ -131,7 +131,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
+@@ -134,7 +134,10 @@ xmir_input_set_cursor(struct xmir_input *xmir_input)
config = mir_cursor_configuration_from_buffer_stream(stream,
cursor->bits->xhot, cursor->bits->yhot);
apply:
@@ -72,7 +72,7 @@ index 143f008..dd9a8a7 100644
if (stream)
diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
-index 21de4f9..b88d089 100644
+index 1f7c1b0..4f95006 100644
--- a/hw/xmir/xmir-dri2.c
+++ b/hw/xmir/xmir-dri2.c
@@ -90,8 +90,12 @@ static struct xmir_window *
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen->windowed = 1;
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index ce30727..a598c0d 100644
+index c07457d..2a7227e 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -33,6 +33,7 @@
@@ -196,7 +196,7 @@ index ce30727..a598c0d 100644
strcmp(argv[i], "-egl") == 0 ||
strcmp(argv[i], "-egl_sync") == 0 ||
strcmp(argv[i], "-2x") == 0 ||
-@@ -424,8 +427,21 @@ xmir_realize_window(WindowPtr window)
+@@ -422,8 +425,21 @@ xmir_realize_window(WindowPtr window)
xmir_screen->RealizeWindow = screen->RealizeWindow;
screen->RealizeWindow = xmir_realize_window;
@@ -220,7 +220,7 @@ index ce30727..a598c0d 100644
spec = mir_connection_create_spec_for_normal_surface(xmir_screen->conn,
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c8e73b3f2bea9606a41edb1235b7d1d42ba509bd Author: Robert Ancell Date: Thu Jul 23 11:05:04 2015 +1200 Releasing 1.17.2-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 3341a8e..d1d2f1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.17.2-1ubuntu1) wily; urgency=medium [ Timo Aaltonen ] * Merge from Debian unstable. (LP: #1471185) @@ -13,7 +13,7 @@ xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium * debian/xserver-xorg-core.install: - Simplify man page install - -- Timo Aaltonen Wed, 03 Jun 2015 11:41:03 +0300 + -- Robert Ancell Thu, 23 Jul 2015 11:04:33 +1200 xorg-server (2:1.17.2-1) unstable; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi34p-0006xu...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit ee4a3bc0596d467bb8dee2f6deb984c38dfb4f13 Author: Robert Ancell Date: Thu Jul 23 10:52:18 2015 +1200 Add already released changelog entry diff --git a/debian/changelog b/debian/changelog index 9c56f89..3341a8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,12 @@ xorg-server (2:1.17.1-2) unstable; urgency=medium -- Julien Cristau Mon, 04 May 2015 22:04:01 +0200 +xorg-server (2:1.17.1-0ubuntu6) wily; urgency=medium + + * No change rebuild against Mir 0.14.0 + + -- Robert Ancell Thu, 16 Jul 2015 10:37:45 +1200 + xorg-server (2:1.17.1-0ubuntu5) wily; urgency=medium * debain/patches/xmir.patch: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2sd-0003fn...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 5b0482651708a60b1d09e115f92568524b2a348a Author: Robert Ancell Date: Thu Jul 23 10:49:02 2015 +1200 Update changelog diff --git a/debian/changelog b/debian/changelog index be4e4b1..9c56f89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,18 @@ xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium + [ Timo Aaltonen ] * Merge from Debian unstable. (LP: #1471185) - * xserver-xorg-xmir.install: Removed, not used anymore. * fix-int10.patch: Dropped, upstream. * pixman-validate.patch: Dropped, not upstream and not needed since pixman got fixed. * mi-dont-process-disabled.patch: This has been upstream for some time now, drop it. + [ Robert Ancell ] + * Add patch headers + * debian/xserver-xorg-core.install: +- Simplify man page install + -- Timo Aaltonen Wed, 03 Jun 2015 11:41:03 +0300 xorg-server (2:1.17.2-1) unstable; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2p2-00036l...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog | 12 1 file changed, 12 insertions(+) New commits: commit 0def3643f5120aa93558280875ee76ac4c9f640b Author: Robert Ancell Date: Thu Jul 23 10:47:15 2015 +1200 Add already released changelog entry diff --git a/debian/changelog b/debian/changelog index 579f11b..be4e4b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,18 @@ xorg-server (2:1.17.1-2) unstable; urgency=medium -- Julien Cristau Mon, 04 May 2015 22:04:01 +0200 +xorg-server (2:1.17.1-0ubuntu5) wily; urgency=medium + + * debain/patches/xmir.patch: +- Update from git branch, now builds against Mir 0.14.0 + * debian/patches/xmir-rootless.patch: +- Split out rootless support which requires more extensive changes to + existing X code. + * debian/control: +- Add build-depends on mir-client-platform-mesa-dev + + -- Robert Ancell Mon, 13 Jul 2015 11:33:23 +1200 + xorg-server (2:1.17.1-0ubuntu4) wily; urgency=medium * debian/control: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zi2nn-0002s4...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/control |3
debian/patches/105_nvidia_fglrx_autodetect.patch| 27
debian/patches/111_armel-drv-fallbacks.patch| 13
debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 17
debian/patches/168_glibc_trace_to_stderr.patch | 14
debian/patches/188_default_primary_to_first_busid.patch |4
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 62
debian/patches/191-Xorg-add-an-extra-module-path.patch | 58
debian/patches/208_switch_on_release.diff | 18
debian/patches/226_fall_back_to_autoconfiguration.patch | 33
debian/patches/227_null_ptr_midispcur.patch | 15
debian/patches/232-xf86compatoutput-valgrind.patch | 17
debian/patches/config-add-no-removal.patch | 20
debian/patches/disable-rotation-transform-gpuscreens.patch |5
debian/patches/fix-detach-gpu.patch | 32
debian/patches/fix-ftbfs-ppc64el.patch |3
debian/patches/series |1
debian/patches/xf86-ignore-conflicting-rr-caps.patch| 12
debian/patches/xf86-inactive-gpuscreen.patch| 15
debian/patches/xfree86-no-xv-for-gpuscreens.patch | 24
debian/patches/xi2-resize-touch.patch |3
debian/patches/xmir-rootless.patch | 296
debian/patches/xmir.patch | 630
+++---
debian/rules|2
debian/xserver-xorg-core.install|8
25 files changed, 785 insertions(+), 547 deletions(-)
New commits:
commit b62f95454214b1d4a44bc8faa39b4cf341022323
Author: Robert Ancell
Date: Wed Jul 15 14:06:27 2015 +1200
Simplify man page install
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 6c06117..bf568df 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -1,13 +1,11 @@
main/usr/lib/xorg/modules usr/lib/xorg
main/usr/bin/Xorg usr/bin
main/usr/share/man/man1/Xorg.1 usr/share/man/man1
-main/usr/share/man/man4/exa.4 usr/share/man/man4
-main/usr/share/man/man4/fbdevhw.4 usr/share/man/man4
+main/usr/share/man/man4usr/share/man/
main/usr/share/man/man5/xorg.conf.5usr/share/man/man5
main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5
main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
main/usr/share/man/man1/gtf.1 usr/share/man/man1
-main/usr/share/man/man4/modesetting.4 usr/share/man/man4
main/usr/share/X11/xorg.conf.d usr/share/X11/
commit d85da0ee3b58fc457b375c698fb994378f03da05
Author: Robert Ancell
Date: Wed Jul 15 14:05:37 2015 +1200
Update XMir patches
diff --git a/debian/control b/debian/control
index b90b872..ca853b3 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Build-Depends:
libwayland-dev [linux-any],
# XMir
libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el],
- libatomic-ops-dev,
+ mir-client-platform-mesa-dev,
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -211,6 +211,7 @@ Depends:
libpciaccess-dev,
mesa-common-dev,
libmirclient-dev [!arm64 !powerpc !ppc64el],
+ mir-client-platform-mesa-dev,
${misc:Depends},
Description: Xorg X server - development files
This package provides development files for the X.Org ('Xorg') X server.
diff --git a/debian/patches/series b/debian/patches/series
index ad76035..cf2fcbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,5 +47,6 @@ disable-rotation-transform-gpuscreens.patch
fix-ftbfs-ppc64el.patch
xmir.patch
+xmir-rootless.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
new file mode 100644
index 000..82b20b1
--- /dev/null
+++ b/debian/patches/xmir-rootless.patch
@@ -0,0 +1,296 @@
+From ae3f0599114144c26ab1de02320f000c86b2d042 Mon Sep 17 00:00:00 2001
+From: Robert Ancell
+Date: Thu, 9 Jul 2015 14:03:49 +1200
+Subject: [PATCH 2/3] xmir: Support rootless
+
+Contributions from:
+ Maarten Lankhorst
+ Robert Ancell
+---
+ composite/compalloc.c| 6 ++
+ composite/compositeext.h | 3 +++
+ hw/xmir/xmir-cursor.c| 5 -
+ hw/xmir/xmir-dri2.c | 4
+ hw/xmir/xmir-input.c | 34 ++
+ hw/xmir/xmir-output.c| 8
+ hw/xmir/xmir.c | 48 +++-
+ hw/xmir/xmir.h | 2 +-
+ 8 files changed, 99 inserti
xorg-server: Changes to 'ubuntu'
Xext/shm.c | 10 +- configure.ac | 10 +- debian/changelog | 45 - debian/compat|2 debian/control | 24 ++-- debian/copyright | 27 + debian/patches/fix-int10.patch | 42 debian/patches/mi-dont-process-disabled.patch| 62 debian/patches/pixman-validate.patch | 27 - debian/patches/series|3 debian/rules | 23 debian/upstream/signing-key.asc | 41 debian/xserver-xorg-core.install |1 dix/devices.c|3 dix/events.c |1 glamor/glamor.c | 40 glamor/glamor_core.c |2 glamor/glamor_egl.c |6 + glamor/glamor_fbo.c |1 glamor/glamor_font.c |1 glamor/glamor_largepixmap.c |9 + glamor/glamor_pixmap.c |1 glamor/glamor_priv.h |6 + glamor/glamor_program.c |3 glamor/glamor_render.c | 10 +- glamor/glamor_spans.c|2 glamor/glamor_sync.c |2 glamor/glamor_transfer.c | 57 +++ hw/kdrive/ephyr/ephyrinit.c | 11 +- hw/kdrive/ephyr/hostx.c | 27 +++-- hw/kdrive/fake/Makefile.am |1 hw/kdrive/fbdev/Makefile.am |1 hw/xfree86/common/xf86Events.c |7 - hw/xfree86/common/xf86platformBus.c | 20 +++- hw/xfree86/drivers/modesetting/drmmode_display.c |4 hw/xfree86/drivers/modesetting/dumb_bo.c |4 hw/xfree86/int10/generic.c |2 hw/xfree86/modes/xf86Crtc.h |2 hw/xfree86/os-support/linux/int10/linux.c|2 hw/xfree86/os-support/linux/systemd-logind.c | 17 +-- hw/xfree86/sdksyms.sh| 14 ++ hw/xnest/Keyboard.c |4 hw/xwayland/Makefile.am |1 hw/xwayland/xwayland-cursor.c| 26 + hw/xwayland/xwayland-glamor.c|4 hw/xwayland/xwayland-input.c | 57 +++ hw/xwayland/xwayland-output.c|4 hw/xwayland/xwayland.c |4 hw/xwayland/xwayland.h |8 - hw/xwin/glx/gen_gl_wrappers.py | 96 +-- hw/xwin/winclipboard/Makefile.am |2 hw/xwin/winprocarg.c | 14 ++ include/dix-config.h.in |6 + include/input.h |2 include/os.h | 17 +++ include/servermd.h |2 mi/mifillarc.c |5 + os/access.c | 111 ++- os/auth.c|8 - os/backtrace.c |4 os/connection.c |9 + os/log.c | 28 - os/utils.c |2 os/xdmcp.c | 21 present/present.c|8 - randr/rrcrtc.c |6 - randr/rrscreen.c |2 67 files changed, 680 insertions(+), 344 deletions(-) New commits: commit 4c2ae4ef23470c00d0d9ac65638d9b844528f0e9 Author: Timo Aaltonen Date: Tue Jul 7 12:54:37 2015 +0300 mi-dont-process-disabled.patch: This has been upstream for some time now, drop it. diff --git a/debian/changelog b/debian/changelog index 43f28bd..579f11b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ xorg-server (2:1.17.2-1ubuntu1) UNRELEASED; urgency=medium * fix-int10.patch: Dropped, upstream. * pixman-validate.patch: Dropped, not upstream and not needed since pixman got fixed. + * mi-dont-process-disabled.patch: This has been upstream for some time +now, drop it. -- Timo Aaltonen Wed, 03 Jun 2015 11:41:03 +0300 diff --git a/debian/patches/mi-dont-process-disabled.patch b/debian/patches/mi-dont-process-disabled.patch deleted file mode 100644 index 81691ee..000 --- a/debian/patches/mi-d
xorg-server: Changes to 'ubuntu'
debian/changelog | 17
debian/control | 21
debian/patches/xmir.patch| 8267 +++
debian/xmir.install |1
debian/xserver-xorg-xmir.install |1
5 files changed, 6810 insertions(+), 1497 deletions(-)
New commits:
commit 9b443b87d14e528732e090eb9611812e22cb60e7
Author: Timo Aaltonen
Date: Wed Jun 3 11:53:48 2015 +0300
xserver-xorg-xmir.install: Removed, not used anymore.
diff --git a/debian/changelog b/debian/changelog
index b1328e6..743d57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu5) UNRELEASED; urgency=medium
+
+ * xserver-xorg-xmir.install: Removed, not used anymore.
+
+ -- Timo Aaltonen Wed, 03 Jun 2015 11:41:03 +0300
+
xorg-server (2:1.17.1-0ubuntu4) wily; urgency=medium
* debian/control:
diff --git a/debian/xserver-xorg-xmir.install b/debian/xserver-xorg-xmir.install
deleted file mode 100644
index d710363..000
--- a/debian/xserver-xorg-xmir.install
+++ /dev/null
@@ -1 +0,0 @@
-main/usr/lib/xorg/modules/extensions/libxmir.so
usr/lib/xorg/modules/extensions
commit 1f9a32c290ba5744c6ec46c6afd0137a281ecbf7
Author: Timo Aaltonen
Date: Wed Jun 3 11:40:14 2015 +0300
import 1.17.1-0ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 66888c3..b1328e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.17.1-0ubuntu4) wily; urgency=medium
+
+ * debian/control:
+- Rename xserver-xorg-xmir to xmir
+- Build build-depends on libmirclient to 0.13.1
+ * debian/xmir.install:
+ * debian/patches/xmir.patch:
+- Use new XMir implementation
+
+ -- Robert Ancell Wed, 03 Jun 2015 14:21:10
+1200
+
xorg-server (2:1.17.1-0ubuntu3) vivid; urgency=medium
* Add a patch to fix vesa int10 failure. (LP: #1433198)
diff --git a/debian/control b/debian/control
index 1f23b0c..3fe7c76 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Build-Depends:
# xwayland
libwayland-dev [linux-any],
# XMir
- libmirclient-dev (>= 0.4.0) [!arm64 !powerpc !ppc64el],
+ libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el],
libatomic-ops-dev,
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
@@ -363,15 +363,24 @@ Recommends:
Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
-Package: xserver-xorg-xmir
+Package: xmir
Architecture: amd64 armhf i386
Depends:
${shlibs:Depends},
${misc:Depends},
- xserver-xorg-core (= ${binary:Version}),
-Description: Xorg - the X.Org X server (module for running nested in Mir)
- xserver-xorg-xmir provides an extension module to support running an
- Xorg as a client of an existing Mir compositor.
+Description: Xmir X server
+ This package provides an X server running on top of Mir, using Mir
+ input devices for input and forwarding either the root window or individual
+ top-level windows as wayland surfaces.
+
+Package: xserver-xorg-xmir
+Architecture: all
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ xmir,
+Description: Xmir X server (transitional package)
+ This is a transitional package to ease upgrades to xmir.
+ It can be safely removed.
Package: xorg-server-source
Architecture: all
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index eb90f59..ad40d3a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,299 +1,307 @@
+From da18c3b8c7bd4ce3a2a1210d425272cbded19246 Mon Sep 17 00:00:00 2001
+From: Robert Ancell
+Date: Fri, 15 May 2015 14:58:59 +1200
+Subject: [PATCH 4/5] Add XMir
+
+---
+ composite/compalloc.c |6 +
+ composite/compositeext.h|3 +
+ configure.ac| 25 +
+ glx/glxdri2.c | 16 +-
+ hw/Makefile.am |9 +-
+ hw/xmir/.gitignore |1 +
+ hw/xmir/Makefile.am | 61 ++
+ hw/xmir/dri2/Makefile.am| 14 +
+ hw/xmir/dri2/dri2.c | 1398 +++
+ hw/xmir/dri2/dri2.h | 364 +++
+ hw/xmir/dri2/dri2ext.c | 683 +
+ hw/xmir/dri2/dri2int.h | 26 +
+ hw/xmir/xmir-cursor.c | 214 +++
+ hw/xmir/xmir-cvt.c | 304 ++
+ hw/xmir/xmir-dri2.c | 473 +++
+ hw/xmir/xmir-glamor.c | 1229 +
+ hw/xmir/xmir-input.c| 539 +
+ hw/xmir/xmir-output.c | 454 ++
+ hw/xmir/xmir-thread-proxy.c | 132
+ hw/xmir/xmir.c | 1013 +++
+ hw/xmir/xmir.h | 211 +++
+ 21 files changed, 7167 insertions(+), 8 deletions(-)
+ create mode 100644 hw/xmir/.gitignore
+ create mode 100644 hw/xmir/Makefile.am
+ create mode 100644 hw/xmir/dri2/Makefile.am
+ create mode 100644 hw/xmir/dri2/dri2.c
+ create mode 100644 hw/xmir/dri
xorg-server: Changes to 'ubuntu'
debian/changelog |6 +
debian/patches/fix-int10.patch | 42 +
debian/patches/series |1
3 files changed, 49 insertions(+)
New commits:
commit 859326d78634517aa03e3a0427f5da2dc9fd3293
Author: Maarten Lankhorst
Date: Thu Mar 19 10:14:12 2015 +0100
Add a patch to fix vesa int10 failure. (LP: #1433198)
diff --git a/debian/changelog b/debian/changelog
index bfa06d9..66888c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu3) vivid; urgency=medium
+
+ * Add a patch to fix vesa int10 failure. (LP: #1433198)
+
+ -- Maarten Lankhorst Thu, 19 Mar 2015
10:13:08 +0100
+
xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
* Use conflicts/replaces on modesetting.
diff --git a/debian/patches/fix-int10.patch b/debian/patches/fix-int10.patch
new file mode 100644
index 000..5f7e5cd
--- /dev/null
+++ b/debian/patches/fix-int10.patch
@@ -0,0 +1,42 @@
+From: Jürg Billeter
+To: xorg-de...@lists.x.org
+Subject: [PATCH xserver] int10: Fix error check for pci_device_map_legacy
+Date: Sat, 7 Feb 2015 18:13:21 +0100
+Message-Id: <1423329201-32163-1-git-send-emai...@bitron.ch>
+List-Id: "X.Org development list"
+
+pci_device_map_legacy returns 0 on success.
+
+Signed-off-by: Jürg Billeter
+---
+ hw/xfree86/int10/generic.c| 2 +-
+ hw/xfree86/os-support/linux/int10/linux.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
+index 012d194..8d5c4da 100644
+--- a/hw/xfree86/int10/generic.c
b/hw/xfree86/int10/generic.c
+@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int
len)
+ {
+ void *map;
+
+-if (!pci_device_map_legacy(dev, 0, len, 0, &map))
++if (pci_device_map_legacy(dev, 0, len, 0, &map))
+ return FALSE;
+
+ memcpy(buf, map, len);
+diff --git a/hw/xfree86/os-support/linux/int10/linux.c
b/hw/xfree86/os-support/linux/int10/linux.c
+index 79b9a88..6ca118f 100644
+--- a/hw/xfree86/os-support/linux/int10/linux.c
b/hw/xfree86/os-support/linux/int10/linux.c
+@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int
base, int len)
+ {
+ void *map;
+
+-if (!pci_device_map_legacy(dev, base, len, 0, &map))
++if (pci_device_map_legacy(dev, base, len, 0, &map))
+ return FALSE;
+
+ memcpy(buf, map, len);
+-- 2.3.0
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 4b13dcc..771a1a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ no-nv.patch
# Probably is just papering over issue; needs further analysis
## upstream patches
+fix-int10.patch
# hybrid graphics fixes
228_autobind_gpu.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yzzrl-0008ij...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++
debian/control |4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 36e347779852ff821bb372d578ca02c09d2e5026
Author: Maarten Lankhorst
Date: Mon Mar 16 15:55:52 2015 +0100
Use conflicts/replaces on modesetting.
Irony, as of this writing I will have to add a new
xserver-xorg-video-modesetting and undo this commit.
diff --git a/debian/changelog b/debian/changelog
index 071545d..bfa06d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
+
+ * Use conflicts/replaces on modesetting.
+
+ -- Maarten Lankhorst Thu, 12 Mar 2015
16:56:38 +0100
+
xorg-server (2:1.17.1-0ubuntu1) vivid; urgency=medium
* Merge with 1.17 branch.
diff --git a/debian/control b/debian/control
index 908135f..1f23b0c 100644
--- a/debian/control
+++ b/debian/control
@@ -143,10 +143,10 @@ Breaks:
xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
- xserver-xorg-video-modesetting (<< 0.10),
Replaces:
- xserver-xorg-video-modesetting (<< 0.10),
+ xserver-xorg-video-modesetting,
Conflicts:
+ xserver-xorg-video-modesetting,
xserver-xorg-input-evtouch,
Provides:
${videoabi},
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yxwrq-0004je...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
COPYING | 24 ChangeLog| 8995 +-- Xext/dpms.c | 10 Xext/dpmsstubs.c | 10 Xext/panoramiX.c |2 Xext/panoramiX.h |2 Xext/panoramiXprocs.c| 16 Xext/saver.c | 16 Xext/security.c |5 Xext/shm.c |6 Xext/sync.c |2 Xext/syncsrv.h |8 Xext/xres.c | 12 Xext/xvdisp.c| 106 Xext/xvdix.h | 45 Xext/xvmain.c| 164 Xi/exevents.c|5 composite/compalloc.c|8 composite/compext.c |7 composite/compinit.c | 25 composite/compint.h |3 composite/compoverlay.c |4 composite/compwindow.c |7 config/config.c | 161 config/udev.c| 47 configure.ac | 117 dbe/dbe.c| 16 dbe/dbestruct.h | 12 dbe/midbe.c | 14 dbe/midbe.h |8 debian/changelog | 35 debian/control | 14 debian/patches/09_Xserver-man-iglx.diff | 16 debian/patches/config-add-no-removal.patch | 13 debian/patches/drm_device_keep_trying.patch | 30 debian/patches/ppc64el-endian-fix.patch | 34 debian/patches/series|4 debian/patches/xmir.patch| 63 debian/serverminver |4 debian/xserver-xorg-core.install |2 devbook.am | 10 dix/atom.c |8 dix/colormap.c | 34 dix/cursor.c |8 dix/devices.c| 61 dix/dispatch.c | 74 dix/dispatch.h |2 dix/dixfonts.c |6 dix/dixutils.c | 12 dix/extension.c | 10 dix/gc.c | 25 dix/getevents.c | 28 dix/globals.c|8 dix/glyphcurs.c |8 dix/grabs.c | 16 dix/inpututils.c |2 dix/main.c | 10 dix/pixmap.c | 18 dix/property.c |8 dix/protocol.txt | 30 dix/region.c | 22 dix/registry.c | 94 dix/resource.c | 18 dix/selection.c | 10 dix/swaprep.c|8 dix/swapreq.c|8 dix/tables.c |8 dix/window.c | 111 doc/Makefile.am |2 doc/Xserver-spec.xml |6 doc/filter-xmlto.sh | 21 dri3/dri3.c | 10 dri3/dri3.h |2 exa/exa.c|2 exa/exa.h|8 exa/exa_accel.c | 20 exa/exa_glyphs.c |8 exa/exa_priv.h | 19 exa/exa_render.c |4 exa/exa_unaccel.c| 11 fb/Makefile.am |2 fb/fb.h | 342 fb/fb24_32.c |2 fb/fb24_32.h |2 fb/fbbits.c | 12 fb/fbblt.c
xorg-server: Changes to 'ubuntu+1'
debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4ffaa00df4f7a4356aa56f405352bceac747d946 Author: Maarten Lankhorst Date: Mon Mar 9 11:34:07 2015 +0100 Set a version for replacing modesetting, fixing some lintian warnings. diff --git a/debian/control b/debian/control index 71b16cc..908135f 100644 --- a/debian/control +++ b/debian/control @@ -143,9 +143,9 @@ Breaks: xserver-xorg-video-vga (<= 1:4.1.0-8), libgl1-mesa-dri (<< 7.10.2-4), libgl1-mesa-dri-experimental (<< 7.10.2-4), - xserver-xorg-video-modesetting, + xserver-xorg-video-modesetting (<< 0.10), Replaces: - xserver-xorg-video-modesetting, + xserver-xorg-video-modesetting (<< 0.10), Conflicts: xserver-xorg-input-evtouch, Provides: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yw1gn-0006gf...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu+1'
ChangeLog| 2126 +++ Xi/exevents.c|5 config/udev.c| 30 configure.ac |8 debian/changelog | 18 devbook.am | 10 dix/dispatch.c |2 dix/getevents.c |6 doc/Makefile.am |2 doc/filter-xmlto.sh | 21 glamor/glamor.c | 41 glamor/glamor.h |2 glamor/glamor_egl.c | 12 glamor/glamor_fbo.c |4 glamor/glamor_priv.h |2 glamor/glamor_xv.c | 26 glx/glxcmds.c| 71 hw/kdrive/ephyr/ephyr.c | 10 hw/kdrive/ephyr/ephyr.h |1 hw/kdrive/ephyr/hostx.c | 11 hw/kdrive/ephyr/hostx.h |2 hw/xfree86/Makefile.am |2 hw/xfree86/Xorg.sh.in|4 hw/xfree86/common/xf86AutoConfig.c |1 hw/xfree86/dri2/dri2.c |9 hw/xfree86/drivers/modesetting/Makefile.am |3 hw/xfree86/drivers/modesetting/dri2.c|2 hw/xfree86/drivers/modesetting/driver.c | 94 - hw/xfree86/drivers/modesetting/driver.h | 14 hw/xfree86/drivers/modesetting/drmmode_display.c | 491 +++-- hw/xfree86/drivers/modesetting/drmmode_display.h | 32 hw/xfree86/drivers/modesetting/dumb_bo.c | 134 + hw/xfree86/drivers/modesetting/dumb_bo.h | 45 hw/xfree86/drivers/modesetting/present.c | 228 ++ hw/xfree86/drivers/modesetting/vblank.c | 37 hw/xfree86/man/Xorg.wrap.man |2 hw/xfree86/os-support/solaris/sun_init.c | 33 hw/xfree86/os-support/xf86_OSlib.h |5 hw/xfree86/xorg-wrapper.c| 10 hw/xnest/Keyboard.c |9 hw/xwayland/Makefile.am |1 hw/xwayland/xwayland-glamor.c|3 hw/xwayland/xwayland-input.c |7 hw/xwayland/xwayland.c |2 include/regionstr.h |2 mi/mipointer.c |4 os/WaitFor.c | 41 os/osinit.c |6 os/xsha1.c | 25 present/present.c| 15 randr/rroutput.c |7 randr/rrscreen.c | 22 randr/rrxinerama.c | 12 xkb/xkb.c| 100 - 54 files changed, 2261 insertions(+), 1551 deletions(-) New commits: commit 844389319f72ed964479b09c353b2f8f73a9dde8 Author: Maarten Lankhorst Date: Wed Feb 11 11:17:51 2015 +0100 bump version to 1.17.1 diff --git a/ChangeLog b/ChangeLog index e613918..3983221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,739 +1,1240 @@ -commit 27017380f96d7cec79ce8d618ea0ec389fa716a9 -Merge: 91651e7 9b037af -Author: Maarten Lankhorst -Date: Thu Dec 11 15:47:29 2014 +0100 +commit 3b0d1ba2266d2780bfc111bab74885b90458eca4 +Author: Keith Packard +Date: Tue Feb 10 14:43:34 2015 -0800 -Merge branch 'upstream-unstable' into upstream-experimental +Release 1.17.1 + +Signed-off-by: Keith Packard -commit 91651e7c15892aa846fc406fbb13b37f094dd3f0 -Author: Michel Dänzer -Date: Wed Dec 10 16:21:44 2014 +0900 +commit f160e722672dbb2b5215870b47bcc51461d96ff1 +Author: Olivier Fourdan +Date: Fri Jan 16 08:44:45 2015 +0100 -glamor: Reinstate glamor_(egl_)destroy_textured_pixmap +xkb: Check strings length against request size -They are part of the ABI. +Ensure that the given strings length in an XkbSetGeometry request remain +within the limits of the size of the request. -Signed-off-by: Michel Dänzer -Reviewed-by: Keith Packard -Signed-off-by: Keith Packard +Signed-off-by: Olivier Fourdan +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43) -commit c1455f76c6b1aa4ecaacb2221a687244285aa44b -Author: Neil Roberts -Date: Mon Dec 1 16:06:17 2014 -0500 +commit 29be310c303914090298ddda93a5bd5d00a94945 +Author: Olivier Fourdan +Date: Fri Jan 16 20:08:59 2015 +0100 -glx: Add implementation of __GLXContext->loseCurrent for direct ctxts +xkb: Don't
xorg-server: Changes to 'ubuntu+1'
debian/changelog |6 ++ debian/patches/xmir.patch | 11 --- 2 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 489dc081ec8b76fd29d288a4b5527224b44ee1a9 Author: Maarten Lankhorst Date: Mon Dec 15 16:45:00 2014 +0100 Fix FTBFS caused by the previous patch. diff --git a/debian/changelog b/debian/changelog index 908b4a9..e6615e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium + + * Fix FTBFS caused by the previous patch. + + -- Maarten Lankhorst Mon, 15 Dec 2014 16:11:00 +0100 + xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium * Fix FTBFS with the bool redefinition by undef'ing it after including mir. diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index 23a620a..538c58b 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -980,7 +980,7 @@ +} --- /dev/null +++ b/hw/xfree86/xmir/xmir-private.h -@@ -0,0 +1,106 @@ +@@ -0,0 +1,105 @@ +/* + * Copyright © 2012 Canonical, Inc + * @@ -1016,7 +1016,6 @@ +#ifndef _XMIR_PRIVATE_H +#define _XMIR_PRIVATE_H + -+#include +#include "xmir.h" +#include "xf86str.h" +#include "list.h" @@ -1828,7 +1827,7 @@ +} --- /dev/null +++ b/hw/xfree86/xmir/xmir.h -@@ -0,0 +1,106 @@ +@@ -0,0 +1,104 @@ +/* + * Copyright © 2012 Canonical, Inc + * @@ -1865,15 +1864,13 @@ +#define _XMIR_H + +#include -+#include -+ -+/* Fix because the library defines one of its members as having the name bool */ -+#undef bool + +#include "xf86str.h" +#include "scrnintstr.h" +#include "window.h" + ++#include ++ +typedef struct xmir_screen xmir_screen; +typedef struct xmir_window xmir_window; + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1y0xpt-8t...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ debian/patches/xmir.patch | 11 --- 2 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 489dc081ec8b76fd29d288a4b5527224b44ee1a9 Author: Maarten Lankhorst Date: Mon Dec 15 16:45:00 2014 +0100 Fix FTBFS caused by the previous patch. diff --git a/debian/changelog b/debian/changelog index 908b4a9..e6615e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium + + * Fix FTBFS caused by the previous patch. + + -- Maarten Lankhorst Mon, 15 Dec 2014 16:11:00 +0100 + xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium * Fix FTBFS with the bool redefinition by undef'ing it after including mir. diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index 23a620a..538c58b 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -980,7 +980,7 @@ +} --- /dev/null +++ b/hw/xfree86/xmir/xmir-private.h -@@ -0,0 +1,106 @@ +@@ -0,0 +1,105 @@ +/* + * Copyright © 2012 Canonical, Inc + * @@ -1016,7 +1016,6 @@ +#ifndef _XMIR_PRIVATE_H +#define _XMIR_PRIVATE_H + -+#include +#include "xmir.h" +#include "xf86str.h" +#include "list.h" @@ -1828,7 +1827,7 @@ +} --- /dev/null +++ b/hw/xfree86/xmir/xmir.h -@@ -0,0 +1,106 @@ +@@ -0,0 +1,104 @@ +/* + * Copyright © 2012 Canonical, Inc + * @@ -1865,15 +1864,13 @@ +#define _XMIR_H + +#include -+#include -+ -+/* Fix because the library defines one of its members as having the name bool */ -+#undef bool + +#include "xf86str.h" +#include "scrnintstr.h" +#include "window.h" + ++#include ++ +typedef struct xmir_screen xmir_screen; +typedef struct xmir_window xmir_window; + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1y0xpy-0008uo...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu+1'
debian/changelog |6 ++
debian/patches/xmir.patch |7 +--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit cd25c81aad4ea3532ecbe0ae78730d5235616fad
Author: Maarten Lankhorst
Date: Mon Dec 15 12:40:23 2014 +0100
refresh ftbfs in xmir patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index a45c76a..652fb51 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -78,7 +78,7 @@
+
if (xf86configptr->conf_modules) {
/* Walk the disable list and let people know what we've parsed to
- * not be loaded
+ * not be loaded
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -613,6 +613,10 @@
@@ -1819,7 +1819,7 @@
+}
--- /dev/null
+++ b/hw/xfree86/xmir/xmir.h
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -1858,6 +1858,9 @@
+#include
+#include
+
++/* Fix because the library defines one of its members as having the name bool
*/
++#undef bool
++
+#include "xf86str.h"
+#include "scrnintstr.h"
+#include "window.h"
commit 7e83b9b581d0b84479c1954f2defd380279d4d1f
Author: Maarten Lankhorst
Date: Sat Dec 13 14:18:05 2014 +0100
Fix FTBFS with the bool redefinition by undef'ing it after including mir.
diff --git a/debian/changelog b/debian/changelog
index 5287cff..908b4a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
+
+ * Fix FTBFS with the bool redefinition by undef'ing it after including mir.
+
+ -- Maarten Lankhorst Sat, 13 Dec 2014
14:13:17 +0100
+
xorg-server (2:1.16.2.901-1ubuntu1) vivid; urgency=medium
* Merge from released debian-unstable.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f60216f..23a620a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,8 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index e5387bf..ec171d9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -627,6 +627,7 @@ AC_ARG_ENABLE(linux_acpi,
AS_HELP_STRING([--disable-linux-acpi], [Disable buildi
+@@ -632,6 +632,7 @@
AC_ARG_ENABLE(linux_apm, AS_HELP_STRING([--disable-linux-apm], [Disable
building APM support on Linux (if available).]), [enable_linux_apm=$enableval],
[enable_linux_apm=yes])
AC_ARG_ENABLE(systemd-logind, AS_HELP_STRING([--enable-systemd-logind],
[Build systemd-logind support (default: auto)]), [SYSTEMD_LOGIND=$enableval],
[SYSTEMD_LOGIND=auto])
AC_ARG_ENABLE(suid-wrapper, AS_HELP_STRING([--enable-suid-wrapper], [Build
suid-root wrapper for legacy driver support on rootless xserver systems
(default: no)]), [SUID_WRAPPER=$enableval], [SUID_WRAPPER=no])
@@ -10,7 +8,7 @@ index e5387bf..ec171d9 100644
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build
Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -1348,6 +1349,15 @@ if test "x$XINERAMA" = xyes; then
+@@ -1368,6 +1369,15 @@
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
fi
@@ -20,13 +18,13 @@ index e5387bf..ec171d9 100644
+AC_SUBST([XMIR_CFLAGS])
+AC_DEFINE(XMIR, 1, [Support wayland mode])
+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES mirclient"
-+fi
++fi
+AM_CONDITIONAL(XMIR, [test "x$XMIR" = xyes])
+
AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
if test "x$XACE" = xyes; then
AC_DEFINE(XACE, 1, [Build X-ACE extension])
-@@ -2573,6 +2583,7 @@ hw/xfree86/utils/Makefile
+@@ -2598,6 +2608,7 @@
hw/xfree86/utils/man/Makefile
hw/xfree86/utils/cvt/Makefile
hw/xfree86/utils/gtf/Makefile
@@ -34,11 +32,9 @@ index e5387bf..ec171d9 100644
hw/dmx/config/Makefile
hw/dmx/config/man/Makefile
hw/dmx/doc/Makefile
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c5992c3..c9a077f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
-@@ -34,16 +34,20 @@ if INT10MODULE
+@@ -34,16 +34,20 @@
INT10_SUBDIR = int10
endif
@@ -61,11 +57,9 @@ index c5992c3..c9a077f 100644
bin_PROGRAMS = Xorg
nodist_Xorg_SOURCES = sdksyms.c
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2adef44..f8c3a7e 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
-@@ -118,6 +118,7 @@ static ModuleDefault ModuleDefaults[] = {
+@@ -118,6 +118,7 @@
{.name = "fb",.toLoad = TRUE,.load_opt = NULL},
{.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
#endif
@@ -73,7 +67,7 @@ index 2adef44..f8c3a7e 100644
{.name = NULL,.toLoad = FALSE,.load_opt = NULL}
};
-@@ -272,6 +273,17 @@ xf86ModulelistFromConfig(void ***optlist)
+@@ -272,6 +273,17 @@
return NULL;
}
@@ -91,11 +85,9 @@ index 2adef44..f8c3a7e 100644
if (xf86configptr->conf_modules) {
/* Walk the disable list and let people know what we've parsed to
* not be loaded
-diff --git a/hw/xfree86/c
xorg-server: Changes to 'ubuntu+1'
ChangeLog | 8599 - Xext/dpms.c| 10 Xext/dpmsstubs.c | 10 Xext/panoramiX.c |2 Xext/panoramiX.h |2 Xext/panoramiXprocs.c |4 Xext/security.c|4 Xext/shm.c |6 Xext/sync.c|2 Xext/syncsrv.h |8 Xext/xcmisc.c |1 Xext/xres.c| 12 Xext/xvdisp.c | 28 Xext/xvdix.h | 14 Xext/xvmain.c | 18 Xi/chgdctl.c |8 Xi/chgfctl.c |2 Xi/sendexev.c |3 Xi/xiallowev.c |2 Xi/xichangecursor.c|2 Xi/xichangehierarchy.c | 35 Xi/xigetclientpointer.c|1 Xi/xigrabdev.c |9 Xi/xipassivegrab.c | 12 Xi/xiproperty.c| 14 Xi/xiquerydevice.c |1 Xi/xiquerypointer.c|2 Xi/xiselectev.c|8 Xi/xisetclientpointer.c|3 Xi/xisetdevfocus.c |4 Xi/xiwarppointer.c |2 composite/compalloc.c |8 composite/compext.c|4 composite/compinit.c |2 composite/compint.h|2 composite/compoverlay.c|4 config/udev.c |7 configure.ac |1 dbe/dbe.c | 33 dbe/dbestruct.h| 12 dbe/midbe.c| 14 dbe/midbe.h|8 debian/changelog | 61 debian/control |8 debian/patches/disable-rotation-transform-gpuscreens.patch | 35 debian/serverminver|2 dix/atom.c |8 dix/colormap.c | 34 dix/cursor.c |8 dix/devices.c |2 dix/dispatch.c | 19 dix/dispatch.h |2 dix/dixfonts.c |6 dix/dixutils.c | 12 dix/extension.c|8 dix/gc.c | 22 dix/globals.c |8 dix/glyphcurs.c|8 dix/grabs.c| 16 dix/inpututils.c |2 dix/main.c |8 dix/property.c |8 dix/region.c | 42 dix/resource.c | 16 dix/selection.c| 10 dix/swaprep.c |8 dix/swapreq.c |8 dix/tables.c |8 dix/window.c | 38 dri3/dri3_request.c|6 exa/exa.c |2 exa/exa.h |8 exa/exa_glyphs.c |8 exa/exa_render.c
xorg-server: Changes to 'ubuntu'
ChangeLog | 781 ++ Xext/xcmisc.c | 1 Xext/xvdisp.c | 20 Xi/chgdctl.c| 8 Xi/chgfctl.c| 2 Xi/sendexev.c | 3 Xi/xiallowev.c | 2 Xi/xichangecursor.c | 2 Xi/xichangehierarchy.c | 35 Xi/xigetclientpointer.c | 1 Xi/xigrabdev.c | 9 Xi/xipassivegrab.c | 12 Xi/xiproperty.c | 14 Xi/xiquerydevice.c | 1 Xi/xiquerypointer.c | 2 Xi/xiselectev.c | 8 Xi/xisetclientpointer.c | 3 Xi/xisetdevfocus.c | 4 Xi/xiwarppointer.c | 2 configure.ac| 5 dbe/dbe.c | 17 debian/changelog| 32 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff | 68 debian/patches/09_Xserver-man-iglx.diff | 16 debian/patches/series | 2 debian/patches/xmir.patch | 136 - dix/dispatch.c | 3 dix/region.c| 20 dri3/dri3_request.c | 6 fb/fbseg.c | 20 glx/clientinfo.c| 20 glx/glxcmds.c | 85 - glx/glxcmdsswap.c | 4 glx/glxserver.h | 43 glx/indirect_dispatch.c | 25 glx/indirect_dispatch_swap.c| 26 glx/indirect_program.c | 2 glx/indirect_reqsize.c | 142 - glx/indirect_reqsize.h | 181 +- glx/indirect_texture_compression.c | 4 glx/indirect_util.c | 9 glx/rensize.c | 114 - glx/single2.c | 23 glx/single2swap.c | 19 glx/singlepix.c | 60 glx/singlepixswap.c | 50 glx/swap_interval.c | 2 glx/unpack.h| 3 hw/xfree86/dri2/dri2ext.c | 3 include/dix.h | 7 include/regionstr.h | 10 man/Xserver.man | 10 os/access.c | 6 os/rpcauth.c| 4 present/present.c | 18 present/present_request.c | 6 randr/rrsdispatch.c | 4 render/render.c |
xorg-server: Changes to 'ubuntu-trusty'
debian/changelog | 30 +- 1 file changed, 9 insertions(+), 21 deletions(-) New commits: commit a8fc994e6404adcff27743a0277c8098c253f9af Author: Maarten Lankhorst Date: Wed Dec 10 10:43:43 2014 +0100 merge security update that superceeded the version in -proposed diff --git a/debian/changelog b/debian/changelog index 1c184d2..2d85b47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,4 @@ -xorg-server (2:1.15.1-0ubuntu2.3) trusty-proposed; urgency=medium - - * Actually fix the cirrus VGA corruption in gnome-terminal. -- fb-24-depth.patch (LP: #1318119) - - -- Maarten Lankhorst Wed, 05 Nov 2014 15:24:09 +0100 - -xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium +xorg-server (2:1.15.1-0ubuntu2.6) trusty-proposed; urgency=medium [ Laércio de Sousa ] * Backport support for logind-based multiseat back to trusty. (LP: #1209008) @@ -14,9 +7,42 @@ xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium * Re-enable support for rotation and transforms on gpu-screens with support. - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620) * Fix black screen when using qemu with cirrus vga. +- fb-24-depth.patch (LP: #1318119) -- Maarten Lankhorst Mon, 03 Nov 2014 12:36:32 +0100 +xorg-server (2:1.15.1-0ubuntu2.5) trusty-security; urgency=medium + + * SECURITY UPDATE: Dec 2014 security issues - additional fixes +- debian/patches/CVE-2014-8xxx/003[4567]*.patch: add additional + fixes not included in original pre-advisory bundle. + + -- Marc Deslauriers Tue, 09 Dec 2014 17:12:42 -0500 + +xorg-server (2:1.15.1-0ubuntu2.4) trusty-security; urgency=medium + + * SECURITY UPDATE: Dec 2014 protocol handling security issues +- debian/patches/CVE-2014-8xxx/*.patch: patches from upstream to fix + a multitude of security issues, including a couple of pre-requisite + fixes from git. +- CVE-2014-8091 +- CVE-2014-8092 +- CVE-2014-8093 +- CVE-2014-8094 +- CVE-2014-8095 +- CVE-2014-8096 +- CVE-2014-8097 +- CVE-2014-8098 +- CVE-2014-8099 +- CVE-2014-8100 +- CVE-2014-8101 +- CVE-2014-8102 +- CVE-2014-8103 + * This package does _not_ contain the changes from 2:1.15.1-0ubuntu2.3 +in trusty-proposed. + + -- Marc Deslauriers Mon, 08 Dec 2014 15:42:08 -0500 + xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium * Copy utopic package back to trusty. diff --git a/debian/patches/CVE-2014-8xxx/-glx-check-return.patch b/debian/patches/CVE-2014-8xxx/-glx-check-return.patch new file mode 100644 index 000..a652174 --- /dev/null +++ b/debian/patches/CVE-2014-8xxx/-glx-check-return.patch @@ -0,0 +1,184 @@ +From 61a292adf45405641de1c522a04c148e0a152acd Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Thu, 9 Oct 2014 15:17:17 +0200 +Subject: glx: check return from __glXGetAnswerBuffer + +This function can return NULL; make sure every caller tests for that. + +Reviewed-by: Adam Jackson +Signed-off-by: Keith Packard + +diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c +index 329b2e6..f6cabef 100644 +--- a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c +@@ -2464,6 +2464,9 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc) + GLboolean answerBuffer[200]; + GLboolean *residences = + __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1); ++ ++if (residences == NULL) ++return BadAlloc; + retval = + glAreTexturesResident(n, (const GLuint *) (pc + 4), residences); + __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval); +@@ -2488,6 +2491,9 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc) + GLboolean answerBuffer[200]; + GLboolean *residences = + __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1); ++ ++if (residences == NULL) ++return BadAlloc; + retval = + glAreTexturesResident(n, (const GLuint *) (pc + 4), residences); + __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval); +@@ -2593,6 +2599,9 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc) + GLuint *textures = + __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), + 4); ++ ++if (textures == NULL) ++return BadAlloc; + glGenTextures(n, textures); + __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0); + error = Success; +@@ -2616,6 +2625,9 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc) + GLuint *textures = + __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), + 4); ++ ++if (textures == NULL) ++return BadAlloc; + glGenTextures(n, textures); + __glXSe
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++
debian/patches/disable-rotation-transform-gpuscreens.patch | 35 -
2 files changed, 19 insertions(+), 22 deletions(-)
New commits:
commit 1d9ce2ec7aa829ba3d262a326f4c60bd998d35cf
Author: Maarten Lankhorst
Date: Thu Nov 6 12:20:14 2014 +0100
Re-enable rotation in optimus mode with SNA. (LP: #1386620)
diff --git a/debian/changelog b/debian/changelog
index b254535..f089574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.1.901-1ubuntu2) vivid; urgency=medium
+
+ * Re-enable rotation in optimus mode with SNA. (LP: #1386620)
+
+ -- Maarten Lankhorst Thu, 06 Nov 2014
12:19:07 +0100
+
xorg-server (2:1.16.1.901-1ubuntu1) vivid; urgency=medium
* Merge from released debian-unstable.
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch
b/debian/patches/disable-rotation-transform-gpuscreens.patch
index 9da6c65..9f95572 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -1,22 +1,13 @@
a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -932,6 +932,9 @@
- if (xf86RandR12Key == NULL)
- return;
-
-+if (pScreen->isGPU)
-+rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -954,6 +957,9 @@
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
-
-+if (pScreen->isGPU)
-+transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
-
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index a441fd1..9147a26 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
b/hw/xfree86/modes/xf86Crtc.c
+@@ -778,7 +778,7 @@ xf86CrtcScreenInit(ScreenPtr screen)
+ if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
+ break;
+ }
+-if (c == config->num_crtc) {
++if (c == config->num_crtc && !screen->isGPU) {
+ xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
+ RR_Rotate_180 | RR_Rotate_270 |
+ RR_Reflect_X | RR_Reflect_Y);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xyzar-0004r5...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu-trusty'
debian/changelog | 38 debian/patches/CVE-2014-8xxx/-glx-check-return.patch | 184 ++ debian/patches/CVE-2014-8xxx/-regionsize-size_t.patch | 31 debian/patches/CVE-2014-8xxx/0001-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch | 40 debian/patches/CVE-2014-8xxx/0002-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch | 34 debian/patches/CVE-2014-8xxx/0003-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch | 47 debian/patches/CVE-2014-8xxx/0004-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch | 125 + debian/patches/CVE-2014-8xxx/0005-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch | 34 debian/patches/CVE-2014-8xxx/0006-dri2-integer-overflow-in-ProcDRI2GetBuffers-CVE-2014.patch | 35 debian/patches/CVE-2014-8xxx/0007-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch | 73 debian/patches/CVE-2014-8xxx/0008-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch | 551 ++ debian/patches/CVE-2014-8xxx/0009-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch | 27 debian/patches/CVE-2014-8xxx/0010-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch | 176 + debian/patches/CVE-2014-8xxx/0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch | 64 debian/patches/CVE-2014-8xxx/0012-present-unvalidated-lengths-in-Present-extension-pro.patch | 68 debian/patches/CVE-2014-8xxx/0013-randr-unvalidated-lengths-in-RandR-extension-swapped.patch | 51 debian/patches/CVE-2014-8xxx/0014-render-check-request-size-before-reading-it-CVE-2014.patch | 36 debian/patches/CVE-2014-8xxx/0015-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch | 140 + debian/patches/CVE-2014-8xxx/0016-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch | 27 debian/patches/CVE-2014-8xxx/0017-Add-request-length-checking-test-cases-for-some-Xinp.patch | 195 ++ debian/patches/CVE-2014-8xxx/0018-Add-request-length-checking-test-cases-for-some-Xinp.patch | 86 debian/patches/CVE-2014-8xxx/0019-Add-REQUEST_FIXED_SIZE-testcases-to-test-misc.c.patch | 74 debian/patches/CVE-2014-8xxx/0020-glx-Be-more-paranoid-about-variable-length-requests-.patch | 44 debian/patches/CVE-2014-8xxx/0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch | 165 + debian/patches/CVE-2014-8xxx/0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch | 59 debian/patches/CVE-2014-8xxx/0023-glx-Fix-image-size-computation-for-EXT_texture_integ.patch | 59 debian/patches/CVE-2014-8xxx/0024-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6.patch | 79 debian/patches/CVE-2014-8xxx/0025-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch | 72 debian/patches/CVE-2014-8xxx/0026-glx-Integer-overflow-protection-for-non-generated-re.patch | 225 ++ debian/patches/CVE-2014-8xxx/0027-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch | 155 + debian/patches/CVE-2014-8xxx/0028-glx-Top-level-length-checking-for-swapped-VendorPriv.patch | 51 debian/patches/CVE-2014-8xxx/0029-glx-Request-length-checks-for-SetClientInfoARB-CVE-2.patch | 74 debian/patches/CVE-2014-8xxx/0030-glx-Length-checking-for-non-generated-vendor-private.patch | 45 debian/patches/CVE-2014-8xxx/0031-glx-Length-checking-for-non-generated-single-request.patch | 561 ++ debian/patches/CVE-2014-8xxx/0032-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch | 913 ++ debian/patches/CVE-2014-8xxx/0033-glx-Fix-mask-truncation-in-__glXGetAnswerBuffer-CVE-.patch | 34 debian/patches/CVE-2014-8xxx/0034-CVE-2014-8097-additional.patch | 47 debian/patches/CVE-2014-8xxx/0035-CVE-2014-8098-additional.patch | 36 debian/patches/CVE-2014-8xxx/0036-CVE-2014-8092-additional.patch | 28 debian/patches/CVE-2014-8xxx/0037-CVE-2014-8092-additional-2.patch | 29 debian/patches/series | 41 41 files changed, 4853 insertions(+) New commits: commit 72ff20cdc71762bc9da451b6a999ef4a64238a8e Author: Timo Aaltonen Date: Wed Dec 10 19:10:24 2014 +0200 release to trusty-proposed diff --git a/debian/changelog b/debian/changelog index 5c0d482..74075e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.15.1-0ubuntu2.6) trusty-proposed; urgency=medium + + * Re-apply changes between -0u2.1..-0u2.3. + + -- Timo Aaltonen Wed, 10 Dec 2014 19:06:02 +0200 + xorg-server (2:1.15.1-0ubuntu2.5) trusty-security; urgency=medium * SECURITY UPDATE: Dec 2014 security issues - additional fixes commit 9ddbe364768127f584e991592eda9b2d072f62a7 Author: Timo Aalto
xorg-server: Changes to 'ubuntu+1'
debian/serverminver|2 +-
hw/xfree86/common/xf86Module.h |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c45db25e326a98cc89b803a887bc2fbdca73b677
Author: Maarten Lankhorst
Date: Thu Nov 6 10:48:42 2014 +0100
unbump input
diff --git a/debian/serverminver b/debian/serverminver
index 66cac6b..02899bc 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
2:1.16.99.903
ABI_VIDEODRV_VERSION:19.0
-ABI_XINPUT_VERSION:22.0
+ABI_XINPUT_VERSION:21.0
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 25a8869..e68fe9c 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -81,7 +81,7 @@ typedef enum {
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(22, 0)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xmjgn-0001jv...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu-trusty'
debian/changelog |9 -
debian/patches/fb-24-depth.patch | 35 +++
debian/patches/series|1 +
3 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit a8f92746c78660408d6860a07bd6279d7b6fe3ad
Author: Maarten Lankhorst
Date: Wed Nov 5 15:25:01 2014 +0100
Actually fix the cirrus VGA corruption in gnome-terminal.
fb-24-depth.patch (LP: #1318119)
diff --git a/debian/changelog b/debian/changelog
index fcfb9be..1c184d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu2.3) trusty-proposed; urgency=medium
+
+ * Actually fix the cirrus VGA corruption in gnome-terminal.
+- fb-24-depth.patch (LP: #1318119)
+
+ -- Maarten Lankhorst Wed, 05 Nov 2014
15:24:09 +0100
+
xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium
[ Laércio de Sousa ]
@@ -6,7 +13,7 @@ xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
* Re-enable support for rotation and transforms on gpu-screens with support.
- Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
- * Fix black screen when using qemu with cirrus vga. (LP: #1386620)
+ * Fix black screen when using qemu with cirrus vga.
-- Maarten Lankhorst Mon, 03 Nov 2014
12:36:32 +0100
diff --git a/debian/patches/fb-24-depth.patch b/debian/patches/fb-24-depth.patch
new file mode 100644
index 000..bdbd4c7
--- /dev/null
+++ b/debian/patches/fb-24-depth.patch
@@ -0,0 +1,35 @@
+commit fe5018e0564118a7a8198fa286186fdb9ed818c7
+Author: Takashi Iwai
+Date: Tue Aug 19 15:57:22 2014 -0500
+
+fb: Fix invalid bpp for 24bit depth window
+
+We have a hack in fb layer for a 24bpp screen to use 32bpp images, and
+fbCreateWindow() replaces its drawable.bitsPerPixel field
+appropriately. But, the problem is that it always replaces when 32bpp
+is passed. If the depth is 32, this results in bpp < depth, which is
+actually invalid.
+
+Meanwhile, fbCreatePixmap() has a more check and it creates with 24bpp
+only when the passed depth <= 24 for avoiding such a problem.
+
+This oneliner patch just adds the similar check in fbCreateWindow().
+This (hopefully) fixes the long-standing broken graphics mess of
+cirrus KMS with 24bpp.
+
+Signed-off-by: Takashi Iwai
+Reviewed-by: Keith Packard
+
+diff --git a/fb/fbwindow.c b/fb/fbwindow.c
+index 368c4b8..c90175f 100644
+--- a/fb/fbwindow.c
b/fb/fbwindow.c
+@@ -33,7 +33,7 @@ fbCreateWindow(WindowPtr pWin)
+ {
+ dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin),
+ fbGetScreenPixmap(pWin->drawable.pScreen));
+-if (pWin->drawable.bitsPerPixel == 32)
++if (pWin->drawable.bitsPerPixel == 32 && pWin->drawable.depth <= 24)
+ pWin->drawable.bitsPerPixel =
+ fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
+ return TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index a378325..7041da3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,3 +61,4 @@ xfree86_keep_non_seat0_from_touching_vts.patch
xfree86_add_matchseat_key_to_xorg_conf.patch
xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
rotation-slaved-crtc-bounds.patch
+fb-24-depth.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xm1gr-0001ol...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu+1'
COPYING | 24 ChangeLog | 270 + Xext/panoramiXprocs.c | 12 Xext/saver.c| 16 Xext/security.c | 1 Xext/shm.c | 15 Xext/xvdisp.c | 98 Xext/xvdix.h| 31 Xext/xvmain.c | 146 composite/compext.c | 3 composite/compinit.c| 23 composite/compint.h | 1 composite/compwindow.c | 7 config/config.c | 161 config/udev.c | 10 configure.ac| 115 debian/changelog| 56 debian/control | 17 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff | 68 debian/patches/111_armel-drv-fallbacks.patch| 27 debian/patches/228_autobind_gpu.patch | 29 debian/patches/config-add-no-removal.patch | 13 debian/patches/drm_device_keep_trying.patch | 30 debian/patches/ppc64el-endian-fix.patch | 34 debian/patches/series | 5 debian/patches/xf86-fixup-detection.patch | 79 debian/patches/xmir.patch | 162 debian/rules| 14 debian/serverminver | 6 debian/upstream/signing-key.asc | 64 debian/xserver-xorg-core.install| 2 dix/devices.c | 61 dix/dispatch.c | 56 dix/extension.c | 2 dix/gc.c| 3 dix/getevents.c | 22 dix/main.c | 2 dix/pixmap.c| 18 dix/protocol.txt| 30 dix/registry.c | 94 dix/resource.c | 2 dix/window.c| 73 doc/Xserver-spec.xml| 6 dri3/dri3.c | 10 dri3/dri3.h | 2 exa/exa_accel.c | 20 exa/exa_priv.h | 19 exa/exa_unaccel.c | 11 fb/Makefile.am | 2 fb/fb.h | 342 - fb/fbbits.c | 12 fb/fbblt.c | 271 - fb/fbbltone.c | 314 - fb/fbcopy.c | 2 fb/fbfill.c | 84 fb/fbgc.c | 83 fb/fbglyph.c| 8 fb/fbline.c | 4 fb/fbo
xorg-server: Changes to 'ubuntu-trusty'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 79a129c67189fcefe4693fc1b6ae9654a07aac31 Author: Maarten Lankhorst Date: Mon Nov 3 12:36:46 2014 +0100 release to trusty-proposed diff --git a/debian/changelog b/debian/changelog index a8f1ea6..fcfb9be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium +xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium [ Laércio de Sousa ] * Backport support for logind-based multiseat back to trusty. (LP: #1209008) @@ -8,7 +8,7 @@ xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620) * Fix black screen when using qemu with cirrus vga. (LP: #1386620) - -- Maarten Lankhorst Tue, 30 Sep 2014 12:46:12 +0200 + -- Maarten Lankhorst Mon, 03 Nov 2014 12:36:32 +0100 xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xljnw-0001im...@moszumanska.debian.org
