From 0ba3053e970126b18ccffe6cd8d5d9bf5d6678cf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 18 Nov 2013 17:42:46 -0500 Subject: [PATCH] 1.15RC2 --- .gitignore | 3 + ...-sync-fence-FD-functions-if-xshmfenc.patch | 186 ------------------ ...n-CloseScreen-hook-not-ext-CloseDown.patch | 4 +- ...cb_connect-returns-an-error-not-NULL.patch | 29 +++ ...y-to-initialize-when-building-withou.patch | 30 --- ...nk-libdri3-only-when-DRI3-is-defined.patch | 40 ---- ...ve-handle-WxH-as-valid-geometry-spec.patch | 36 ++++ 0002-xkb-Add-struct-XkbCompContext.patch | 4 +- ...hyr-events-to-use-POINTER_DESKTOP-an.patch | 70 +++++++ ...the-computed-clockid-in-GetTimeInMic.patch | 30 --- ...out-code-to-start-and-finish-xkbcomp.patch | 4 +- ...nce-reference-miSyncShmScreenInit-in.patch | 71 ------- ...or-jumps-on-CursorOffScreen-behavior.patch | 64 ++++++ 0004-xkb-Add-XkbCompileKeymapFromString.patch | 6 +- ...nline-assembly-.il-file-for-Solaris-.patch | 102 ++++++++++ ...e-GL_LIBS-instead-of-lGL-for-linking.patch | 29 --- ...e-Track-updated-version-of-libxtrans.patch | 35 ---- ...unction-to-create-a-client-for-an-fd.patch | 8 +- ...NewInputDevice-and-xf86AllocateInput.patch | 4 +- ...clude-export-key_is_down-and-friends.patch | 41 ++++ ...RedirectSubwindows-and-CompositeUnRe.patch | 4 +- ...e-touch-test-only-when-building-Xorg.patch | 19 +- ...rect-window-for-input-device-feature.patch | 4 +- ...NULL-for-compat-output-if-no-outputs.patch | 16 +- ...-third-version-of-the-AuthMagic-func.patch | 4 +- ...-mieq-Bump-default-queue-size-to-512.patch | 17 +- ...le.patch => 0010-Add-xwayland-module.patch | 41 ++-- ...W_WAYLAND-flag-to-let-drivers-explic.patch | 4 +- ...-t-create-alpha-buffers-if-the-windo.patch | 4 +- ...and-handle-global-object-destruction.patch | 4 +- ...and-add-support-for-multiple-outputs.patch | 4 +- ...15-xwayland-Probe-outputs-on-preinit.patch | 4 +- ...wlshm-driver-as-fallback-for-Wayland.patch | 4 +- ...end-out-of-bounds-damage-co-ordinate.patch | 4 +- ...duce-an-auto-mode-for-enable-wayland.patch | 34 +--- ...ardcode-DRM-libs-and-lwayland-client.patch | 4 +- ...-Support-16bpp-X-surfaces-in-DRM-SHM.patch | 4 +- ...-Remove-Xdnd-selection-watching-code.patch | 4 +- ...t-non-wayland-capable-servers-from-d.patch | 4 +- ...G_WAYLAND-symbol-to-xorg-config.h.in.patch | 19 +- ...llback-loading-of-the-wayland-driver.patch | 4 +- ...xwayland-Don-t-include-xorg-server.h.patch | 4 +- ... 0026-os-Don-t-include-xorg-server.h.patch | 4 +- ...istenOnOpenFD-and-AddClientOnOpenFD-.patch | 8 +- ...028-xwayland-Remove-unused-variables.patch | 4 +- ...er-screen-private-key-for-cursor-pri.patch | 4 +- ...XWayland-Don-t-commit-empty-surfaces.patch | 4 +- ...0031-xwayland-Also-look-for-wlglamor.patch | 4 +- ...-xwayland-Add-wlglamor-the-right-way.patch | 4 +- ...-redirect-windows-leave-it-to-the-wm.patch | 4 +- ...mpositeRedirectSubwindows-and-Compos.patch | 4 +- ...h => 0035-xwayland-Fix-hidden-cursor.patch | 4 +- ...bCopyDeviceKeymap-to-apply-a-given-k.patch | 4 +- ...-function-to-copy-a-keymap-s-control.patch | 4 +- ... 0038-xwayland-Handle-keymap-changes.patch | 6 +- sources | 2 +- xorg-x11-server.spec | 103 +++++----- 57 files changed, 536 insertions(+), 633 deletions(-) delete mode 100644 0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch create mode 100644 0001-ephyr-xcb_connect-returns-an-error-not-NULL.patch delete mode 100644 0001-present-Don-t-try-to-initialize-when-building-withou.patch delete mode 100644 0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch create mode 100644 0002-kdrive-handle-WxH-as-valid-geometry-spec.patch create mode 100644 0003-kdrive-modify-ephyr-events-to-use-POINTER_DESKTOP-an.patch delete mode 100644 0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch delete mode 100644 0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch create mode 100644 0004-kdrive-fix-cursor-jumps-on-CursorOffScreen-behavior.patch create mode 100644 0005-Stop-including-inline-assembly-.il-file-for-Solaris-.patch delete mode 100644 0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch delete mode 100644 0005-configure-Track-updated-version-of-libxtrans.patch rename 0006-os-Add-a-function-to-create-a-client-for-an-fd.patch => 0005-os-Add-a-function-to-create-a-client-for-an-fd.patch (95%) rename 0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch => 0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch (92%) create mode 100644 0006-include-export-key_is_down-and-friends.patch rename 0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch => 0007-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch (93%) rename xserver-1.12.2-xorg-touch-test.patch => 0007-test-build-the-touch-test-only-when-building-Xorg.patch (60%) rename 0009-Add-redirect-window-for-input-device-feature.patch => 0008-Add-redirect-window-for-input-device-feature.patch (95%) rename 0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch => 0008-xfree86-return-NULL-for-compat-output-if-no-outputs.patch (62%) rename 0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch => 0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch (97%) rename 0001-mieq-Bump-default-queue-size-to-512.patch => 0009-mieq-Bump-default-queue-size-to-512.patch (72%) rename 0011-Add-xwayland-module.patch => 0010-Add-xwayland-module.patch (98%) rename 0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch => 0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch (91%) rename 0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch => 0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch (88%) rename 0014-xwayland-handle-global-object-destruction.patch => 0013-xwayland-handle-global-object-destruction.patch (98%) rename 0015-xwayland-add-support-for-multiple-outputs.patch => 0014-xwayland-add-support-for-multiple-outputs.patch (98%) rename 0016-xwayland-Probe-outputs-on-preinit.patch => 0015-xwayland-Probe-outputs-on-preinit.patch (90%) rename 0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch => 0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch (95%) rename 0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch => 0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch (89%) rename 0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch => 0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch (60%) rename 0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch => 0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch (91%) rename 0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch => 0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch (95%) rename 0022-xwayland-Remove-Xdnd-selection-watching-code.patch => 0021-xwayland-Remove-Xdnd-selection-watching-code.patch (93%) rename 0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch => 0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch (88%) rename 0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch => 0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch (54%) rename 0025-Fix-fallback-loading-of-the-wayland-driver.patch => 0024-Fix-fallback-loading-of-the-wayland-driver.patch (91%) rename 0026-xwayland-Don-t-include-xorg-server.h.patch => 0025-xwayland-Don-t-include-xorg-server.h.patch (93%) rename 0027-os-Don-t-include-xorg-server.h.patch => 0026-os-Don-t-include-xorg-server.h.patch (87%) rename 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch => 0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch (76%) rename 0029-xwayland-Remove-unused-variables.patch => 0028-xwayland-Remove-unused-variables.patch (84%) rename 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch => 0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch (95%) rename 0031-XWayland-Don-t-commit-empty-surfaces.patch => 0030-XWayland-Don-t-commit-empty-surfaces.patch (89%) rename 0032-xwayland-Also-look-for-wlglamor.patch => 0031-xwayland-Also-look-for-wlglamor.patch (84%) rename 0033-xwayland-Add-wlglamor-the-right-way.patch => 0032-xwayland-Add-wlglamor-the-right-way.patch (88%) rename 0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch => 0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch (95%) rename 0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch => 0034-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch (94%) rename 0036-xwayland-Fix-hidden-cursor.patch => 0035-xwayland-Fix-hidden-cursor.patch (90%) rename 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch => 0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch (96%) rename 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch => 0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch (95%) rename 0039-xwayland-Handle-keymap-changes.patch => 0038-xwayland-Handle-keymap-changes.patch (95%) diff --git a/.gitignore b/.gitignore index 1eb1b0d..c319f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ xorg-server-1.9.1.tar.bz2 /xorg-server-1.14.3.tar.bz2 /xorg-server-1.14.99.3.tar.bz2 /xorg-server-1.14.99.901.tar.bz2 +/xorg-server-1.14.99.902.tar.bz2 +*.bz2 +*.xz diff --git a/0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch b/0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch deleted file mode 100644 index edf20b2..0000000 --- a/0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch +++ /dev/null @@ -1,186 +0,0 @@ -From aaf0e29619196a283fee7ead2020a91032d84f48 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Sun, 3 Nov 2013 09:56:02 -0800 -Subject: [PATCH 1/5] Disable DRI3 and sync fence FD functions if xshmfence - isn't available - -Make sure the server can build when the xshmfence library isn't present - -Signed-off-by: Keith Packard ---- - Xext/sync.c | 8 ++++++++ - configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++-- - dri3/dri3.h | 6 ++++++ - include/xorg-server.h.in | 3 +++ - miext/sync/Makefile.am | 7 ++++++- - 5 files changed, 67 insertions(+), 3 deletions(-) - -diff --git a/Xext/sync.c b/Xext/sync.c -index a04c383..dd18cde 100644 ---- a/Xext/sync.c -+++ b/Xext/sync.c -@@ -919,6 +919,7 @@ SyncCreate(ClientPtr client, XID id, unsigned char type) - int - SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL initially_triggered) - { -+#if HAVE_XSHMFENCE - SyncFence *pFence; - int status; - -@@ -936,12 +937,19 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL - return BadAlloc; - - return Success; -+#else -+ return BadImplementation; -+#endif - } - - int - SyncFDFromFence(ClientPtr client, DrawablePtr pDraw, SyncFence *pFence) - { -+#if HAVE_XSHMFENCE - return miSyncFDFromFence(pDraw, pFence); -+#else -+ return BadImplementation; -+#endif - } - - static SyncCounter * -diff --git a/configure.ac b/configure.ac -index 0d855f2..a7515a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -792,6 +792,7 @@ DMXPROTO="dmxproto >= 2.2.99.1" - VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" - WINDOWSWMPROTO="windowswmproto" - APPLEWMPROTO="applewmproto >= 1.4" -+XSHMFENCE="xshmfence" - - dnl Required modules - XPROTO="xproto >= 7.0.22" -@@ -1119,17 +1120,59 @@ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) - - PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO, - [HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no]) -+ - case "$DRI3,$HAVE_DRI3PROTO" in -+ yes,yes | auto,yes) -+ ;; - yes,no) - AC_MSG_ERROR([DRI3 requested, but dri3proto not found.]) -+ DRI3=no -+ ;; -+ no,*) -+ ;; -+ *) -+ AC_MSG_NOTICE([DRI3 disabled because dri3proto not found.]) -+ DRI3=no - ;; -+esac -+ -+PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, -+ [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) -+ -+AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) -+ -+case x"$HAVE_XSHMFENCE" in -+ xyes) -+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) -+ ;; -+esac -+ -+ -+case "$DRI3,$HAVE_XSHMFENCE" in - yes,yes | auto,yes) -- AC_DEFINE(DRI3, 1, [Build DRI3 extension]) -+ ;; -+ yes,no) -+ AC_MSG_ERROR("DRI3 requested, but xshmfence not found.]) -+ DRI3=no -+ ;; -+ no,*) -+ ;; -+ *) -+ AC_MSG_NOTICE([DRI3 disabled because xshmfence not found.]) -+ DRI3=no -+ ;; -+esac -+ -+case x"$DRI3" in -+ xyes|xauto) - DRI3=yes -+ AC_DEFINE(DRI3, 1, [Build DRI3 extension]) - DRI3_LIB='$(top_builddir)/dri3/libdri3.la' - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI3PROTO" -+ AC_MSG_NOTICE([DRI3 enabled]); - ;; - esac -+ - AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) - - if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then -@@ -1333,7 +1376,6 @@ if test "x$XDMAUTH" = xyes; then - XDMCP_MODULES="xdmcp" - fi - fi --REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" - - AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) - AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path]) -diff --git a/dri3/dri3.h b/dri3/dri3.h -index 7774c87..7c0c330 100644 ---- a/dri3/dri3.h -+++ b/dri3/dri3.h -@@ -23,6 +23,10 @@ - #ifndef _DRI3_H_ - #define _DRI3_H_ - -+#include -+ -+#ifdef DRI3 -+ - #include - #include - -@@ -56,4 +60,6 @@ typedef struct dri3_screen_info { - extern _X_EXPORT Bool - dri3_screen_init(ScreenPtr screen, dri3_screen_info_ptr info); - -+#endif -+ - #endif /* _DRI3_H_ */ -diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in -index 1281b3e..960817e 100644 ---- a/include/xorg-server.h.in -+++ b/include/xorg-server.h.in -@@ -218,4 +218,7 @@ - #define _XSERVER64 1 - #endif - -+/* Have support for X shared memory fence library (xshmfence) */ -+#undef HAVE_XSHMFENCE -+ - #endif /* _XORG_SERVER_H_ */ -diff --git a/miext/sync/Makefile.am b/miext/sync/Makefile.am -index e25ceac..ac13c52 100644 ---- a/miext/sync/Makefile.am -+++ b/miext/sync/Makefile.am -@@ -8,8 +8,13 @@ if XORG - sdk_HEADERS = misync.h misyncstr.h misyncshm.h - endif - -+XSHMFENCE_SRCS = misyncshm.c -+ - libsync_la_SOURCES = \ - misync.c \ - misync.h \ -- misyncshm.c \ - misyncstr.h -+ -+if XSHMFENCE -+libsync_la_SOURCES += $(XSHMFENCE_SRCS) -+endif --- -1.8.3.1 - diff --git a/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch b/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch index 62964e3..86f4d18 100644 --- a/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch +++ b/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch @@ -1,7 +1,7 @@ -From cace30177d37bf70dafcc297c38af4ecd7f74dba Mon Sep 17 00:00:00 2001 +From 893eb3b6920b8e703f2e10c1c71cd0f788bfb468 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 12 Jan 2012 18:16:08 +0000 -Subject: [PATCH 01/39] dbe: Cleanup in CloseScreen hook not ext CloseDown +Subject: [PATCH 01/38] dbe: Cleanup in CloseScreen hook not ext CloseDown Instead of registering an extension CloseDownProc when adding the dbe extension this patch hooks into pScreen->CloseScreen so that the chain diff --git a/0001-ephyr-xcb_connect-returns-an-error-not-NULL.patch b/0001-ephyr-xcb_connect-returns-an-error-not-NULL.patch new file mode 100644 index 0000000..3d16dd5 --- /dev/null +++ b/0001-ephyr-xcb_connect-returns-an-error-not-NULL.patch @@ -0,0 +1,29 @@ +From c8c5105c1d5c093675d7f571f158147f22f7572b Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 29 Oct 2013 14:33:56 +1000 +Subject: [PATCH 1/9] ephyr: xcb_connect returns an error, not NULL + +Signed-off-by: Peter Hutterer +Reviewed-by: Keith Packard +--- + hw/kdrive/ephyr/hostx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c +index ee9ae45..3e01a47 100644 +--- a/hw/kdrive/ephyr/hostx.c ++++ b/hw/kdrive/ephyr/hostx.c +@@ -304,8 +304,8 @@ hostx_init(void) + | XCB_EVENT_MASK_STRUCTURE_NOTIFY; + + EPHYR_DBG("mark"); +- +- if ((HostX.conn = xcb_connect(NULL, &HostX.screen)) == NULL) { ++ HostX.conn = xcb_connect(NULL, &HostX.screen); ++ if (xcb_connection_has_error(HostX.conn)) { + fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n"); + exit(1); + } +-- +1.8.3.1 + diff --git a/0001-present-Don-t-try-to-initialize-when-building-withou.patch b/0001-present-Don-t-try-to-initialize-when-building-withou.patch deleted file mode 100644 index 449f5ca..0000000 --- a/0001-present-Don-t-try-to-initialize-when-building-withou.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 77c2d915c571894d1b17127ba29924fabb5a0fd8 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 7 Nov 2013 12:00:37 -0500 -Subject: [PATCH] present: Don't try to initialize when building without - present support - -There's a --disable-present, so it'd be nice if it worked. - -Signed-off-by: Adam Jackson ---- - mi/miinitext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mi/miinitext.c b/mi/miinitext.c -index 6366182..67511b8 100644 ---- a/mi/miinitext.c -+++ b/mi/miinitext.c -@@ -287,7 +287,9 @@ static ExtensionModule staticExtensions[] = { - #ifdef DPMSExtension - {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension}, - #endif -+#ifdef PRESENT - {present_extension_init, PRESENT_NAME, NULL}, -+#endif - #ifdef DRI3 - {dri3_extension_init, DRI3_NAME, NULL}, - #endif --- -1.8.3.1 - diff --git a/0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch b/0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch deleted file mode 100644 index cdfde71..0000000 --- a/0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 903a058370645ea075ea98d380fd565efb6160c9 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Mon, 4 Nov 2013 19:01:26 -0800 -Subject: [PATCH 2/5] hw/xfree86: Link libdri3 only when DRI3 is defined - -Don't attempt to link non-existant libraries... - -Signed-off-by: Keith Packard ---- - hw/xfree86/Makefile.am | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index eea16a8..485386f 100644 ---- a/hw/xfree86/Makefile.am -+++ b/hw/xfree86/Makefile.am -@@ -9,6 +9,11 @@ DRI2_SUBDIR = dri2 - DRI2_LIB = dri2/libdri2.la - endif - -+if DRI3 -+DRI3_BUILDDIR = $(top_builddir)/dri3 -+DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la -+endif -+ - if XF86UTILS - XF86UTILS_SUBDIR = utils - endif -@@ -59,7 +64,7 @@ LOCAL_LIBS = \ - dixmods/libxorgxkb.la \ - $(DRI_LIB) \ - $(DRI2_LIB) \ -- $(top_builddir)/dri3/libdri3.la \ -+ $(DRI3_LIB) \ - $(top_builddir)/miext/sync/libsync.la \ - $(top_builddir)/mi/libmi.la \ - $(top_builddir)/os/libos.la --- -1.8.3.1 - diff --git a/0002-kdrive-handle-WxH-as-valid-geometry-spec.patch b/0002-kdrive-handle-WxH-as-valid-geometry-spec.patch new file mode 100644 index 0000000..063e68e --- /dev/null +++ b/0002-kdrive-handle-WxH-as-valid-geometry-spec.patch @@ -0,0 +1,36 @@ +From d66832a3b8a8675f1e5f3656dcb1bbe95598f0ea Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Thu, 14 Nov 2013 13:21:54 +1000 +Subject: [PATCH 2/9] kdrive: handle WxH as valid geometry spec + +If a screen size was specified as WxH, the loop returned early and kdOrigin +was never advanced. Thus, screen->origin was always 0 (or whatever was given +at the -origin commandline flag). + +If a screen size was given with a bit depth (WxHxD), kdOrigin would always +advance by the current screen, offsetting the next screen. + +Signed-off-by: Keith Packard +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + hw/kdrive/src/kdrive.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c +index f8949be..3829684 100644 +--- a/hw/kdrive/src/kdrive.c ++++ b/hw/kdrive/src/kdrive.c +@@ -328,7 +328,8 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) + screen->height = pixels; + screen->height_mm = mm; + } +- if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y') ++ if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y' && ++ (delim != '\0' || i == 0)) + return; + } + +-- +1.8.3.1 + diff --git a/0002-xkb-Add-struct-XkbCompContext.patch b/0002-xkb-Add-struct-XkbCompContext.patch index 925f852..6a87dac 100644 --- a/0002-xkb-Add-struct-XkbCompContext.patch +++ b/0002-xkb-Add-struct-XkbCompContext.patch @@ -1,7 +1,7 @@ -From b126aca8d6b8b81527a7dcab0d9659a9b5d63d01 Mon Sep 17 00:00:00 2001 +From 9ebe5168a76b769139c5173bf86b97eaa1e40bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 9 Apr 2013 16:54:55 -0400 -Subject: [PATCH 02/39] xkb: Add struct XkbCompContext +Subject: [PATCH 02/38] xkb: Add struct XkbCompContext This commit adds a struct that contains most of the context for starting, running and cleaning up after xkbcomp. diff --git a/0003-kdrive-modify-ephyr-events-to-use-POINTER_DESKTOP-an.patch b/0003-kdrive-modify-ephyr-events-to-use-POINTER_DESKTOP-an.patch new file mode 100644 index 0000000..b0d4398 --- /dev/null +++ b/0003-kdrive-modify-ephyr-events-to-use-POINTER_DESKTOP-an.patch @@ -0,0 +1,70 @@ +From a94d945065177d73f3ee8dc0b9147264ba281136 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 29 Oct 2013 14:24:41 +1000 +Subject: [PATCH 3/9] kdrive: modify ephyr events to use POINTER_DESKTOP and + scale them to that + +A multi-head Xephyr instance has the pointer stuck on one screen +because of bad coordinate calculation. The coordinates passed to +GetPointerEvents are per-screen, so the cursor gets stuck on the left-most +screen by default. + +Adjust and mark the events as POINTER_DESKTOP, so the DIX +can adjust them accordingly. + +Signed-off-by: Peter Hutterer +Reviewed-by: Keith Packard +--- + hw/kdrive/ephyr/ephyr.c | 9 ++++++++- + hw/kdrive/src/kdrive.h | 1 + + hw/kdrive/src/kinput.c | 2 ++ + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c +index 91e949d..ef4b321 100644 +--- a/hw/kdrive/ephyr/ephyr.c ++++ b/hw/kdrive/ephyr/ephyr.c +@@ -959,7 +959,14 @@ ephyrProcessMouseMotion(xcb_generic_event_t *xev) + } + EPHYR_LOG("final (x,y):(%d,%d)\n", x, y); + #endif +- KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0); ++ ++ /* convert coords into desktop-wide coordinates. ++ * fill_pointer_events will convert that back to ++ * per-screen coordinates where needed */ ++ x += screen->pScreen->x; ++ y += screen->pScreen->y; ++ ++ KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_POINTER_DESKTOP, x, y, 0); + } + } + +diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h +index d5d0799..296d611 100644 +--- a/hw/kdrive/src/kdrive.h ++++ b/hw/kdrive/src/kdrive.h +@@ -506,6 +506,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo * ki, unsigned char scan_code, + #define KD_BUTTON_4 0x08 + #define KD_BUTTON_5 0x10 + #define KD_BUTTON_8 0x80 ++#define KD_POINTER_DESKTOP 0x40000000 + #define KD_MOUSE_DELTA 0x80000000 + + void +diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c +index d845830..abda693 100644 +--- a/hw/kdrive/src/kinput.c ++++ b/hw/kdrive/src/kinput.c +@@ -1895,6 +1895,8 @@ KdEnqueuePointerEvent(KdPointerInfo * pi, unsigned long flags, int rx, int ry, + } + else { + dixflags = POINTER_ABSOLUTE; ++ if (flags & KD_POINTER_DESKTOP) ++ dixflags |= POINTER_DESKTOP; + if (x != pi->dixdev->last.valuators[0] || + y != pi->dixdev->last.valuators[1]) + _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, +-- +1.8.3.1 + diff --git a/0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch b/0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch deleted file mode 100644 index d7236b2..0000000 --- a/0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5f1e832694e57986c0185048a941b3af51b2f85f Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Tue, 5 Nov 2013 07:08:21 -0800 -Subject: [PATCH 3/5] os: Actually use the computed clockid in GetTimeInMicros - -The selection of which clock to use for this function was not actually -getting used when fetching the final clock value. - -Reported-by: Julien Cristau -Signed-off-by: Keith Packard ---- - os/utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/os/utils.c b/os/utils.c -index 995f62a..fb20da7 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -480,7 +480,7 @@ GetTimeInMicros(void) - else - clockid = ~0L; - } -- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -+ if (clockid != ~0L && clock_gettime(clockid, &tp) == 0) - return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000; - #endif - --- -1.8.3.1 - diff --git a/0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch b/0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch index f2ba3c3..1623810 100644 --- a/0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch +++ b/0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch @@ -1,7 +1,7 @@ -From 04122fce2aac2185efc9a0e6d6e4363e73990658 Mon Sep 17 00:00:00 2001 +From d71fbbc66b9a014831039758105aab6bd95421a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 9 Apr 2013 17:11:03 -0400 -Subject: [PATCH 03/39] xkb: Split out code to start and finish xkbcomp +Subject: [PATCH 03/38] xkb: Split out code to start and finish xkbcomp Using the context struct from previous commit, we can now split out code to start xkbcomp and to finish and clean up after it. diff --git a/0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch b/0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch deleted file mode 100644 index 9a05c99..0000000 --- a/0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f348935e7d2c84a438aba08eee2f2c4e0dc77d20 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Tue, 5 Nov 2013 18:37:12 -0800 -Subject: [PATCH 4/5] Link with xshmfence, reference miSyncShmScreenInit in - sdksyms - -This gets the server to link with xshmfence again, and also ensures -that the miSyncShm code is linked into the server with the reference -from sdksyms. - -Signed-off-by: Keith Packard ---- - configure.ac | 1 + - hw/xfree86/sdksyms.sh | 3 +++ - include/dix-config.h.in | 3 +++ - include/xorg-config.h.in | 3 +++ - 4 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a7515a3..feeae04 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1144,6 +1144,7 @@ AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) - case x"$HAVE_XSHMFENCE" in - xyes) - AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) -+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" - ;; - esac - -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 7c9734c..d7f259d 100755 ---- a/hw/xfree86/sdksyms.sh -+++ b/hw/xfree86/sdksyms.sh -@@ -44,6 +44,9 @@ cat > sdksyms.c << EOF - /* miext/sync/Makefile.am */ - #include "misync.h" - #include "misyncstr.h" -+#if HAVE_XSHMFENCE -+#include "misyncshm.h" -+#endif - - /* Xext/Makefile.am -- half is module, half is builtin */ - #ifdef XV -diff --git a/include/dix-config.h.in b/include/dix-config.h.in -index 397ee96..156383b 100644 ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in -@@ -449,4 +449,7 @@ - #include "dix-config-apple-verbatim.h" - #endif - -+/* Have support for X shared memory fence library (xshmfence) */ -+#undef HAVE_XSHMFENCE -+ - #endif /* _DIX_CONFIG_H_ */ -diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in -index 487d7ad..e3444da 100644 ---- a/include/xorg-config.h.in -+++ b/include/xorg-config.h.in -@@ -145,4 +145,7 @@ - /* Support APM/ACPI power management in the server */ - #undef XF86PM - -+/* Have support for X shared memory fence library (xshmfence) */ -+#undef HAVE_XSHMFENCE -+ - #endif /* _XORG_CONFIG_H_ */ --- -1.8.3.1 - diff --git a/0004-kdrive-fix-cursor-jumps-on-CursorOffScreen-behavior.patch b/0004-kdrive-fix-cursor-jumps-on-CursorOffScreen-behavior.patch new file mode 100644 index 0000000..3cfeddb --- /dev/null +++ b/0004-kdrive-fix-cursor-jumps-on-CursorOffScreen-behavior.patch @@ -0,0 +1,64 @@ +From 550baf38f6096658f0bcf0ad647c4fedf93132f2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 4 Oct 2013 10:55:52 +1000 +Subject: [PATCH 4/9] kdrive: fix cursor jumps on CursorOffScreen behavior + +This patch fixes cursor jumps when there is a grab on the Xephyr window and +the pointer moves outside the window. + +So on two side-by-side 640x480 screens, a coordinate of 0/481 +triggers KdCursorOffscreen. + +If the delta between two screens is 0, they share the same offset for +that dimension. When searching for the new screen, the loop always rules out +the current screen. So we get to the second screen, trigger the conditions +where dy <= 0 and decide that this new screen is the correct one. The result +is that whenever KdCursorOffScreen is called, the pointer jumps to the other +screen. + +Change to check for dy < 0 etc. so that the cursor stays on the same screen if +there is no other screen at the target location. + +Signed-off-by: Peter Hutterer +Reviewed-by: Keith Packard +--- + hw/kdrive/src/kinput.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c +index abda693..a9a9fa5 100644 +--- a/hw/kdrive/src/kinput.c ++++ b/hw/kdrive/src/kinput.c +@@ -2030,25 +2030,25 @@ KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y) + dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x; + dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y; + if (*x < 0) { +- if (dx <= 0 && -dx < best_x) { ++ if (dx < 0 && -dx < best_x) { + best_x = -dx; + n_best_x = n; + } + } + else if (*x >= pScreen->width) { +- if (dx >= 0 && dx < best_x) { ++ if (dx > 0 && dx < best_x) { + best_x = dx; + n_best_x = n; + } + } + if (*y < 0) { +- if (dy <= 0 && -dy < best_y) { ++ if (dy < 0 && -dy < best_y) { + best_y = -dy; + n_best_y = n; + } + } + else if (*y >= pScreen->height) { +- if (dy >= 0 && dy < best_y) { ++ if (dy > 0 && dy < best_y) { + best_y = dy; + n_best_y = n; + } +-- +1.8.3.1 + diff --git a/0004-xkb-Add-XkbCompileKeymapFromString.patch b/0004-xkb-Add-XkbCompileKeymapFromString.patch index 415ce35..3ed62f1 100644 --- a/0004-xkb-Add-XkbCompileKeymapFromString.patch +++ b/0004-xkb-Add-XkbCompileKeymapFromString.patch @@ -1,7 +1,7 @@ -From ae806ffa6b94bf75b9cb1b2db3e717fcaf13c8d0 Mon Sep 17 00:00:00 2001 +From 3f37d9a8a3ceaf888feb4994a4c61e14e903a368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 9 Apr 2013 17:45:08 -0400 -Subject: [PATCH 04/39] xkb: Add XkbCompileKeymapFromString() +Subject: [PATCH 04/38] xkb: Add XkbCompileKeymapFromString() This new function compiles a keymap from an in-memory string. We use it to add a new keyooard device init function, @@ -17,7 +17,7 @@ Reviewed-by: Daniel Stone 4 files changed, 144 insertions(+), 39 deletions(-) diff --git a/include/input.h b/include/input.h -index 350daba..6573a3a 100644 +index 2d5e531..b1cc3ff 100644 --- a/include/input.h +++ b/include/input.h @@ -385,6 +385,12 @@ extern _X_EXPORT Bool InitKeyboardDeviceStruct(DeviceIntPtr /*device */ , diff --git a/0005-Stop-including-inline-assembly-.il-file-for-Solaris-.patch b/0005-Stop-including-inline-assembly-.il-file-for-Solaris-.patch new file mode 100644 index 0000000..b29de62 --- /dev/null +++ b/0005-Stop-including-inline-assembly-.il-file-for-Solaris-.patch @@ -0,0 +1,102 @@ +From 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Tue, 12 Nov 2013 14:46:04 -0800 +Subject: [PATCH 5/9] Stop including inline assembly .il file for Solaris + Studio builds + +Since all the inb/outb/etc. use in the X server itself (except for +xf86SlowBcopy) has been replaced by calls to libpciaccess, we no +longer need to pass inline assembly files to replace the gcc inline +assembly from hw/xfree86/common/compiler.h when building Xorg itself. + +The .il files are still generated and installed in the SDK for the +benefit of drivers who may use them. + +Binary diff of before and after showed that xf86SlowBcopy was the +only function changed across the Xorg binary and all modules built +in the Xserver build, it just calls the outb() function now instead +of having the outb instructions inlined, making it a slightly slower +bcopy. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Keith Packard +Signed-off-by: Keith Packard +--- + configure.ac | 9 --------- + exa/Makefile.am | 4 ---- + hw/xfree86/Makefile.am | 11 ----------- + 3 files changed, 24 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4be8fcb..1e6f813 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1879,9 +1879,6 @@ if test "x$XORG" = xyes; then + if test "${OS_MINOR}" -lt 8 ; then + AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.]) + fi +- if test "x$SUNCC" = "xyes"; then +- solaris_asm_inline="yes" +- fi + AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"]) + + case $host_cpu in +@@ -1902,11 +1899,6 @@ if test "x$XORG" = xyes; then + xorg@lists.freedesktop.org.]) ;; + esac + AC_SUBST([SOLARIS_INOUT_ARCH]) +- if test x$solaris_asm_inline = xyes ; then +- SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il' +- XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)' +- fi +- AC_SUBST([SOLARIS_ASM_CFLAGS]) + ;; + gnu*) + XORG_OS_SUBDIR="hurd" +@@ -2012,7 +2004,6 @@ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) + AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) + AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) + AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes]) +-AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes]) + AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes]) + AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) + AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes]) +diff --git a/exa/Makefile.am b/exa/Makefile.am +index c1f1e86..6a09966 100644 +--- a/exa/Makefile.am ++++ b/exa/Makefile.am +@@ -1,9 +1,5 @@ + noinst_LTLIBRARIES = libexa.la + +-# Override these since EXA doesn't need them and the needed files aren't +-# built (in hw/xfree86/os-support/solaris) until after EXA is built +-SOLARIS_ASM_CFLAGS="" +- + if XORG + sdk_HEADERS = exa.h + endif +diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am +index 485386f..15670d0 100644 +--- a/hw/xfree86/Makefile.am ++++ b/hw/xfree86/Makefile.am +@@ -80,17 +80,6 @@ BUILT_SOURCES = xorg.conf.example + DISTCLEANFILES = xorg.conf.example + EXTRA_DIST = xorgconf.cpp + +-if SOLARIS_ASM_INLINE +-# Needs to be built before any files are compiled when using Sun compilers +-# so in*/out* inline definitions are properly processed. +- +-BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il +- +-os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il: +- cd os-support/solaris ; \ +- $(MAKE) $(AM_MAKEFLAGS) solaris-@SOLARIS_INOUT_ARCH@.il +-endif +- + # Without logdir, X will post an error on the terminal and will not start + install-data-local: + $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) +-- +1.8.3.1 + diff --git a/0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch b/0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch deleted file mode 100644 index 8dc3eb6..0000000 --- a/0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8fcf82cbf015609e00b3feb9bc567133c7aee5cf Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Tue, 5 Nov 2013 18:39:11 -0800 -Subject: [PATCH 5/5] Use $GL_LIBS instead of -lGL for linking - --lGL presumes that the GL library is in the system path, while - $GL_LIBS is auto-detected. - -Signed-off-by: Keith Packard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index feeae04..6925df8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1075,7 +1075,7 @@ if test "x$GLX" = xyes; then - AC_SUBST(XLIB_CFLAGS) - AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - GLX_LIBS='$(top_builddir)/glx/libglx.la' -- GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL" -+ GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS" - else - GLX=no - fi --- -1.8.3.1 - diff --git a/0005-configure-Track-updated-version-of-libxtrans.patch b/0005-configure-Track-updated-version-of-libxtrans.patch deleted file mode 100644 index f6059f7..0000000 --- a/0005-configure-Track-updated-version-of-libxtrans.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4346239a5d9d34761885009ba65a4e3231a45182 Mon Sep 17 00:00:00 2001 -From: Tiago Vignatti -Date: Thu, 22 Nov 2012 20:22:56 -0200 -Subject: [PATCH 05/39] configure: Track updated version of libxtrans - -XWayland fails to initialize in some systems complaining about realloc -problems on libxtrans (when ListenOnOpenFD() is called). It got fixed in -libxtrans version 1.2.7, more specifically: - - commit 6086f6c1d0e0a1c9e590879acb2319dea0eb6e96 - Author: Robert Bragg - Date: Mon Dec 12 00:30:43 2011 +0000 - -Reported-by: nerdopolis, Prf_Jakob, spitzak among others at #wayland channel -Signed-off-by: Tiago Vignatti ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6925df8..9fb014f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -806,7 +806,7 @@ FIXESPROTO="fixesproto >= 5.0" - DAMAGEPROTO="damageproto >= 1.1" - XCMISCPROTO="xcmiscproto >= 1.2.0" - BIGREQSPROTO="bigreqsproto >= 1.1.0" --XTRANS="xtrans >= 1.2.2" -+XTRANS="xtrans >= 1.2.7" - PRESENTPROTO="presentproto >= 1.0" - - dnl List of libraries that require a specific version --- -1.8.3.1 - diff --git a/0006-os-Add-a-function-to-create-a-client-for-an-fd.patch b/0005-os-Add-a-function-to-create-a-client-for-an-fd.patch similarity index 95% rename from 0006-os-Add-a-function-to-create-a-client-for-an-fd.patch rename to 0005-os-Add-a-function-to-create-a-client-for-an-fd.patch index 102e217..7a0e939 100644 --- a/0006-os-Add-a-function-to-create-a-client-for-an-fd.patch +++ b/0005-os-Add-a-function-to-create-a-client-for-an-fd.patch @@ -1,7 +1,7 @@ -From 82eb27b4322bf392542381adf4aef1aae9fc7c37 Mon Sep 17 00:00:00 2001 +From 92b914a0d1df9d53bdb0e69d8acef8b7a6ee969d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 21 Jun 2011 21:28:31 -0400 -Subject: [PATCH 06/39] os: Add a function to create a client for an fd +Subject: [PATCH 05/38] os: Add a function to create a client for an fd --- include/opaque.h | 1 + @@ -22,10 +22,10 @@ index b76ab6e..8ad9af0 100644 #endif /* OPAQUE_H */ diff --git a/include/os.h b/include/os.h -index 11b2198..4d4a0d6 100644 +index 450e1a8..2a24f4b 100644 --- a/include/os.h +++ b/include/os.h -@@ -164,8 +164,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ ); +@@ -166,8 +166,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ ); extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ ); diff --git a/0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch b/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch similarity index 92% rename from 0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch rename to 0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch index 6029ace..eddb5f6 100644 --- a/0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch +++ b/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch @@ -1,7 +1,7 @@ -From c676298e955548887ce98024c0a28456a8b21cb4 Mon Sep 17 00:00:00 2001 +From 0de4805467ee2491890fd4a0e4261f397eb16584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 21 Jul 2011 09:55:46 -0700 -Subject: [PATCH 07/39] Export xf86NewInputDevice and xf86AllocateInput +Subject: [PATCH 06/38] Export xf86NewInputDevice and xf86AllocateInput --- hw/xfree86/common/xf86Xinput.c | 2 +- diff --git a/0006-include-export-key_is_down-and-friends.patch b/0006-include-export-key_is_down-and-friends.patch new file mode 100644 index 0000000..e480160 --- /dev/null +++ b/0006-include-export-key_is_down-and-friends.patch @@ -0,0 +1,41 @@ +From 8ff7e32c3ef7b0c13c4ab9664f651e9782d35a85 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 13 Nov 2013 17:14:11 +1000 +Subject: [PATCH 6/9] include: export key_is_down and friends + +VNC needs key_is_down to check if a key is processed as down before it +simulates various key releases. Make it available, because I seriously can't +be bothered thinking about how to rewrite VNC to not need that. + +Signed-off-by: Peter Hutterer +Acked-by: Keith Packard +--- + include/input.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/input.h b/include/input.h +index 350daba..2d5e531 100644 +--- a/include/input.h ++++ b/include/input.h +@@ -244,12 +244,12 @@ typedef struct _InputAttributes { + #define KEY_POSTED 2 + #define BUTTON_POSTED 2 + +-extern void set_key_down(DeviceIntPtr pDev, int key_code, int type); +-extern void set_key_up(DeviceIntPtr pDev, int key_code, int type); +-extern int key_is_down(DeviceIntPtr pDev, int key_code, int type); +-extern void set_button_down(DeviceIntPtr pDev, int button, int type); +-extern void set_button_up(DeviceIntPtr pDev, int button, int type); +-extern int button_is_down(DeviceIntPtr pDev, int button, int type); ++extern _X_EXPORT void set_key_down(DeviceIntPtr pDev, int key_code, int type); ++extern _X_EXPORT void set_key_up(DeviceIntPtr pDev, int key_code, int type); ++extern _X_EXPORT int key_is_down(DeviceIntPtr pDev, int key_code, int type); ++extern _X_EXPORT void set_button_down(DeviceIntPtr pDev, int button, int type); ++extern _X_EXPORT void set_button_up(DeviceIntPtr pDev, int button, int type); ++extern _X_EXPORT int button_is_down(DeviceIntPtr pDev, int button, int type); + + extern void InitCoreDevices(void); + extern void InitXTestDevices(void); +-- +1.8.3.1 + diff --git a/0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch b/0007-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch similarity index 93% rename from 0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch rename to 0007-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch index bb613bd..7d81c89 100644 --- a/0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch +++ b/0007-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch @@ -1,7 +1,7 @@ -From b91512c03726e442854813af60b1e399492f346c Mon Sep 17 00:00:00 2001 +From 6eb7ab0f4fc69fe1bf8ee0477e8e8b32ede44e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 18 Sep 2009 22:02:43 -0400 -Subject: [PATCH 08/39] Export CompositeRedirectSubwindows and +Subject: [PATCH 07/38] Export CompositeRedirectSubwindows and CompositeUnRedirectSubwindows --- diff --git a/xserver-1.12.2-xorg-touch-test.patch b/0007-test-build-the-touch-test-only-when-building-Xorg.patch similarity index 60% rename from xserver-1.12.2-xorg-touch-test.patch rename to 0007-test-build-the-touch-test-only-when-building-Xorg.patch index b3daca5..ff3e019 100644 --- a/xserver-1.12.2-xorg-touch-test.patch +++ b/0007-test-build-the-touch-test-only-when-building-Xorg.patch @@ -1,15 +1,20 @@ -From cb26473121e35fed89050f1514bb37aa48b452ad Mon Sep 17 00:00:00 2001 +From d7ee27e5e415778240919082c83a65226c6f17e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 15 Jun 2012 06:25:58 -0400 -Subject: [PATCH] build the touch test only when building Xorg +Date: Tue, 29 Oct 2013 12:09:25 -0400 +Subject: [PATCH 7/9] test: build the touch test only when building Xorg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -Signed-off-by: Fedora X Ninjas +Reviewed-by: Adam Jackson +Signed-off-by: Dan Horák +Signed-off-by: Keith Packard --- - test/Makefile.am | 4 ++-- + test/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am -index aa018c9..b323a40 100644 +index e59c412..2852bb3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,11 +1,11 @@ @@ -27,5 +32,5 @@ index aa018c9..b323a40 100644 check_LTLIBRARIES = libxservertest.la -- -1.7.10.4 +1.8.3.1 diff --git a/0009-Add-redirect-window-for-input-device-feature.patch b/0008-Add-redirect-window-for-input-device-feature.patch similarity index 95% rename from 0009-Add-redirect-window-for-input-device-feature.patch rename to 0008-Add-redirect-window-for-input-device-feature.patch index b06e1a3..7238595 100644 --- a/0009-Add-redirect-window-for-input-device-feature.patch +++ b/0008-Add-redirect-window-for-input-device-feature.patch @@ -1,7 +1,7 @@ -From 9702f1ac244758172c3f8edbfc26e99fe1d52fbe Mon Sep 17 00:00:00 2001 +From 149dba7f44e01b88fd9c2aba1dfc707c6917bae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 18 Sep 2009 22:09:03 -0400 -Subject: [PATCH 09/39] Add redirect window for input device feature +Subject: [PATCH 08/38] Add redirect window for input device feature --- Xi/exevents.c | 13 +++++++++++++ diff --git a/0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch b/0008-xfree86-return-NULL-for-compat-output-if-no-outputs.patch similarity index 62% rename from 0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch rename to 0008-xfree86-return-NULL-for-compat-output-if-no-outputs.patch index a7fe6da..6dad682 100644 --- a/0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch +++ b/0008-xfree86-return-NULL-for-compat-output-if-no-outputs.patch @@ -1,21 +1,23 @@ -From f0ae8cbbb8b88c04b256a6895c21a056dddbbbb1 Mon Sep 17 00:00:00 2001 +From d1440783a7367ff0d0c47d256bbca3b3cf8a5034 Mon Sep 17 00:00:00 2001 From: Dave Airlie -Date: Mon, 10 Sep 2012 11:14:20 +1000 -Subject: [PATCH] xf86: return NULL for compat output if no outputs. +Date: Tue, 29 Oct 2013 12:09:26 -0400 +Subject: [PATCH 8/9] xfree86: return NULL for compat output if no outputs. With outputless GPUs showing up we crash here if there are not outputs try and recover with a bit of grace. +Reviewed-by: Adam Jackson Signed-off-by: Dave Airlie +Signed-off-by: Keith Packard --- - hw/xfree86/modes/xf86Crtc.c | 3 +++ + hw/xfree86/modes/xf86Crtc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 803de88..7419400 100644 +index 2a02c85..a441fd1 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1764,6 +1764,9 @@ SetCompatOutput(xf86CrtcConfigPtr config) +@@ -1863,6 +1863,9 @@ SetCompatOutput(xf86CrtcConfigPtr config) DisplayModePtr maxmode = NULL, testmode, mode; int o, compat = -1, count, mincount = 0; @@ -26,5 +28,5 @@ index 803de88..7419400 100644 for (o = 0; o < config->num_output; o++) { test = config->output[o]; -- -1.7.10.2 +1.8.3.1 diff --git a/0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch b/0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch similarity index 97% rename from 0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch rename to 0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch index 8058431..10bc205 100644 --- a/0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch +++ b/0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch @@ -1,7 +1,7 @@ -From 995cadad451bce76a211b1b2f366c41efa1a8c65 Mon Sep 17 00:00:00 2001 +From 9c78591012c5ea0e5cd729b8b20eddce825295ed Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Wed, 21 Aug 2013 21:23:09 -0700 -Subject: [PATCH 10/39] dri2: Introduce a third version of the AuthMagic +Subject: [PATCH 09/38] dri2: Introduce a third version of the AuthMagic function This most recent version takes a client pointer to allow xwayland to diff --git a/0001-mieq-Bump-default-queue-size-to-512.patch b/0009-mieq-Bump-default-queue-size-to-512.patch similarity index 72% rename from 0001-mieq-Bump-default-queue-size-to-512.patch rename to 0009-mieq-Bump-default-queue-size-to-512.patch index a50df5d..00d2a4e 100644 --- a/0001-mieq-Bump-default-queue-size-to-512.patch +++ b/0009-mieq-Bump-default-queue-size-to-512.patch @@ -1,10 +1,11 @@ -From 2d554ab4874943a6b73132ba84835586011f2b45 Mon Sep 17 00:00:00 2001 +From 0492deb8f8238b7782e5a706ec6219d88aa1091d Mon Sep 17 00:00:00 2001 From: Adam Jackson -Date: Fri, 30 Nov 2012 13:50:40 -0500 -Subject: [PATCH] mieq: Bump default queue size to 512 +Date: Tue, 29 Oct 2013 12:09:27 -0400 +Subject: [PATCH 9/9] mieq: Bump default queue size to 512 -Based on some bugzilla scraping just now. Of xserver bugs with -attachments, the distribution looks like: +Based on some bugzilla scraping I did around November 2012. Of xserver +bugs in Red Hat bugzilla with an EQ size message in the log, the +distribution looked like: String | Matches ------------------------------------- @@ -21,12 +22,14 @@ spurious abrt reports and to drop fewer events in all but the most pathological cases. Signed-off-by: Adam Jackson +Reviewed-by: Jasper St. Pierre +Signed-off-by: Keith Packard --- mi/mieq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mi/mieq.c b/mi/mieq.c -index b2c7769..c1d845b 100644 +index d7d73de..4c07480 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group. @@ -39,5 +42,5 @@ index b2c7769..c1d845b 100644 #define QUEUE_MAXIMUM_SIZE 4096 #define QUEUE_DROP_BACKTRACE_FREQUENCY 100 -- -1.7.11.7 +1.8.3.1 diff --git a/0011-Add-xwayland-module.patch b/0010-Add-xwayland-module.patch similarity index 98% rename from 0011-Add-xwayland-module.patch rename to 0010-Add-xwayland-module.patch index e40fa57..c011237 100644 --- a/0011-Add-xwayland-module.patch +++ b/0010-Add-xwayland-module.patch @@ -1,7 +1,7 @@ -From 0831ea9c83af12f497093e2566d94f75c3ba202f Mon Sep 17 00:00:00 2001 +From 4a3354179f4e758971667ac6359080a014dcb033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 18 Sep 2009 22:08:16 -0400 -Subject: [PATCH 11/39] Add xwayland module +Subject: [PATCH 10/38] Add xwayland module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -16,7 +16,7 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from Scott Moreau Tiago Vignatti --- - configure.ac | 15 + + configure.ac | 13 +- hw/xfree86/Makefile.am | 8 +- hw/xfree86/common/xf86Config.c | 28 +- hw/xfree86/common/xf86Globals.c | 2 + @@ -36,7 +36,7 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from hw/xfree86/xwayland/xwayland.c | 392 +++++++++++++++++++++ hw/xfree86/xwayland/xwayland.h | 83 +++++ include/xorg-server.h.in | 3 + - 20 files changed, 2597 insertions(+), 9 deletions(-) + 20 files changed, 2594 insertions(+), 10 deletions(-) create mode 100644 hw/xfree86/xwayland/Makefile.am create mode 100644 hw/xfree86/xwayland/drm.xml create mode 100644 hw/xfree86/xwayland/xserver.xml @@ -50,10 +50,10 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from create mode 100644 hw/xfree86/xwayland/xwayland.h diff --git a/configure.ac b/configure.ac -index 9fb014f..c146b7b 100644 +index 1e6f813..ab693e9 100644 --- a/configure.ac +++ b/configure.ac -@@ -635,6 +635,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg +@@ -636,6 +636,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes]) AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes]) AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes]) @@ -61,7 +61,7 @@ index 9fb014f..c146b7b 100644 dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -1023,6 +1024,14 @@ fi +@@ -1024,6 +1025,14 @@ fi if test "x$MITSHM" = xauto; then MITSHM="$ac_cv_sysv_ipc" fi @@ -76,21 +76,12 @@ index 9fb014f..c146b7b 100644 AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes]) if test "x$MITSHM" = xyes; then AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension]) -@@ -1118,6 +1127,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in - esac - AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) +@@ -1204,12 +1213,13 @@ esac -+<<<<<<< HEAD - PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO, - [HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no]) - -@@ -1177,11 +1187,15 @@ esac AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) - if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then -+======= -+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then -+>>>>>>> Add xwayland module +-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then ++if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then if test "x$DRM" = xyes; then AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) PKG_CHECK_MODULES([LIBDRM], $LIBDRM) @@ -100,7 +91,7 @@ index 9fb014f..c146b7b 100644 if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS -@@ -2352,6 +2366,7 @@ hw/xfree86/dixmods/Makefile +@@ -2399,6 +2409,7 @@ hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile @@ -109,7 +100,7 @@ index 9fb014f..c146b7b 100644 hw/xfree86/exa/man/Makefile hw/xfree86/fbdevhw/Makefile diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index 485386f..ff04b25 100644 +index 15670d0..cf60196 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -14,6 +14,10 @@ DRI3_BUILDDIR = $(top_builddir)/dri3 @@ -2888,12 +2879,12 @@ index 0000000..f268366 + +#endif /* _XWAYLAND_H_ */ diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in -index 960817e..ec43ff7 100644 +index 0c651bf..7f6eba2 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in -@@ -221,4 +221,7 @@ - /* Have support for X shared memory fence library (xshmfence) */ - #undef HAVE_XSHMFENCE +@@ -224,4 +224,7 @@ + /* Use XTrans FD passing support */ + #undef XTRANS_SEND_FDS +/* Building Xorg server. */ +#undef XORG_WAYLAND diff --git a/0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch b/0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch similarity index 91% rename from 0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch rename to 0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch index 3a66a7b..2ea1319 100644 --- a/0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch +++ b/0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch @@ -1,7 +1,7 @@ -From 201d8504ebaa1de7be149089281a7f40cd57bb38 Mon Sep 17 00:00:00 2001 +From 201a3ac6c7cca0eb118cdb41f859d553b85204ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 21 Aug 2013 23:02:58 -0700 -Subject: [PATCH 12/39] xwayland: Add a HW_WAYLAND flag to let drivers +Subject: [PATCH 11/38] xwayland: Add a HW_WAYLAND flag to let drivers explicitly opt-in --- diff --git a/0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch b/0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch similarity index 88% rename from 0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch rename to 0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch index f49b5c8..e30e4d2 100644 --- a/0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch +++ b/0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch @@ -1,7 +1,7 @@ -From a8f7359014b9e604998a2da53764fe99e5c7b784 Mon Sep 17 00:00:00 2001 +From 17318d4351f4bc3e7c91f89d9c1bb061348fbb1b Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 21 Aug 2013 09:53:25 +0200 -Subject: [PATCH 13/39] xwayland-shm: don't create alpha buffers if the window +Subject: [PATCH 12/38] xwayland-shm: don't create alpha buffers if the window doesn't have alpha If the window is using a 24 bit visual, we must request a buffer diff --git a/0014-xwayland-handle-global-object-destruction.patch b/0013-xwayland-handle-global-object-destruction.patch similarity index 98% rename from 0014-xwayland-handle-global-object-destruction.patch rename to 0013-xwayland-handle-global-object-destruction.patch index f28dd1b..c74229b 100644 --- a/0014-xwayland-handle-global-object-destruction.patch +++ b/0013-xwayland-handle-global-object-destruction.patch @@ -1,7 +1,7 @@ -From a7da07002daaa1e1397a3fe32ea3c77df4f15071 Mon Sep 17 00:00:00 2001 +From 44131ac8626d8397bf40adf3511bf0b92909f94f Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 21 Aug 2013 09:53:26 +0200 -Subject: [PATCH 14/39] xwayland: handle global object destruction +Subject: [PATCH 13/38] xwayland: handle global object destruction Certain global objects, such as outputs, can be destroyed during the session. We must handle that and not crash. diff --git a/0015-xwayland-add-support-for-multiple-outputs.patch b/0014-xwayland-add-support-for-multiple-outputs.patch similarity index 98% rename from 0015-xwayland-add-support-for-multiple-outputs.patch rename to 0014-xwayland-add-support-for-multiple-outputs.patch index 27652e7..e1bd140 100644 --- a/0015-xwayland-add-support-for-multiple-outputs.patch +++ b/0014-xwayland-add-support-for-multiple-outputs.patch @@ -1,7 +1,7 @@ -From b4354c5a6d8587c079f52e3363b339558f5832a7 Mon Sep 17 00:00:00 2001 +From 0d1ec467dd566895b5a71b02f8851a89f8a7512c Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Thu, 22 Aug 2013 16:23:48 +0200 -Subject: [PATCH 15/39] xwayland: add support for multiple outputs +Subject: [PATCH 14/38] xwayland: add support for multiple outputs Drop xf86InitialConfiguration, which just gets in the way of the compositor doing its own output arrangement, and transform diff --git a/0016-xwayland-Probe-outputs-on-preinit.patch b/0015-xwayland-Probe-outputs-on-preinit.patch similarity index 90% rename from 0016-xwayland-Probe-outputs-on-preinit.patch rename to 0015-xwayland-Probe-outputs-on-preinit.patch index 8311b67..e6ae850 100644 --- a/0016-xwayland-Probe-outputs-on-preinit.patch +++ b/0015-xwayland-Probe-outputs-on-preinit.patch @@ -1,7 +1,7 @@ -From 6c0e4bfda0aca061d51b8f29ad01cadc963c42f6 Mon Sep 17 00:00:00 2001 +From ab2bf3a98241bc7a8e8a3d09b780dd8f975def8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sun, 1 Sep 2013 23:14:43 +0200 -Subject: [PATCH 16/39] xwayland: Probe outputs on preinit +Subject: [PATCH 15/38] xwayland: Probe outputs on preinit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch b/0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch similarity index 95% rename from 0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch rename to 0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch index 32534ba..4b5fe41 100644 --- a/0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch +++ b/0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch @@ -1,7 +1,7 @@ -From 11a0bb26adf1a5daf6805c0973bc3bef009c53b1 Mon Sep 17 00:00:00 2001 +From 2553d412bf0b9c6dbf7a46dd8596ff7b9387e713 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 16 Aug 2013 13:21:21 +0100 -Subject: [PATCH 17/39] XFree86: Load wlshm driver as fallback for Wayland +Subject: [PATCH 16/38] XFree86: Load wlshm driver as fallback for Wayland Since fbdev or vesa are unlikely to be too useful there ... diff --git a/0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch b/0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch similarity index 89% rename from 0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch rename to 0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch index 559ead6..0ef19c6 100644 --- a/0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch +++ b/0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch @@ -1,7 +1,7 @@ -From c8cd8d2f034af7d390f721484e340e66cdcf0ec0 Mon Sep 17 00:00:00 2001 +From c928d93ae7f803f1bda0bc0dca4d1ca3c580d28d Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 7 Nov 2012 17:22:42 +1100 -Subject: [PATCH 18/39] XWayland: Don't send out-of-bounds damage co-ordinates +Subject: [PATCH 17/38] XWayland: Don't send out-of-bounds damage co-ordinates Make sure we don't send damage regions larger than the buffer. diff --git a/0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch b/0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch similarity index 60% rename from 0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch rename to 0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch index 64eb4a6..10c6d15 100644 --- a/0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch +++ b/0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch @@ -1,18 +1,18 @@ -From 4950f4b3973a9391a674fedd02dc364abe0f121e Mon Sep 17 00:00:00 2001 +From d5a81751ea614f75bd4b53fea562667f3fa16c9b Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 16 Oct 2012 17:14:01 +1100 -Subject: [PATCH 19/39] xwayland: Introduce an auto mode for --enable-wayland +Subject: [PATCH 18/38] xwayland: Introduce an auto mode for --enable-wayland Signed-off-by: Daniel Stone --- - configure.ac | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + configure.ac | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index c146b7b..5cb4f5d 100644 +index ab693e9..3699525 100644 --- a/configure.ac +++ b/configure.ac -@@ -635,7 +635,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg +@@ -636,7 +636,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes]) AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes]) AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes]) @@ -21,7 +21,7 @@ index c146b7b..5cb4f5d 100644 dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -1025,12 +1025,16 @@ if test "x$MITSHM" = xauto; then +@@ -1026,12 +1026,16 @@ if test "x$MITSHM" = xauto; then MITSHM="$ac_cv_sysv_ipc" fi @@ -40,26 +40,6 @@ index c146b7b..5cb4f5d 100644 AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes]) if test "x$MITSHM" = xyes; then -@@ -1127,7 +1131,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in - esac - AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) - --<<<<<<< HEAD - PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO, - [HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no]) - -@@ -1186,10 +1189,7 @@ esac - - AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) - --if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then --======= --if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then -->>>>>>> Add xwayland module -+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then - if test "x$DRM" = xyes; then - AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) - PKG_CHECK_MODULES([LIBDRM], $LIBDRM) -- 1.8.3.1 diff --git a/0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch b/0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch similarity index 91% rename from 0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch rename to 0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch index cca46a9..e0be897 100644 --- a/0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch +++ b/0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch @@ -1,7 +1,7 @@ -From 7e4dd0de5b558a4a93ca9572c74af10117a9f50e Mon Sep 17 00:00:00 2001 +From fe84a03afbc5d5b80735d106f699139d44769af0 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 7 Nov 2012 17:15:13 +1100 -Subject: [PATCH 20/39] XWayland: Don't hardcode DRM libs and -lwayland-client +Subject: [PATCH 19/38] XWayland: Don't hardcode DRM libs and -lwayland-client Take -lwayland-client from configure.ac, and only use DRM if we've actually asked for it. diff --git a/0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch b/0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch similarity index 95% rename from 0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch rename to 0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch index e6a43d9..f6abe4a 100644 --- a/0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch +++ b/0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch @@ -1,7 +1,7 @@ -From d99536639333fb9d90a296196395ba96ffe22d96 Mon Sep 17 00:00:00 2001 +From b69be44270c90b9048505d5b18930c1ac18e9ddc Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 16 Aug 2013 13:51:08 +0100 -Subject: [PATCH 21/39] XWayland: Support 16bpp X surfaces in DRM/SHM +Subject: [PATCH 20/38] XWayland: Support 16bpp X surfaces in DRM/SHM Properly look at the window's visual to determine which format we should use for allocation. diff --git a/0022-xwayland-Remove-Xdnd-selection-watching-code.patch b/0021-xwayland-Remove-Xdnd-selection-watching-code.patch similarity index 93% rename from 0022-xwayland-Remove-Xdnd-selection-watching-code.patch rename to 0021-xwayland-Remove-Xdnd-selection-watching-code.patch index 548de11..64c1e78 100644 --- a/0022-xwayland-Remove-Xdnd-selection-watching-code.patch +++ b/0021-xwayland-Remove-Xdnd-selection-watching-code.patch @@ -1,7 +1,7 @@ -From 8157fe1fecd6696a534fef89bc4a1c12ff8f2818 Mon Sep 17 00:00:00 2001 +From fdb47d16148e7cd2a4a7cc1d16fbd4a3b382046e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 11 Sep 2013 11:15:18 -0700 -Subject: [PATCH 22/39] xwayland: Remove Xdnd selection watching code +Subject: [PATCH 21/38] xwayland: Remove Xdnd selection watching code We don't need this in the server, the wm can manage dnd proxying. --- diff --git a/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch b/0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch similarity index 88% rename from 0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch rename to 0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch index 75badd3..cf3f5bd 100644 --- a/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch +++ b/0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch @@ -1,7 +1,7 @@ -From 0d8af023c8037f9d6a219ec38da11e5e473a9610 Mon Sep 17 00:00:00 2001 +From cbca006b92b1ef56966b07e0573f9f068891cee5 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 13 Sep 2013 17:17:16 -0400 -Subject: [PATCH 23/39] xf86Init: trim out non-wayland capable servers from +Subject: [PATCH 22/38] xf86Init: trim out non-wayland capable servers from drive list Otherwise they'll cause the server to crash when run in wayland mode. diff --git a/0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch b/0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch similarity index 54% rename from 0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch rename to 0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch index 157da15..e1fd0f6 100644 --- a/0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch +++ b/0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch @@ -1,23 +1,26 @@ -From ef4f0c33441998d31776b4e05ac637c8e2571219 Mon Sep 17 00:00:00 2001 +From e3fc1ac8cd899868f1679671380a484d61ec4882 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 13 Sep 2013 15:52:29 +0200 -Subject: [PATCH 24/39] Add XORG_WAYLAND symbol to xorg-config.h.in +Subject: [PATCH 23/38] Add XORG_WAYLAND symbol to xorg-config.h.in We manually duplicate symbols that we want in both xorg-server.h and xorg-config.h. XORG_WAYLAND is one such symbol, but it was missing from xorg-config.h.in. --- - include/xorg-config.h.in | 3 +++ - 1 file changed, 3 insertions(+) + include/xorg-config.h.in | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in -index e3444da..a35a9b0 100644 +index 487d7ad..a35a9b0 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in -@@ -148,4 +148,7 @@ - /* Have support for X shared memory fence library (xshmfence) */ - #undef HAVE_XSHMFENCE +@@ -145,4 +145,10 @@ + /* Support APM/ACPI power management in the server */ + #undef XF86PM ++/* Have support for X shared memory fence library (xshmfence) */ ++#undef HAVE_XSHMFENCE ++ +/* Building Xorg server. */ +#undef XORG_WAYLAND + diff --git a/0025-Fix-fallback-loading-of-the-wayland-driver.patch b/0024-Fix-fallback-loading-of-the-wayland-driver.patch similarity index 91% rename from 0025-Fix-fallback-loading-of-the-wayland-driver.patch rename to 0024-Fix-fallback-loading-of-the-wayland-driver.patch index dec5d4c..de23b92 100644 --- a/0025-Fix-fallback-loading-of-the-wayland-driver.patch +++ b/0024-Fix-fallback-loading-of-the-wayland-driver.patch @@ -1,7 +1,7 @@ -From 3b4990d5042c9e6520fa1bd6ff2be696243b3792 Mon Sep 17 00:00:00 2001 +From 1df7c26010720e669d416b442e168002d7502d9d Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 13 Sep 2013 15:52:30 +0200 -Subject: [PATCH 25/39] Fix fallback loading of the wayland driver +Subject: [PATCH 24/38] Fix fallback loading of the wayland driver Fix the array name to actually compile, and fix the driver name with the new upstream. diff --git a/0026-xwayland-Don-t-include-xorg-server.h.patch b/0025-xwayland-Don-t-include-xorg-server.h.patch similarity index 93% rename from 0026-xwayland-Don-t-include-xorg-server.h.patch rename to 0025-xwayland-Don-t-include-xorg-server.h.patch index bf535f7..82afb65 100644 --- a/0026-xwayland-Don-t-include-xorg-server.h.patch +++ b/0025-xwayland-Don-t-include-xorg-server.h.patch @@ -1,7 +1,7 @@ -From 2ee348cc8b94f823f84eea4024b26beb16d49f22 Mon Sep 17 00:00:00 2001 +From 84fe9bdf95a03d7998132892899549a5233f619a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 13 Sep 2013 14:52:13 -0700 -Subject: [PATCH 26/39] xwayland: Don't include xorg-server.h +Subject: [PATCH 25/38] xwayland: Don't include xorg-server.h xorg-config.h now has the XORG_WAYLAND define. --- diff --git a/0027-os-Don-t-include-xorg-server.h.patch b/0026-os-Don-t-include-xorg-server.h.patch similarity index 87% rename from 0027-os-Don-t-include-xorg-server.h.patch rename to 0026-os-Don-t-include-xorg-server.h.patch index 7b129de..6d9f67d 100644 --- a/0027-os-Don-t-include-xorg-server.h.patch +++ b/0026-os-Don-t-include-xorg-server.h.patch @@ -1,7 +1,7 @@ -From 064a8d7f03e8576be8d581a197efe12d319304e6 Mon Sep 17 00:00:00 2001 +From e02033116fe579a14e1ca499ff407b99178b1afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 13 Sep 2013 14:53:16 -0700 -Subject: [PATCH 27/39] os: Don't include xorg-server.h +Subject: [PATCH 26/38] os: Don't include xorg-server.h Just always compile in ListenOnOpenFD and AddClientOnOpenFD, they don't depend on anything from Quartz or Wayland. diff --git a/0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch b/0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch similarity index 76% rename from 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch rename to 0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch index 421bcff..e9822bb 100644 --- a/0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch +++ b/0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch @@ -1,7 +1,7 @@ -From cc29e0dc978c1aea7b989c69a6512a80e2acf071 Mon Sep 17 00:00:00 2001 +From 7b45766152d2600279129722331df380f70a57ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 13 Sep 2013 15:16:31 -0700 -Subject: [PATCH 28/39] os: Also define ListenOnOpenFD and AddClientOnOpenFD +Subject: [PATCH 27/38] os: Also define ListenOnOpenFD and AddClientOnOpenFD unconditionally Remove the #ifdef from the header file as well. @@ -10,10 +10,10 @@ Remove the #ifdef from the header file as well. 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/os.h b/include/os.h -index 4d4a0d6..4752d15 100644 +index 2a24f4b..542ca64 100644 --- a/include/os.h +++ b/include/os.h -@@ -164,10 +164,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ ); +@@ -166,10 +166,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ ); extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ ); diff --git a/0029-xwayland-Remove-unused-variables.patch b/0028-xwayland-Remove-unused-variables.patch similarity index 84% rename from 0029-xwayland-Remove-unused-variables.patch rename to 0028-xwayland-Remove-unused-variables.patch index f1c83b3..bb05860 100644 --- a/0029-xwayland-Remove-unused-variables.patch +++ b/0028-xwayland-Remove-unused-variables.patch @@ -1,7 +1,7 @@ -From 74f9b7e691aef5e3f340cddd8acb2a5e20be7f42 Mon Sep 17 00:00:00 2001 +From 190d17d13dcb7a784e80edc5564cb80b9ccf3b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 16 Sep 2013 11:51:57 -0700 -Subject: [PATCH 29/39] xwayland: Remove unused variables +Subject: [PATCH 28/38] xwayland: Remove unused variables --- hw/xfree86/xwayland/xwayland-window.c | 3 --- diff --git a/0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch b/0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch similarity index 95% rename from 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch rename to 0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch index cd87aa2..61c0696 100644 --- a/0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch +++ b/0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch @@ -1,7 +1,7 @@ -From 4587f79c2b5b191d450a97c8951771e98f237316 Mon Sep 17 00:00:00 2001 +From 7da89f1639cd65a114cfc97e5556a5c238c2cac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 16 Sep 2013 12:05:19 -0700 -Subject: [PATCH 30/39] xwayland: Use a per-screen private key for cursor +Subject: [PATCH 29/38] xwayland: Use a per-screen private key for cursor privates The cursor is a per-display object, so we need to set private data on it diff --git a/0031-XWayland-Don-t-commit-empty-surfaces.patch b/0030-XWayland-Don-t-commit-empty-surfaces.patch similarity index 89% rename from 0031-XWayland-Don-t-commit-empty-surfaces.patch rename to 0030-XWayland-Don-t-commit-empty-surfaces.patch index 80eb9aa..622807e 100644 --- a/0031-XWayland-Don-t-commit-empty-surfaces.patch +++ b/0030-XWayland-Don-t-commit-empty-surfaces.patch @@ -1,7 +1,7 @@ -From 274388f6055f0fe33654113b6c2eb09551f20c2b Mon Sep 17 00:00:00 2001 +From 6ffe400e53f9dc7f66b8f2588cc766f4254a39da Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 12 Sep 2013 16:58:00 -0400 -Subject: [PATCH 31/39] XWayland: Don't commit empty surfaces +Subject: [PATCH 30/38] XWayland: Don't commit empty surfaces Instead of attaching, damaging and then committing a new buffer as soon as we allocate a pixmap, just attach and damage the entire buffer. When diff --git a/0032-xwayland-Also-look-for-wlglamor.patch b/0031-xwayland-Also-look-for-wlglamor.patch similarity index 84% rename from 0032-xwayland-Also-look-for-wlglamor.patch rename to 0031-xwayland-Also-look-for-wlglamor.patch index 253ec06..c3cdb8e 100644 --- a/0032-xwayland-Also-look-for-wlglamor.patch +++ b/0031-xwayland-Also-look-for-wlglamor.patch @@ -1,7 +1,7 @@ -From 8742e0ca22257c2c028fbe434ba81a3859a9bf94 Mon Sep 17 00:00:00 2001 +From 448ecd81741144f039d41feeca0319c70954e847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 11 Oct 2013 16:14:54 -0700 -Subject: [PATCH 32/39] xwayland: Also look for wlglamor +Subject: [PATCH 31/38] xwayland: Also look for wlglamor --- hw/xfree86/common/xf86AutoConfig.c | 1 + diff --git a/0033-xwayland-Add-wlglamor-the-right-way.patch b/0032-xwayland-Add-wlglamor-the-right-way.patch similarity index 88% rename from 0033-xwayland-Add-wlglamor-the-right-way.patch rename to 0032-xwayland-Add-wlglamor-the-right-way.patch index 0188dea..586ffa5 100644 --- a/0033-xwayland-Add-wlglamor-the-right-way.patch +++ b/0032-xwayland-Add-wlglamor-the-right-way.patch @@ -1,7 +1,7 @@ -From 4a8be9e6f0b389d6e2c883dbf9bceb1f8403ac75 Mon Sep 17 00:00:00 2001 +From b7fccf0d62ecf16ad591270ed5130241f005b635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 11 Oct 2013 16:29:02 -0700 -Subject: [PATCH 33/39] xwayland: Add wlglamor the right way +Subject: [PATCH 32/38] xwayland: Add wlglamor the right way Defeated by #ifdefs. --- diff --git a/0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch b/0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch similarity index 95% rename from 0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch rename to 0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch index a2edef4..5d37396 100644 --- a/0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch +++ b/0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch @@ -1,7 +1,7 @@ -From 52668595cb7e52612944a77276eb71f29d037738 Mon Sep 17 00:00:00 2001 +From a7ba08d345c1f545f1f8711f5b6ec6b4f13865f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 11 Oct 2013 15:41:59 -0700 -Subject: [PATCH 34/39] xwayland: Don't redirect windows, leave it to the wm +Subject: [PATCH 33/38] xwayland: Don't redirect windows, leave it to the wm --- hw/xfree86/xwayland/xwayland-window.c | 51 ----------------------------------- diff --git a/0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch b/0034-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch similarity index 94% rename from 0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch rename to 0034-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch index 452b478..d328e74 100644 --- a/0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch +++ b/0034-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch @@ -1,7 +1,7 @@ -From f7a01c6db6f3aaf161b1c057633a4e53adf8b62b Mon Sep 17 00:00:00 2001 +From 01ddf1dada61d3939b3b7188d1ddbef83ce2628b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 11 Oct 2013 16:40:39 -0700 -Subject: [PATCH 35/39] Revert "Export CompositeRedirectSubwindows and +Subject: [PATCH 34/38] Revert "Export CompositeRedirectSubwindows and CompositeUnRedirectSubwindows" This reverts commit 15a7e62a9848f2089180c49b02887565d29bb896. diff --git a/0036-xwayland-Fix-hidden-cursor.patch b/0035-xwayland-Fix-hidden-cursor.patch similarity index 90% rename from 0036-xwayland-Fix-hidden-cursor.patch rename to 0035-xwayland-Fix-hidden-cursor.patch index aaaca8f..818ddc8 100644 --- a/0036-xwayland-Fix-hidden-cursor.patch +++ b/0035-xwayland-Fix-hidden-cursor.patch @@ -1,7 +1,7 @@ -From 48552ee6143a7fd576b746cce1ed2580d25a5bce Mon Sep 17 00:00:00 2001 +From b6d7459e27814c23292e9e7172bb6f95b4aadd2b Mon Sep 17 00:00:00 2001 From: Trevor McCort Date: Tue, 15 Oct 2013 19:41:12 -0500 -Subject: [PATCH 36/39] xwayland: Fix hidden cursor +Subject: [PATCH 35/38] xwayland: Fix hidden cursor If a cursor is set when bits->emptyMask is true, the xserver sets a NULL cursor instead. diff --git a/0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch b/0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch similarity index 96% rename from 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch rename to 0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch index 2c666d1..202f130 100644 --- a/0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch +++ b/0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch @@ -1,7 +1,7 @@ -From 2a58c1c5cc8db21252838b6aacb14986850f1ddd Mon Sep 17 00:00:00 2001 +From 1a1c70ed93c53c340c54ee673bc631ea459a4bfa Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Tue, 22 Oct 2013 16:50:29 +0200 -Subject: [PATCH 37/39] xkb: Repurpose XkbCopyDeviceKeymap to apply a given +Subject: [PATCH 36/38] xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device This will also make it useful for cases when we have a new keymap to diff --git a/0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch b/0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch similarity index 95% rename from 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch rename to 0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch index d118949..3c6b0fa 100644 --- a/0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch +++ b/0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch @@ -1,7 +1,7 @@ -From bcbc8bf3a7ed433cb6424deca845f49d3b744339 Mon Sep 17 00:00:00 2001 +From a409085a514770bf8316f44af3c0697ba0ed516a Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 21 Oct 2013 14:41:53 +0200 -Subject: [PATCH 38/39] xkb: Factor out a function to copy a keymap's controls +Subject: [PATCH 37/38] xkb: Factor out a function to copy a keymap's controls unto another --- diff --git a/0039-xwayland-Handle-keymap-changes.patch b/0038-xwayland-Handle-keymap-changes.patch similarity index 95% rename from 0039-xwayland-Handle-keymap-changes.patch rename to 0038-xwayland-Handle-keymap-changes.patch index dcbb345..993444d 100644 --- a/0039-xwayland-Handle-keymap-changes.patch +++ b/0038-xwayland-Handle-keymap-changes.patch @@ -1,7 +1,7 @@ -From d43a01c9cb622ea7300614dce3d0752e21ca180a Mon Sep 17 00:00:00 2001 +From 8263ec0fe27eb573e50485112e97f56f61d443b4 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 21 Oct 2013 14:41:54 +0200 -Subject: [PATCH 39/39] xwayland: Handle keymap changes +Subject: [PATCH 38/38] xwayland: Handle keymap changes --- hw/xfree86/xwayland/xwayland-input.c | 39 +++++++++++++++++++++++++++++++++--- @@ -70,7 +70,7 @@ index d031b34..ebf1af1 100644 } diff --git a/include/input.h b/include/input.h -index 6573a3a..1edcedc 100644 +index b1cc3ff..6a814c2 100644 --- a/include/input.h +++ b/include/input.h @@ -508,7 +508,7 @@ extern int AttachDevice(ClientPtr client, diff --git a/sources b/sources index b9c99af..fabb4d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69ace33c5403088f356c7ffd7c223839 xorg-server-1.14.99.901.tar.bz2 +57b14ddab3693ce48eafcb9607a87353 xorg-server-1.14.99.902.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 96a00fb..9896262 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,7 +8,7 @@ # format, and add a PatchN: line. If you want to push something upstream, # check out the master branch, pull, cherry-pick, and push. -%global gitdate 20131101 +%global gitdate 20131118 %global stable_abi 0 %if !0%{?gitdate} || %{stable_abi} @@ -41,8 +41,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.14.99.901 -Release: 5%{?gitdate:.%{gitdate}}%{dist} +Version: 1.14.99.902 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -75,11 +75,15 @@ Source31: xserver-sdk-abi-requires.git Source40: driver-abi-rebuild.sh # sync with tip -Patch0001: 0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch -Patch0002: 0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch -Patch0003: 0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch -Patch0004: 0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch -Patch0005: 0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch +Patch0001: 0001-ephyr-xcb_connect-returns-an-error-not-NULL.patch +Patch0002: 0002-kdrive-handle-WxH-as-valid-geometry-spec.patch +Patch0003: 0003-kdrive-modify-ephyr-events-to-use-POINTER_DESKTOP-an.patch +Patch0004: 0004-kdrive-fix-cursor-jumps-on-CursorOffScreen-behavior.patch +Patch0005: 0005-Stop-including-inline-assembly-.il-file-for-Solaris-.patch +Patch0006: 0006-include-export-key_is_down-and-friends.patch +Patch0007: 0007-test-build-the-touch-test-only-when-building-Xorg.patch +Patch0008: 0008-xfree86-return-NULL-for-compat-output-if-no-outputs.patch +Patch0009: 0009-mieq-Bump-default-queue-size-to-512.patch # xwayland. trivial rebase onto master: # http://cgit.freedesktop.org/~ajax/xserver/log/?h=wl-rebase-for-f20 @@ -87,41 +91,40 @@ Patch0101: 0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch Patch0102: 0002-xkb-Add-struct-XkbCompContext.patch Patch0103: 0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch Patch0104: 0004-xkb-Add-XkbCompileKeymapFromString.patch -Patch0105: 0005-configure-Track-updated-version-of-libxtrans.patch -Patch0106: 0006-os-Add-a-function-to-create-a-client-for-an-fd.patch -Patch0107: 0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch -Patch0108: 0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch -Patch0109: 0009-Add-redirect-window-for-input-device-feature.patch -Patch0110: 0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch -Patch0111: 0011-Add-xwayland-module.patch -Patch0112: 0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch -Patch0113: 0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch -Patch0114: 0014-xwayland-handle-global-object-destruction.patch -Patch0115: 0015-xwayland-add-support-for-multiple-outputs.patch -Patch0116: 0016-xwayland-Probe-outputs-on-preinit.patch -Patch0117: 0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch -Patch0118: 0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch -Patch0119: 0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch -Patch0120: 0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch -Patch0121: 0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch -Patch0122: 0022-xwayland-Remove-Xdnd-selection-watching-code.patch -Patch0123: 0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch -Patch0124: 0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch -Patch0125: 0025-Fix-fallback-loading-of-the-wayland-driver.patch -Patch0126: 0026-xwayland-Don-t-include-xorg-server.h.patch -Patch0127: 0027-os-Don-t-include-xorg-server.h.patch -Patch0128: 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch -Patch0129: 0029-xwayland-Remove-unused-variables.patch -Patch0130: 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch -Patch0131: 0031-XWayland-Don-t-commit-empty-surfaces.patch -Patch0132: 0032-xwayland-Also-look-for-wlglamor.patch -Patch0133: 0033-xwayland-Add-wlglamor-the-right-way.patch -Patch0134: 0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch -Patch0135: 0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch -Patch0136: 0036-xwayland-Fix-hidden-cursor.patch -Patch0137: 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch -Patch0138: 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch -Patch0139: 0039-xwayland-Handle-keymap-changes.patch +Patch0105: 0005-os-Add-a-function-to-create-a-client-for-an-fd.patch +Patch0106: 0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch +Patch0107: 0007-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch +Patch0108: 0008-Add-redirect-window-for-input-device-feature.patch +Patch0109: 0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch +Patch0110: 0010-Add-xwayland-module.patch +Patch0111: 0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch +Patch0112: 0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch +Patch0113: 0013-xwayland-handle-global-object-destruction.patch +Patch0114: 0014-xwayland-add-support-for-multiple-outputs.patch +Patch0115: 0015-xwayland-Probe-outputs-on-preinit.patch +Patch0116: 0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch +Patch0117: 0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch +Patch0118: 0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch +Patch0119: 0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch +Patch0120: 0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch +Patch0121: 0021-xwayland-Remove-Xdnd-selection-watching-code.patch +Patch0122: 0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch +Patch0123: 0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch +Patch0124: 0024-Fix-fallback-loading-of-the-wayland-driver.patch +Patch0125: 0025-xwayland-Don-t-include-xorg-server.h.patch +Patch0126: 0026-os-Don-t-include-xorg-server.h.patch +Patch0127: 0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch +Patch0128: 0028-xwayland-Remove-unused-variables.patch +Patch0129: 0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch +Patch0130: 0030-XWayland-Don-t-commit-empty-surfaces.patch +Patch0131: 0031-xwayland-Also-look-for-wlglamor.patch +Patch0132: 0032-xwayland-Add-wlglamor-the-right-way.patch +Patch0133: 0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch +Patch0134: 0034-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch +Patch0135: 0035-xwayland-Fix-hidden-cursor.patch +Patch0136: 0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch +Patch0137: 0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch +Patch0138: 0038-xwayland-Handle-keymap-changes.patch # restore ABI Patch0200: 0001-mustard-Restore-XkbCopyDeviceKeymap.patch @@ -137,19 +140,11 @@ Patch6030: xserver-1.6.99-right-of.patch # RedHat/Fedora-specific patch Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch -# needed when building without xorg (aka s390x) -Patch7017: xserver-1.12.2-xorg-touch-test.patch - Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch # do not upstream - do not even use here yet Patch7027: xserver-autobind-hotplug.patch -Patch7052: 0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch - -# mustard: make the default queue length bigger to calm abrt down -Patch7064: 0001-mieq-Bump-default-queue-size-to-512.patch - # Fix multiple monitors in reverse optimus configurations Patch8040: 0001-rrcrtc-brackets-are-hard-lets-go-shopping.patch Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch @@ -158,9 +153,6 @@ Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch Patch9001: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch Patch9002: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch -# submitted: http://lists.x.org/archives/xorg-devel/2013-November/038768.html -Patch9003: 0001-present-Don-t-try-to-initialize-when-building-withou.patch - # also submitted Patch9011: 0001-xinerama-Export-the-screen-region.patch Patch9012: 0002-dix-Add-PostDispatchCallback.patch @@ -664,6 +656,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Nov 18 2013 Adam Jackson 1.14.99.902-1 +- 1.15RC2 + * Fri Nov 08 2013 Adam Jackson 1.14.99.901-5 - Restore XkbCopyDeviceKeymap for (older) tigervnc