.gitignore | 1 ChangeLog | 1984 +++++++++++++++++++++++ Xext/xres.c | 4 Xext/xselinux_hooks.c | 4 Xi/exevents.c | 20 composite/compwindow.c | 1 config/10-quirks.conf | 16 config/config.c | 6 config/dbus-core.c | 4 configure.ac | 16 debian/changelog | 12 debian/control | 3 debian/patches/02_kbsd-input-devd.diff | 6 debian/patches/03_static-nettle.diff | 2 debian/patches/04_wayland_scanner.diff | 28 debian/patches/08_xfree86_fix_ia64_inx_outx.diff | 8 debian/patches/series | 1 debian/rules | 3 debian/serverminver | 4 dix/devices.c | 12 dix/dixfonts.c | 2 dix/dixutils.c | 25 dix/events.c | 8 fb/fbpict.c | 2 fb/fbscreen.c | 2 glamor/Makefile.am | 6 glamor/glamor.c | 25 glamor/glamor.h | 3 glamor/glamor_context.h | 9 glamor/glamor_copyarea.c | 18 glamor/glamor_core.c | 11 glamor/glamor_egl.c | 61 glamor/glamor_fbo.c | 42 glamor/glamor_fill.c | 13 glamor/glamor_font.c | 7 glamor/glamor_getimage.c | 96 - glamor/glamor_glx.c | 26 glamor/glamor_glyphblt.c | 10 glamor/glamor_glyphs.c | 3 glamor/glamor_gradient.c | 24 glamor/glamor_image.c | 180 ++ glamor/glamor_pixmap.c | 22 glamor/glamor_points.c | 5 glamor/glamor_priv.h | 31 glamor/glamor_putimage.c | 161 - glamor/glamor_rects.c | 4 glamor/glamor_render.c | 64 glamor/glamor_segment.c | 11 glamor/glamor_spans.c | 10 glamor/glamor_text.c | 46 glamor/glamor_tile.c | 13 glamor/glamor_transfer.c | 6 glamor/glamor_trapezoid.c | 20 glamor/glamor_utils.h | 13 glamor/glamor_vbo.c | 17 glamor/glamor_xv.c | 7 glx/glxcmds.c | 22 glx/glxdri2.c | 124 + glx/glxdriswrast.c | 10 glx/glxext.c | 48 glx/glxserver.h | 1 hw/dmx/config/xdmxconfig.c | 3 hw/dmx/dmxfont.c | 2 hw/dmx/glxProxy/glxcmds.c | 2 hw/kdrive/linux/linux.c | 7 hw/kdrive/src/kdrive.c | 9 hw/xfree86/.gitignore | 1 hw/xfree86/common/compiler.h | 10 hw/xfree86/common/xf86Bus.c | 4 hw/xfree86/common/xf86Config.c | 36 hw/xfree86/common/xf86Module.h | 2 hw/xfree86/common/xf86Xinput.c | 9 hw/xfree86/common/xf86platformBus.c | 3 hw/xfree86/dri/dri.c | 14 hw/xfree86/dri2/dri2.c | 29 hw/xfree86/int10/stub.c | 2 hw/xfree86/int10/xf86x86emu.c | 1 hw/xfree86/loader/loadmod.c | 6 hw/xfree86/man/Makefile.am | 2 hw/xfree86/man/Xorg.wrap.man | 4 hw/xfree86/man/Xwrapper.config.man | 2 hw/xfree86/man/xorg.conf.man | 24 hw/xfree86/modes/xf86Crtc.h | 8 hw/xfree86/modes/xf86Cursors.c | 56 hw/xfree86/modes/xf86RandR12.c | 7 hw/xfree86/os-support/linux/lnx_platform.c | 2 hw/xfree86/os-support/linux/lnx_video.c | 4 hw/xfree86/os-support/linux/systemd-logind.c | 7 hw/xfree86/parser/Device.c | 6 hw/xfree86/parser/Layout.c | 6 hw/xfree86/parser/Screen.c | 6 hw/xfree86/parser/xf86Parser.h | 3 hw/xfree86/parser/xf86tokens.h | 1 hw/xfree86/ramdac/IBM.c | 4 hw/xfree86/ramdac/TI.c | 2 hw/xfree86/ramdac/xf86Cursor.h | 36 hw/xfree86/ramdac/xf86HWCurs.c | 14 hw/xfree86/shadowfb/shadow.c | 1592 ------------------ hw/xfree86/xorg-wrapper.c | 75 hw/xfree86/xorgconf.cpp | 2 hw/xquartz/X11Controller.m | 5 hw/xquartz/bundle/Info.plist.cpp | 4 hw/xquartz/darwin.c | 16 hw/xquartz/xpr/xprScreen.c | 16 hw/xwayland/xwayland.c | 10 hw/xwin/glx/indirect.c | 13 include/dix.h | 2 include/misc.h | 18 include/opaque.h | 1 include/servermd.h | 27 include/systemd-logind.h | 4 include/xwin-config.h.in | 3 man/Xserver.man | 5 mi/mieq.c | 4 mi/miwindow.c | 2 os/busfault.c | 1 os/connection.c | 7 os/log.c | 75 os/utils.c | 12 present/present.c | 126 + present/present_priv.h | 1 randr/randr.c | 2 randr/rrcrtc.c | 7 randr/rrprovider.c | 4 randr/rrsdispatch.c | 138 + render/render.c | 2 test/.gitignore | 3 test/Makefile.am | 8 test/input.c | 14 test/signal-logging.c | 11 xfixes/cursor.c | 2 xfixes/region.c | 6 xkb/xkmread.c | 6 133 files changed, 3388 insertions(+), 2513 deletions(-)
New commits: commit 523a890370763fd69d35a2d73ffe8773bf700dd3 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 20:15:06 2014 +0200 Upload to experimental diff --git a/debian/changelog b/debian/changelog index 99edaca..755c8e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium +xorg-server (2:1.15.99.903-1) experimental; urgency=medium * New upstream release candidate - reverted quirk for "Evoluent VerticalMouse 3" (closes: #739537) @@ -11,7 +11,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium * Bump video ABI and serverminver. * Explicitly disable xwayland. - -- Julien Cristau <jcris...@debian.org> Thu, 05 Jun 2014 19:16:24 +0200 + -- Julien Cristau <jcris...@debian.org> Thu, 05 Jun 2014 20:14:56 +0200 xorg-server (2:1.15.99.902-1) experimental; urgency=medium commit 22476e285070a225f05ae27468ff90f225084101 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 20:05:59 2014 +0200 Explicitly disable xwayland. diff --git a/debian/changelog b/debian/changelog index 6672f4d..99edaca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium * Enable glamor. * Don't run tests in parallel. * Bump video ABI and serverminver. + * Explicitly disable xwayland. -- Julien Cristau <jcris...@debian.org> Thu, 05 Jun 2014 19:16:24 +0200 diff --git a/debian/rules b/debian/rules index edee01f..673dbc9 100755 --- a/debian/rules +++ b/debian/rules @@ -109,6 +109,7 @@ confflags += \ --enable-xorg \ --disable-linux-acpi \ --disable-linux-apm \ + --disable-xwayland \ --disable-xquartz \ --disable-xwin \ --disable-xfake \ commit 1d2cda4a1cd5bf333b25d51347b064eb07fea2bd Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 19:47:30 2014 +0200 Add missing libegl-dev build-dep for glamor diff --git a/debian/control b/debian/control index 5a36bde..5d15562 100644 --- a/debian/control +++ b/debian/control @@ -72,6 +72,7 @@ Build-Depends: libxshmfence-dev (>= 1.1) [!hurd-i386], # glamor libepoxy-dev [linux-any kfreebsd-any], + libegl1-mesa-dev [linux-any kfreebsd-any], libgbm-dev [linux-any], # XCB bits for Xephyr libxcb1-dev, commit 38809f14970929d73bfe438e981885c65b275011 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 19:38:39 2014 +0200 Bump video ABI and serverminver. diff --git a/debian/changelog b/debian/changelog index de92d67..6672f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium * Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing. * Enable glamor. * Don't run tests in parallel. + * Bump video ABI and serverminver. -- Julien Cristau <jcris...@debian.org> Thu, 05 Jun 2014 19:16:24 +0200 diff --git a/debian/serverminver b/debian/serverminver index 7f1627c..13cf097 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ -2:1.15.99.902 -ABI_VIDEODRV_VERSION:17.0 +2:1.15.99.903 +ABI_VIDEODRV_VERSION:18.0 ABI_XINPUT_VERSION:21.0 commit 9d971940bf749059dfce67f764c8c3cde7640057 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 19:33:03 2014 +0200 Refresh patch stack diff --git a/debian/patches/02_kbsd-input-devd.diff b/debian/patches/02_kbsd-input-devd.diff index 0264e77..1f2cd5b 100644 --- a/debian/patches/02_kbsd-input-devd.diff +++ b/debian/patches/02_kbsd-input-devd.diff @@ -466,7 +466,7 @@ Index: xorg-server/configure.ac =================================================================== --- xorg-server.orig/configure.ac +++ xorg-server/configure.ac -@@ -613,6 +613,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST +@@ -614,6 +614,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto]) AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) @@ -474,7 +474,7 @@ Index: xorg-server/configure.ac AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto]) AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes]) -@@ -955,6 +956,21 @@ if test "x$CONFIG_WSCONS" = xyes; then +@@ -956,6 +957,21 @@ if test "x$CONFIG_WSCONS" = xyes; then AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration]) fi @@ -500,7 +500,7 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c =================================================================== --- xorg-server.orig/hw/xfree86/common/xf86Config.c +++ xorg-server/hw/xfree86/common/xf86Config.c -@@ -1379,15 +1379,18 @@ checkCoreInputDevices(serverLayoutPtr se +@@ -1391,15 +1391,18 @@ checkCoreInputDevices(serverLayoutPtr se } if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) { diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff index c4bc7d4..9424870 100644 --- a/debian/patches/03_static-nettle.diff +++ b/debian/patches/03_static-nettle.diff @@ -6,7 +6,7 @@ Index: xorg-server/configure.ac =================================================================== --- xorg-server.orig/configure.ac +++ xorg-server/configure.ac -@@ -1656,7 +1656,7 @@ fi +@@ -1657,7 +1657,7 @@ fi if test "x$with_sha1" = xlibnettle; then AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], [Use libnettle SHA1 functions]) diff --git a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff index 10dbbe9..8c506aa 100644 --- a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff +++ b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff @@ -5,9 +5,11 @@ Call the equivalent glibc functions. Debian bug #685750 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -438,6 +438,54 @@ extern _X_EXPORT unsigned int inl(unsign +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 <machine/pio.h> #endif /* __NetBSD__ */ commit a0aa9c562f00bfff921d791ec72dee5f208729e8 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 19:30:18 2014 +0200 Delete patch applied upstream diff --git a/debian/patches/04_wayland_scanner.diff b/debian/patches/04_wayland_scanner.diff deleted file mode 100644 index 3852332..0000000 --- a/debian/patches/04_wayland_scanner.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <k...@bitplanet.net> -To: xorg-de...@lists.freedesktop.org -Subject: [PATCH 3/3] configure.ac: Remove check for WAYLAND_SCANNER_RULES -Date: Tue, 8 Apr 2014 09:24:12 -0700 -Message-Id: <1396974252-6462-3-git-send-email-...@bitplanet.net> -Content-Type: text/plain; charset="utf-8" - -This makes configure fail if the wayland autoconf macros aren't found. -We don't need the scanner for shm-only xwayland so just drop this line for -now. - -Signed-off-by: Kristian Høgsberg <k...@bitplanet.net> ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -Index: xorg-server/configure.ac -=================================================================== ---- xorg-server.orig/configure.ac -+++ xorg-server/configure.ac -@@ -2474,7 +2474,6 @@ if test "x$XWAYLAND" = xyes; then - XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" - AC_SUBST([XWAYLAND_LIBS]) - AC_SUBST([XWAYLAND_SYS_LIBS]) -- WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland']) - fi - - diff --git a/debian/patches/series b/debian/patches/series index df5e560..82c708e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ 001_fedora_extramodes.patch 02_kbsd-input-devd.diff 03_static-nettle.diff -04_wayland_scanner.diff 05_Revert-Unload-submodules.diff 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff 08_xfree86_fix_ia64_inx_outx.diff commit a18aee29cb33b0e678f24f129d460546c56c7bc7 Author: Julien Cristau <jcris...@debian.org> Date: Thu Jun 5 19:28:56 2014 +0200 New upstream release candidate diff --git a/ChangeLog b/ChangeLog index fd1abea..302f727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1975 @@ +commit 08820f03768e904f1746ef93ca01660330dc5406 +Author: Keith Packard <kei...@keithp.com> +Date: Wed Jun 4 22:28:57 2014 -0700 + + Update to version 1.15.99.903 + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 9fb08310b51b46736f3ca8dbc04efdf502420403 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed May 21 10:07:31 2014 +1000 + + mi: don't process events from disabled devices (#77884) + + Once a device is disabled, it doesn't have a sprite pointer anymore. If an + event is still in the queue and processed after DisableDevice finished, a + dereference causes a crash. Example backtrace (crash forced by injecting an + event at the right time): + + (EE) 0: /opt/xorg/bin/Xorg (OsSigHandler+0x3c) [0x48d334] + (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x37fcc0f74f] + (EE) 2: /opt/xorg/bin/Xorg (mieqMoveToNewScreen+0x38) [0x609240] + (EE) 3: /opt/xorg/bin/Xorg (mieqProcessDeviceEvent+0xd4) [0x609389] + (EE) 4: /opt/xorg/bin/Xorg (mieqProcessInputEvents+0x206) [0x609720] + (EE) 5: /opt/xorg/bin/Xorg (ProcessInputEvents+0xd) [0x4aeb58] + (EE) 6: /opt/xorg/bin/Xorg (xf86VTSwitch+0x1a6) [0x4af457] + (EE) 7: /opt/xorg/bin/Xorg (xf86Wakeup+0x2bf) [0x4af0a7] + (EE) 8: /opt/xorg/bin/Xorg (WakeupHandler+0x83) [0x4445cb] + (EE) 9: /opt/xorg/bin/Xorg (WaitForSomething+0x3fe) [0x491bf6] + (EE) 10: /opt/xorg/bin/Xorg (Dispatch+0x97) [0x435748] + (EE) 11: /opt/xorg/bin/Xorg (dix_main+0x61d) [0x4438a9] + (EE) 12: /opt/xorg/bin/Xorg (main+0x28) [0x49ba28] + (EE) 13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x37fc821d65] + (EE) 14: /opt/xorg/bin/Xorg (_start+0x29) [0x425e69] + (EE) 15: ? (?+0x29) [0x29] + + xf86VTSwitch() calls ProcessInputEvents() before disabling a device, and + DisableDevice() calls mieqProcessInputEvents() again when flushing touches and + button events. Between that and disabling the device (which causes new events + to be refused) there is a window where events may be triggered and enqueued. + On the next call to PIE that event is processed on a now defunct device, + causing the crash. + + The simplest fix to this is to discard events from disabled devices. We flush + the queue often enough before disabling that when we get here, we really don't + care about the events from this device. + + X.Org Bug 77884 <http://bugs.freedesktop.org/show_bug.cgi?id=77884> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reported-by: Maarten Lankhorst <maarten.lankho...@canonical.com> + Tested-by: Maarten Lankhorst <maarten.lankho...@canonical.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit e6f5d9d7b7efdacea0f22f1808efca849bcede4c +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jan 27 11:23:58 2014 -0800 + + present: Queue flips for later execution + + When a flip (or unflip) is pending and a flip request comes in, leave + it queued until the pending flip completes and then execute it. + + This fixes a bug where an application submitting back-to-back + present_pixmap requests for sequential frames would alternate between + flipping and copying as the pending flip would cause the new + present_pixmap request to not use a flip. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Chris Wilson <ch...@chris-wilson.co.uk> + Tested-by: Frank Binns <frank.bi...@imgtec.com> + +commit 2f5cf9ff9a0f713b7e038636484c77f113a5f10a +Author: Frank Binns <frank.bi...@imgtec.com> +Date: Thu Apr 24 11:37:48 2014 +0100 + + xfixes: disable cursor on X server reset + + The initial state of the cursor is set to disabled but this was + never be re-disabled during X server reset. This meant any + application run after an X server reset would have the cursor + displayed even if it hadn't requested this to be the case. + + Signed-off-by: Frank Binns <frank.bi...@imgtec.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit b92d86a982504af2605042c19ef796d135074ee1 +Author: Brendan King <brendan.k...@imgtec.com> +Date: Thu Apr 24 11:37:47 2014 +0100 + + dix: fix pixmap leak on server reset + + The server is leaking a pixmap (created by CreateDefaultStipple()) on + reset. The leak is caused by some X Server graphics contexts not being + freed on reset by the machine independent cursor code in the server, + which in turn is caused by the cursor cleanup code + (miSpriteDeviceCursorCleanup()) not being called. + + Ensures the DeviceCursorCleanup() function is called when the associated + input device is closed on server reset. + + Signed-off-by: Frank Binns <frank.bi...@imgtec.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit a99c061aafd4aaa5728c776dca7d0a1789ac739a +Author: Brendan King <brendan.k...@imgtec.com> +Date: Thu Apr 24 11:37:46 2014 +0100 + + dix: reference the cursor just once in InitializeSprite() + + The new current cursor was being referenced twice, resulting in a + memory leak when the current server generation ended. + + Signed-off-by: Frank Binns <frank.bi...@imgtec.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 444a1f7a8802999e27ecf5f6eb598df2206f7277 +Author: Brendan King <brendan.k...@imgtec.com> +Date: Thu Apr 24 11:37:45 2014 +0100 + + fb: fix screen pixmap leak on server reset + + Call FreePixmap() instead of free() to destroy the screen pixmap in + fbCloseScreen(). + + Signed-off-by: Frank Binns <frank.bi...@imgtec.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 7ca458493aa2f0aa091c989ea0768611e0730bf5 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed May 28 08:14:00 2014 +0100 + + xfree86: Report Present as a built-in module + + This is so that drivers can do a runtime check that Present is available, + similar to existing runtime checks performed by the drivers for DRI. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed May 28 08:13:59 2014 +0100 + + xfree86: Report DRI3 as a built-in module + + This is so that drivers can do a runtime check that DRI3 is available, + similar to existing runtime checks performed by the drivers for DRI and + DRI2. + + v2: Only add DRI3 to the list if the module was actually built into the + server (Mark Kettenis). + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + Cc: Mark Kettenis <mark.kette...@xs4all.nl> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit b5526141f78df15bc5df2497bc4b4a17f1a6368d +Merge: dc8d068 a205ec3 +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jun 2 13:08:23 2014 -0700 + + Merge remote-tracking branch 'jturney/master' + +commit dc8d0688471695ec5a8db5fef93fbcfc064891d5 +Author: Max Filippov <jcmvb...@gmail.com> +Date: Mon Jun 2 01:17:31 2014 +0400 + + xtensa: add support for xtensa architecture + + Signed-off-by: Max Filippov <jcmvb...@gmail.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f +Merge: 63c48de 1c10b37 +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jun 2 11:30:24 2014 -0700 + + Merge remote-tracking branch 'jeremyhu/master' + +commit 63c48de63becdee680e90cb2363984c2f8f77fd1 +Author: Søren Sandmann <soren.sandm...@gmail.com> +Date: Fri May 30 16:50:35 2014 -0400 + + xfree86: Add "modesetting" to list of fallback drivers + + To make X -configure work properly, the output of fixup_video_driver_list() + should be in order of preference. Otherwise, the config file may use + the incorrect driver for some devices. + + In particular, the drivers that work for all (or many) devices need to be + last in the list. Since the modesetting driver works for many devices, + it needs to be considered a fallback driver. + + Signed-off-by: Søren Sandmann <s...@redhat.com> + Acked-by: Daniel Stone <dani...@collabora.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit ab47ec9636b21a7f542d2e8612834915e7c8cc64 +Merge: 0df871c cfaf2ab +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jun 2 11:22:48 2014 -0700 + + Merge remote-tracking branch 'whot/for-keith' + +commit 0df871cf34ee5f1a85586206027de9b02fb364ec +Author: Robert Ancell <robert.anc...@canonical.com> +Date: Thu May 22 10:43:52 2014 +1200 + + Fix overflow checking extension versions + + The easiest way to check for the version of an extension is to send the maximum + possible version numbers in the QueryVersion request. The X server overflows on + these as it assumes you will send a reasonable version number. + + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 4cbd3fabaa41e89579530bceb01b9239fa2afdb7 +Author: Adam Jackson <a...@redhat.com> +Date: Wed May 21 09:22:49 2014 -0400 + + configure: Require sufficiently new wayland-client for xwayland ddx + + The explicit release requests were added in 1.3.0, don't try to build + against older. + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit a205ec3ab77c6765d44f77c526a832345fef77b0 +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Sat Apr 5 15:15:46 2014 +0100 + + configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used + + Commit f37a46913489397d8628ffe578c8d4ed50b6ca72 removed this from + xwin-config.h.in for some reason, but it is used. + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: Colin Harrison <colin.harri...@virgin.net> + +commit aaaa41345674a1c76a70836394cb5e57f82e9a26 +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Sun Apr 27 20:55:51 2014 +0100 + + hw/xwin: Update for __glXLastContext -> lastGLContext + + Update for __glXLastContext -> lastGLContext. + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: Colin Harrison <colin.harri...@virgin.net> + +commit 1c10b37380d228b35db8a8616a6312ac54f5e59b +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Sat May 31 17:45:02 2014 -0700 + + XQuartz: Update logic to account for title bar on every display in Mavericks + + <rdar://problem/14205847> + http://xquartz.macosforge.org/trac/ticket/832 + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + +commit ad0ff649c68b18c4b95b078c2d1d1e7de71a7c6f +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Sat May 31 17:22:51 2014 -0700 + + XQuartz: Dead code removal (ENABLE_DEBUG_LOG) + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + +commit e281288d5afedb154f52c31f70a350a013ecfb06 +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Sat May 31 13:04:43 2014 -0700 + + XQuartz: Bump to 2.7.7 + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + +commit cfaf2abbac3f01e57d00845d8908bf01559263f9 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Sat May 24 20:05:53 2014 +1000 + + man: drop specific mention of DontZap in -retro (#71113) + + DontZap off is the default anyway, don't mention it specifically to avoid + confusion + + X.Org Bug 71113 <http://bugs.freedesktop.org/show_bug.cgi?id=71113> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit e48a132b6d187f355abd7021be47edde972e7091 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Sat May 24 20:02:56 2014 +1000 + + xfree86: fix wrong DontZap documentation (#71113) + + X.Org Bug 71113 <http://bugs.freedesktop.org/show_bug.cgi?id=71113> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 548fc937b22d4dfe7f96e0bd77522261603a2c2f +Author: Robert Ancell <robert.anc...@canonical.com> +Date: Thu May 22 10:43:52 2014 +1200 + + Fix overflow checking extension versions + + The easiest way to check for the version of an extension is to send the maximum + possible version numbers in the QueryVersion request. The X server overflows on + these as it assumes you will send a reasonable version number. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit db2e708f31a162c6c66643d3559dd5f3e21ee06b +Author: Adam Jackson <a...@redhat.com> +Date: Thu Sep 27 17:44:42 2012 -0400 + + glx: Require at least one True/DirectColor visual + + Mesa no longer supports rendering to anything less. GLX 1.2 requires + that the server advertise at least one GLX visual. GLX 1.3 and 1.4 are + more subtle: they require at least one fbconfig capable of window + rendering, and _also_ require that window-capable fbconfigs have a + non-zero value for the GLX_VISUAL_ID. In either case we should refuse + to init GLX if there's not at least one GL-capable visual on at least + one screen. + + Signed-off-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit d7a2df0a7499864cb005b098b79c1bdf884f6600 +Author: Steven McDonald <ste...@steven-mcdonald.id.au> +Date: Sun May 18 13:42:08 2014 +0200 + + Xi: block SIGIOs while copying device classes around + + I've been seeing sporadic (anywhere from once every few days to 3-4 + times a day) crashes and freezes in X. The problematic behaviour isn't + always the same, but I chose a particular incident to debug, and found + that X was segfaulting in updateMotionHistory, on line 575 of + dix/getevents.c. + + After some further investigation, I found that the bug was being + triggered when a SIGIO was received in DeepCopyPointerClasses, between + the AllocValuatorClass call (line 540) and updating the to->valuator + pointer (line 545). AllocValuatorClass calls realloc() on to->valuator, + so between these lines, it's not guaranteed to point to allocated + memory. + + It seems the SIGIO handler is calling updateMotionHistory, which is + reading the memory pointed to by to->valuator and getting a wrong value + for last_motion, which updates buff to point to wildly the wrong place + and thus generates a segfault when a memcpy() is done into buff. + + I am attaching a patch which I've been running on that machine for the + past three days, and haven't yet observed any more crashing or freezing + behaviour. The patch simply calls OsBlockSIGIO while + DeepCopyDeviceClasses is in progress, as the state of the X server's + device data structures is not guaranteed to be in a consistent state + during that time. + + Debian bug#744303 <https://bugs.debian.org/744303> + + Signed-off-by: Julien Cristau <jcris...@debian.org> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit d3a3ee7a0e5cbd3fcaba77d2d5664e1524eda11c +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu May 8 09:39:36 2014 +1000 + + os: automatically switch to sigsafe logging when needed + + If we're smart enough to warn, we should be smart enough to just pass it + through to the right function. Worst case we lose some formatting specifiers + which pnprintf will complain about anyway. And in most cases it won't matter. + + This requires renaming pnprintf to vpnprintf and changing the size_t to int to + be compatible with Xvscnprintf. pnprintf is internal only, the others are + exported API so we can't change them as easily. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit 6d684f916b4c33327d32ef1f48803bf90357287f +Author: Adam Jackson <a...@redhat.com> +Date: Wed May 21 09:23:19 2014 -0400 + + shadowfb: Fix initialization + + This has to run at initial CreateWindow time, at CreateScreenResources + the root window doesn't actually exist yet. + + Tested-by: Michael Thayer <michael.tha...@oracle.com> + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Michael Thayer <michael.tha...@oracle.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit d9e99edd4dcf109492abdaa73ccf8f29d5bfd159 +Author: Adam Jackson <a...@redhat.com> +Date: Wed Apr 30 13:49:06 2014 -0400 + + glxproxy: Fix memory leak on error path in CreateGLXPixmap (#50281) (v2) + + v2: Fix another path spotted by keithp + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit dff1f5e1a9608eda2992fc9e3304edee7b5bee9b +Author: Adam Jackson <a...@redhat.com> +Date: Wed Apr 30 13:49:05 2014 -0400 + + dmx: Fix memory leak in dmxBELoadFont (#50281) + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 3dba171f5e82101aa8ea2e47d2253c3410907f6a +Author: Michal Srb <m...@suse.com> +Date: Tue Apr 15 18:54:35 2014 +0300 + + dri2: Fix detection of wrong prime_id in GetScreenPrime. + + Checking the iterating variable ("slave") against null can not detect if the + xorg_list_for_each_entry finished without break being invoked - slave variable + will be always non-null. This caused segfault whenever someone tried to use + DRI_PRIME with incorrect id while having at least one render offloading slave + configured. + + Restructurize the GetScreenPrime to work as expected. + + Reviewed-by: Dave Airlie <airl...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit c08d2b8ccb0158dbf1f529f80cc3236e66236cce +Author: Alexey Brodkin <alexey.brod...@synopsys.com> +Date: Thu May 1 15:39:29 2014 +0300 + + ARC: Add support for ARC architecture + + Xorg server could be built for and run on Synopsys DesignWare ARC cores. + These changes are required for successful building and execution of the server. + + Both little-endian and big-endian flavors of ARC cores are supported. + + Signed-off-by: Alexey Brodkin <abrod...@synopsys.com> + Acked-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Egbert Eich <e...@freedesktop.org> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit d5587cf3acb7ad6f81e1c095f1b88f8fb25ee953 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed May 14 10:32:30 2014 +1000 + + config: revert quirk for the Evoluent Vertical Mouse + + This quick makes the mouse behaviour more obvious (LMR buttons generate LMR + events) but goes against the manufacturer's intended defaults: + + Top button - left click. + Wheel button - .middle click (e.g., for pan and rotate in CAD programs). + Middle button - right click. + Bottom button - back. + Thumb button - forward. + + from http://www.evoluent.com/vm3.html + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 01e18af17f8dc91451fbd0902049045afd1cea7e +Author: Dave Airlie <airl...@redhat.com> +Date: Mon May 12 14:55:04 2014 -0700 + + rrcrtc: brackets are hard, lets go shopping. + + Slaving two outputs on a secondary GPU to a primary GPU testing + picked this up, in that we'd try to resize to the totally the + wrong thing, then as usual segfault in the rotation code. + + Signed-off-by: Dave Airlie <airl...@redhat.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + +commit 6dd86f3cba7cca67f3a9102db2e90722d32a34cb +Author: Eric Anholt <e...@anholt.net> +Date: Mon May 5 17:01:14 2014 -0700 + + glamor: Don't forget to check whether we can fall back in polysegment. + + Part of the _nf contract is that glamor will only return FALSE if + glamor has checked that UXA can actually map the pixmaps (UXA only + allocates the BO itself in the screen pixmap and DRI2 cases, and can't + map it otherwise). Fixes server segfaults zooming in and out of + libreoffice spreadsheets. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit fb24ac0a2c317099bdf7d1d8e4b7c443e3ee644f +Author: Laércio de Sousa <lbsous...@gmail.com> +Date: Fri May 9 09:09:16 2014 -0300 + + xfree86: fix warnings after MatchSeat patch + + This patch fixes some compile warnings that arise after + commit 7070ebeebaca1b51f8a2801989120784a1c374ae + (xfree86: add new key MatchSeat to xorg.conf sections "Device", "Screen", and "ServerLayout") + available at git repository + git://people.freedesktop.org/~whot/xserver for-keith + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit bbfed454b2a0fd5e2723524d145cb7c6e5aa9193 +Author: Eric Anholt <e...@anholt.net> +Date: Thu May 8 08:45:22 2014 -0700 + + glamor: Stop disabling asserts by default. + + Disabling asserts is something the user gets to manage. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 8e2fefe3ef247f8b5d74e32e8d37c619b06fc60c +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Apr 29 16:52:01 2014 +1000 + + Xi: don't copy a DeviceEvent into an InternalEvent + + ==26141== Invalid read of size 8 + ==26141== at 0x58FAEA: DeliverEmulatedMotionEvent (exevents.c:1484) + + An InternalEvent is bigger than a DeviceEvent, thus copying one to the other + reads past the allocated boundary. Shouldn't have any real effect since we + shouldn't access anything past the DeviceEvent boundary if the event type is + correct. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit d7ac9aff061f2961e6b76557dda97b57988ce362 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Apr 30 10:55:26 2014 +1000 + + mi: start calculating the sprite trace from the first child of root + + Introduced in + 73698d41e41ce76bef2d9a90b46ac0c24ae148dd "Make XYToWindow a screen function" + + Moving the code into miwindow.c changed the start of the loop from + RootWindow()->firstChild to DeepestSpriteWindow(). This function is only + supposed to be called from miXYToWindow which resets spriteTraceGood to 1, + thus DeepestSpriteWindow() is always the root window anyway. + What got dropped was the firstChild as the first window to handle, so we may + end up with the root window twice in the sprite trace. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit d60724b752613ce2ad11c6ae102bf4513f9768ff +Merge: a5b9757 15460ea +Author: Keith Packard <kei...@keithp.com> +Date: Thu May 8 12:58:41 2014 -0700 + + Merge commit 'who/for-keith' + + Skipping two unreviewed patches; will mark them reviewed and cherry pick + +commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d +Author: Keith Packard <kei...@keithp.com> +Date: Fri Apr 25 15:07:03 2014 -0700 + + glamor: Publish change_window_attributes and copy_window + + Because uxa doesn't just use glamor directly, it keeps these two + functions from being wrapped so that they get called + automatically. Publishing these will allow uxa to call them directly. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Eric Anholt <e...@anholt.net> + Reviewed-by: Eric Anholt <e...@anholt.net> + +commit 4711182033ec579caff8c930d420f90ecdbe54cf +Author: Keith Packard <kei...@keithp.com> +Date: Fri Apr 25 20:25:56 2014 -0700 + + glamor: Work around libXfont when it fails to use defaultChar + + GetGlyphs is supposed to always return the full list of characters + when there is a default character available. However, if an + application opens a 16-bit two dimensional font and then draws with + 8-bit requests, the bitmapGetGlyphs function in libXfont versions up + through 1.4.7 will return zero glyphs if there is no 0th row. + + While this is a bug in libXfont and should be fixed there, it's easy + to protect glamor from it by simply falling through to the case that + handles GetGlyphs failures for fonts without a default character. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Eric Anholt <e...@anholt.net> + Reviewed-by: Eric Anholt <e...@anholt.net> + +commit 91767a32874790f8a8c7340be0e81a0b719ca4f6 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Apr 25 23:38:35 2014 -0700 + + glamor: Fix uxa-entry point for ImageText16 + + Was interpreting the incoming chars as 8-bits instead of 16-bits, + resulting in the wrong characters being drawn. -- 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/e1wscp1-0000w7...@moszumanska.debian.org