[xorg-x11-server] 1.15RC4
Adam Jackson
ajax at fedoraproject.org
Tue Dec 17 15:17:35 UTC 2013
commit 48dc8f4c68a571a35d62484e7114752efafa3504
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Dec 17 10:17:41 2013 -0500
1.15RC4
- Re-disable int10 on arm
...e-Fix-a-typo-near-dri3-shmfence-detection.patch | 28 +
...nup-in-CloseScreen-hook-not-ext-CloseDown.patch | 4 +-
...hyr-xcb_connect-returns-an-error-not-NULL.patch | 29 -
...nt-recursively-set-window-pixmaps-on-flip.patch | 93 +++
0001-xfree86-Prefer-fbdev-to-vesa.patch | 62 --
0001-xinerama-Export-the-screen-region.patch | 42 --
0002-dix-Add-PostDispatchCallback.patch | 60 --
...-kdrive-handle-WxH-as-valid-geometry-spec.patch | 36 --
0002-xkb-Add-struct-XkbCompContext.patch | 4 +-
0003-damageext-Xineramify-v6.patch | 630 --------------------
...fy-ephyr-events-to-use-POINTER_DESKTOP-an.patch | 70 ---
...plit-out-code-to-start-and-finish-xkbcomp.patch | 4 +-
0004-composite-Fix-COW-creation-for-Xinerama.patch | 35 --
...-cursor-jumps-on-CursorOffScreen-behavior.patch | 64 --
0004-xkb-Add-XkbCompileKeymapFromString.patch | 4 +-
...ing-inline-assembly-.il-file-for-Solaris-.patch | 102 ----
...anoramiXSetPictureClipRegion-for-window-p.patch | 55 --
...d-a-function-to-create-a-client-for-an-fd.patch | 8 +-
...-xf86NewInputDevice-and-xf86AllocateInput.patch | 4 +-
0006-fixes-Fix-PanoramiXSetWindowShapeRegion.patch | 50 --
0006-include-export-key_is_down-and-friends.patch | 41 --
...-redirect-window-for-input-device-feature.patch | 6 +-
...ositeRedirectSubwindows-and-CompositeUnRe.patch | 65 --
...ld-the-touch-test-only-when-building-Xorg.patch | 36 --
...uce-a-third-version-of-the-AuthMagic-func.patch | 8 +-
...turn-NULL-for-compat-output-if-no-outputs.patch | 32 -
...-module.patch => 0009-Add-xwayland-module.patch | 27 +-
0009-mieq-Bump-default-queue-size-to-512.patch | 46 --
...d-a-HW_WAYLAND-flag-to-let-drivers-explic.patch | 6 +-
...m-don-t-create-alpha-buffers-if-the-windo.patch | 6 +-
...xwayland-handle-global-object-destruction.patch | 6 +-
...xwayland-add-support-for-multiple-outputs.patch | 6 +-
...=> 0014-xwayland-Probe-outputs-on-preinit.patch | 6 +-
...Load-wlshm-driver-as-fallback-for-Wayland.patch | 16 +-
...n-t-send-out-of-bounds-damage-co-ordinate.patch | 6 +-
...Introduce-an-auto-mode-for-enable-wayland.patch | 12 +-
...n-t-hardcode-DRM-libs-and-lwayland-client.patch | 6 +-
...yland-Support-16bpp-X-surfaces-in-DRM-SHM.patch | 6 +-
...yland-Remove-Xdnd-selection-watching-code.patch | 6 +-
...im-out-non-wayland-capable-servers-from-d.patch | 6 +-
...d-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch | 25 +-
...ix-fallback-loading-of-the-wayland-driver.patch | 14 +-
...0024-xwayland-Don-t-include-xorg-server.h.patch | 8 +-
...ch => 0025-os-Don-t-include-xorg-server.h.patch | 6 +-
...ine-ListenOnOpenFD-and-AddClientOnOpenFD-.patch | 8 +-
... => 0027-xwayland-Remove-unused-variables.patch | 8 +-
...e-a-per-screen-private-key-for-cursor-pri.patch | 6 +-
...0029-XWayland-Don-t-commit-empty-surfaces.patch | 8 +-
...h => 0030-xwayland-Also-look-for-wlglamor.patch | 10 +-
... 0031-xwayland-Add-wlglamor-the-right-way.patch | 10 +-
...Don-t-redirect-windows-leave-it-to-the-wm.patch | 10 +-
....patch => 0033-xwayland-Fix-hidden-cursor.patch | 6 +-
...rt-CompositeRedirectSubwindows-and-Compos.patch | 68 ---
...se-XkbCopyDeviceKeymap-to-apply-a-given-k.patch | 6 +-
...out-a-function-to-copy-a-keymap-s-control.patch | 6 +-
...ch => 0036-xwayland-Handle-keymap-changes.patch | 6 +-
...xwayland-Fix-re-wrapping-of-RealizeWindow.patch | 25 +
0038-xwayland-Adapt-to-1.15-Damage-API.patch | 24 +
driver-abi-rebuild.sh | 6 +-
sources | 2 +-
xorg-x11-server.spec | 144 ++---
xserver-1.12-Xext-fix-selinux-build-failure.patch | 52 --
62 files changed, 385 insertions(+), 1806 deletions(-)
---
diff --git a/0001-configure-Fix-a-typo-near-dri3-shmfence-detection.patch b/0001-configure-Fix-a-typo-near-dri3-shmfence-detection.patch
new file mode 100644
index 0000000..7132fa0
--- /dev/null
+++ b/0001-configure-Fix-a-typo-near-dri3-shmfence-detection.patch
@@ -0,0 +1,28 @@
+From 53271cd4c761e884dd9060912e000b07bbaf0c3a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 12 Dec 2013 10:57:40 -0500
+Subject: [PATCH] configure: Fix a typo near dri3/shmfence detection
+
+" is not the mate of ].
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8bedd35..3f2c2d0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1218,7 +1218,7 @@ case "$DRI3,$HAVE_XSHMFENCE" in
+ yes,yes | auto,yes)
+ ;;
+ yes,no)
+- AC_MSG_ERROR("DRI3 requested, but xshmfence not found.])
++ AC_MSG_ERROR([DRI3 requested, but xshmfence not found.])
+ DRI3=no
+ ;;
+ no,*)
+--
+1.8.4.2
+
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 86f4d18..eebbee4 100644
--- a/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
+++ b/0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
@@ -1,4 +1,4 @@
-From 893eb3b6920b8e703f2e10c1c71cd0f788bfb468 Mon Sep 17 00:00:00 2001
+From bd6c61de441087b808a45ff3fea4fe5a31455c5c Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert at linux.intel.com>
Date: Thu, 12 Jan 2012 18:16:08 +0000
Subject: [PATCH 01/38] dbe: Cleanup in CloseScreen hook not ext CloseDown
@@ -121,5 +121,5 @@ index 2002066..7733d0e 100644
/* Per-screen DIX routines */
Bool (*SetupBackgroundPainter) (WindowPtr /*pWin */ ,
--
-1.8.3.1
+1.8.4.2
diff --git a/0001-present-recursively-set-window-pixmaps-on-flip.patch b/0001-present-recursively-set-window-pixmaps-on-flip.patch
new file mode 100644
index 0000000..c59fc3f
--- /dev/null
+++ b/0001-present-recursively-set-window-pixmaps-on-flip.patch
@@ -0,0 +1,93 @@
+From fe07ec19e212a68076560d243a2a935c54589068 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp at keithp.com>
+Date: Tue, 10 Dec 2013 11:27:47 -0800
+Subject: [PATCH] present: recursively set window pixmaps on flip
+
+Newly created windows inherit the pixmap of their parent, similarly,
+reparenting a tree inherits the pixmap of the destination tree.
+
+Making present preserve the invariant that unredirected windows always
+have the same pixmap as their parent ensures that the above cases work
+correctly.
+
+v2: name the recursive function to 'set_tree_pixmap' instead of 'set_window_pixmap'
+
+Signed-off-by: Keith Packard <keithp at keithp.com>
+Reviewed-by: Adam Jackson <ajax at redhat.com>
+---
+ present/present.c | 44 +++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 37 insertions(+), 7 deletions(-)
+
+diff --git a/present/present.c b/present/present.c
+index ffbb0b3..50bd055 100644
+--- a/present/present.c
++++ b/present/present.c
+@@ -312,6 +312,36 @@ present_flip_idle(ScreenPtr screen)
+ }
+ }
+
++struct pixmap_visit {
++ PixmapPtr old;
++ PixmapPtr new;
++};
++
++static int
++present_set_tree_pixmap_visit(WindowPtr window, pointer data)
++{
++ struct pixmap_visit *visit = data;
++ ScreenPtr screen = window->drawable.pScreen;
++
++ if ((*screen->GetWindowPixmap)(window) != visit->old)
++ return WT_DONTWALKCHILDREN;
++ (*screen->SetWindowPixmap)(window, visit->new);
++ return WT_WALKCHILDREN;
++}
++
++static void
++present_set_tree_pixmap(WindowPtr window, PixmapPtr pixmap)
++{
++ struct pixmap_visit visit;
++ ScreenPtr screen = window->drawable.pScreen;
++
++ visit.old = (*screen->GetWindowPixmap)(window);
++ visit.new = pixmap;
++ if (visit.old == visit.new)
++ return;
++ TraverseTree(window, present_set_tree_pixmap_visit, &visit);
++}
++
+ static void
+ present_unflip(ScreenPtr screen)
+ {
+@@ -321,10 +351,10 @@ present_unflip(ScreenPtr screen)
+ assert (!screen_priv->flip_pending);
+
+ if (screen_priv->flip_window)
+- (*screen->SetWindowPixmap)(screen_priv->flip_window,
+- (*screen->GetScreenPixmap)(screen));
++ present_set_tree_pixmap(screen_priv->flip_window,
++ (*screen->GetScreenPixmap)(screen));
+
+- (*screen->SetWindowPixmap)(screen->root, (*screen->GetScreenPixmap)(screen));
++ present_set_tree_pixmap(screen->root, (*screen->GetScreenPixmap)(screen));
+
+ /* Update the screen pixmap with the current flip pixmap contents
+ */
+@@ -527,10 +557,10 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
+ * 2) Set current flip window pixmap to the new pixmap
+ */
+ if (screen_priv->flip_window && screen_priv->flip_window != window)
+- (*screen->SetWindowPixmap)(screen_priv->flip_window,
+- (*screen->GetScreenPixmap)(screen));
+- (*screen->SetWindowPixmap)(vblank->window, vblank->pixmap);
+- (*screen->SetWindowPixmap)(screen->root, vblank->pixmap);
++ present_set_tree_pixmap(screen_priv->flip_window,
++ (*screen->GetScreenPixmap)(screen));
++ present_set_tree_pixmap(vblank->window, vblank->pixmap);
++ present_set_tree_pixmap(screen->root, vblank->pixmap);
+
+ /* Report update region as damaged
+ */
+--
+1.8.4.2
+
diff --git a/0002-xkb-Add-struct-XkbCompContext.patch b/0002-xkb-Add-struct-XkbCompContext.patch
index 6a87dac..e8014b5 100644
--- a/0002-xkb-Add-struct-XkbCompContext.patch
+++ b/0002-xkb-Add-struct-XkbCompContext.patch
@@ -1,4 +1,4 @@
-From 9ebe5168a76b769139c5173bf86b97eaa1e40bc3 Mon Sep 17 00:00:00 2001
+From 8470f377fc36772d885f4b614f4d42443c4b812b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Tue, 9 Apr 2013 16:54:55 -0400
Subject: [PATCH 02/38] xkb: Add struct XkbCompContext
@@ -186,5 +186,5 @@ index d462957..5da3a35 100644
LogMessage(X_ERROR, "Couldn't open compiled keymap file %s\n",
fileName);
--
-1.8.3.1
+1.8.4.2
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 1623810..77a8222 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,4 +1,4 @@
-From d71fbbc66b9a014831039758105aab6bd95421a5 Mon Sep 17 00:00:00 2001
+From 7d08561178ab9384791a944bdb5797cf2ea14e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Tue, 9 Apr 2013 17:11:03 -0400
Subject: [PATCH 03/38] xkb: Split out code to start and finish xkbcomp
@@ -77,5 +77,5 @@ index 5da3a35..001ff46 100644
XkbDDXOpenConfigFile(char *mapName, char *fileNameRtrn, int fileNameRtrnLen)
{
--
-1.8.3.1
+1.8.4.2
diff --git a/0004-xkb-Add-XkbCompileKeymapFromString.patch b/0004-xkb-Add-XkbCompileKeymapFromString.patch
index 3ed62f1..0ac25f4 100644
--- a/0004-xkb-Add-XkbCompileKeymapFromString.patch
+++ b/0004-xkb-Add-XkbCompileKeymapFromString.patch
@@ -1,4 +1,4 @@
-From 3f37d9a8a3ceaf888feb4994a4c61e14e903a368 Mon Sep 17 00:00:00 2001
+From 927e9c1b26b618a20d590062d346b9a53b120d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Tue, 9 Apr 2013 17:45:08 -0400
Subject: [PATCH 04/38] xkb: Add XkbCompileKeymapFromString()
@@ -315,5 +315,5 @@ index f72655f..f3f0d8f 100644
/*
--
-1.8.3.1
+1.8.4.2
diff --git a/0005-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
index 7a0e939..224d923 100644
--- a/0005-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,4 +1,4 @@
-From 92b914a0d1df9d53bdb0e69d8acef8b7a6ee969d Mon Sep 17 00:00:00 2001
+From efa65f0bd25889d34b690b91839a0b36d5864b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Tue, 21 Jun 2011 21:28:31 -0400
Subject: [PATCH 05/38] os: Add a function to create a client for an fd
@@ -22,7 +22,7 @@ index b76ab6e..8ad9af0 100644
#endif /* OPAQUE_H */
diff --git a/include/os.h b/include/os.h
-index 450e1a8..2a24f4b 100644
+index 9b67294..c36d09a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -166,8 +166,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
@@ -116,7 +116,7 @@ index 162e1d9..a95e7da 100644
+
#endif
diff --git a/os/utils.c b/os/utils.c
-index fb20da7..42aa13b 100644
+index 608ee6a..a0cf951 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -805,7 +805,11 @@ ProcessCommandLine(int argc, char *argv[])
@@ -133,5 +133,5 @@ index fb20da7..42aa13b 100644
argv[i]);
}
--
-1.8.3.1
+1.8.4.2
diff --git a/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch b/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
index eddb5f6..79e3c91 100644
--- a/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
+++ b/0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
@@ -1,4 +1,4 @@
-From 0de4805467ee2491890fd4a0e4261f397eb16584 Mon Sep 17 00:00:00 2001
+From f5767856b6dc214a7beb7c1f914a2e491da3f0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Thu, 21 Jul 2011 09:55:46 -0700
Subject: [PATCH 06/38] Export xf86NewInputDevice and xf86AllocateInput
@@ -40,5 +40,5 @@ index 35c38a5..ff3d894 100644
/* xf86Helper.c */
extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module,
--
-1.8.3.1
+1.8.4.2
diff --git a/0008-Add-redirect-window-for-input-device-feature.patch b/0007-Add-redirect-window-for-input-device-feature.patch
similarity index 94%
rename from 0008-Add-redirect-window-for-input-device-feature.patch
rename to 0007-Add-redirect-window-for-input-device-feature.patch
index 7238595..245f6a0 100644
--- a/0008-Add-redirect-window-for-input-device-feature.patch
+++ b/0007-Add-redirect-window-for-input-device-feature.patch
@@ -1,7 +1,7 @@
-From 149dba7f44e01b88fd9c2aba1dfc707c6917bae5 Mon Sep 17 00:00:00 2001
+From 65f033e38116ed4ebf318a7521190536e8fc6b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 18 Sep 2009 22:09:03 -0400
-Subject: [PATCH 08/38] Add redirect window for input device feature
+Subject: [PATCH 07/38] Add redirect window for input device feature
---
Xi/exevents.c | 13 +++++++++++++
@@ -85,5 +85,5 @@ index dc36c5d..09471cf 100644
typedef struct _KeyClassRec {
--
-1.8.3.1
+1.8.4.2
diff --git a/0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch b/0008-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
similarity index 96%
rename from 0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
rename to 0008-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
index 10bc205..fe860d7 100644
--- a/0009-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
+++ b/0008-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
@@ -1,7 +1,7 @@
-From 9c78591012c5ea0e5cd729b8b20eddce825295ed Mon Sep 17 00:00:00 2001
+From 39fddd5e087ee7681e7a26182dd7398dd64bc43f Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti at intel.com>
Date: Wed, 21 Aug 2013 21:23:09 -0700
-Subject: [PATCH 09/38] dri2: Introduce a third version of the AuthMagic
+Subject: [PATCH 08/38] dri2: Introduce a third version of the AuthMagic
function
This most recent version takes a client pointer to allow xwayland to
@@ -91,7 +91,7 @@ index 1e7afdd..38b4f58 100644
DrawablePtr pDraw,
XID id,
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
-index e1decec..4ab0186 100644
+index ffd66fa..b858213 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -136,11 +136,23 @@ ProcDRI2Connect(ClientPtr client)
@@ -140,5 +140,5 @@ index e1decec..4ab0186 100644
return Success;
}
--
-1.8.3.1
+1.8.4.2
diff --git a/0010-Add-xwayland-module.patch b/0009-Add-xwayland-module.patch
similarity index 99%
rename from 0010-Add-xwayland-module.patch
rename to 0009-Add-xwayland-module.patch
index c011237..e53a923 100644
--- a/0010-Add-xwayland-module.patch
+++ b/0009-Add-xwayland-module.patch
@@ -1,7 +1,7 @@
-From 4a3354179f4e758971667ac6359080a014dcb033 Mon Sep 17 00:00:00 2001
+From 010bee24b74e4ca0df6c69094b825d5232f85377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 18 Sep 2009 22:08:16 -0400
-Subject: [PATCH 10/38] Add xwayland module
+Subject: [PATCH 09/38] Add xwayland module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -32,11 +32,11 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from
hw/xfree86/xwayland/xwayland-input.c | 610 +++++++++++++++++++++++++++++++++
hw/xfree86/xwayland/xwayland-output.c | 309 +++++++++++++++++
hw/xfree86/xwayland/xwayland-private.h | 132 +++++++
- hw/xfree86/xwayland/xwayland-window.c | 316 +++++++++++++++++
+ hw/xfree86/xwayland/xwayland-window.c | 317 +++++++++++++++++
hw/xfree86/xwayland/xwayland.c | 392 +++++++++++++++++++++
hw/xfree86/xwayland/xwayland.h | 83 +++++
include/xorg-server.h.in | 3 +
- 20 files changed, 2594 insertions(+), 10 deletions(-)
+ 20 files changed, 2595 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 1e6f813..ab693e9 100644
+index 8bedd35..8078846 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -636,6 +636,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg
+@@ -629,6 +629,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 1e6f813..ab693e9 100644
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -1024,6 +1025,14 @@ fi
+@@ -1018,6 +1019,14 @@ fi
if test "x$MITSHM" = xauto; then
MITSHM="$ac_cv_sysv_ipc"
fi
@@ -76,7 +76,7 @@ index 1e6f813..ab693e9 100644
AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
if test "x$MITSHM" = xyes; then
AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])
-@@ -1204,12 +1213,13 @@ esac
+@@ -1241,12 +1250,13 @@ esac
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
@@ -91,7 +91,7 @@ index 1e6f813..ab693e9 100644
if test "x$DRI2" = xyes; then
save_CFLAGS=$CFLAGS
-@@ -2399,6 +2409,7 @@ hw/xfree86/dixmods/Makefile
+@@ -2462,6 +2472,7 @@ hw/xfree86/dixmods/Makefile
hw/xfree86/doc/Makefile
hw/xfree86/dri/Makefile
hw/xfree86/dri2/Makefile
@@ -130,7 +130,7 @@ index 15670d0..cf60196 100644
bin_PROGRAMS = Xorg
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 74d5ed3..39cd58c 100644
+index b5efc02..3b0bb89 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -118,7 +118,8 @@ static ModuleDefault ModuleDefaults[] = {
@@ -2071,10 +2071,10 @@ index 0000000..e427316
+#endif /* _XWAYLAND_PRIVATE_H_ */
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
new file mode 100644
-index 0000000..925d63c
+index 0000000..d56e0d0
--- /dev/null
+++ b/hw/xfree86/xwayland/xwayland-window.c
-@@ -0,0 +1,316 @@
+@@ -0,0 +1,317 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
@@ -2317,6 +2317,7 @@ index 0000000..925d63c
+ xorg_list_del(&xwl_window->link);
+ if (RegionNotEmpty(DamageRegion(xwl_window->damage)))
+ xorg_list_del(&xwl_window->link_damage);
++ DamageUnregister(&window->drawable, xwl_window->damage);
+ DamageDestroy(xwl_window->damage);
+ free(xwl_window);
+ dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
@@ -2891,5 +2892,5 @@ index 0c651bf..7f6eba2 100644
+
#endif /* _XORG_SERVER_H_ */
--
-1.8.3.1
+1.8.4.2
diff --git a/0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch b/0010-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
similarity index 90%
rename from 0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
rename to 0010-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
index 2ea1319..b3c155a 100644
--- a/0011-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
+++ b/0010-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
@@ -1,7 +1,7 @@
-From 201a3ac6c7cca0eb118cdb41f859d553b85204ad Mon Sep 17 00:00:00 2001
+From b50ab974f639e02f878e608bf7f6097be7fbc60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Wed, 21 Aug 2013 23:02:58 -0700
-Subject: [PATCH 11/38] xwayland: Add a HW_WAYLAND flag to let drivers
+Subject: [PATCH 10/38] xwayland: Add a HW_WAYLAND flag to let drivers
explicitly opt-in
---
@@ -45,5 +45,5 @@ index 4c2d147..976fa30 100644
typedef CARD32 xorgHWFlags;
--
-1.8.3.1
+1.8.4.2
diff --git a/0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch b/0011-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
similarity index 87%
rename from 0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
rename to 0011-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
index e30e4d2..91869bc 100644
--- a/0012-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
+++ b/0011-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
@@ -1,7 +1,7 @@
-From 17318d4351f4bc3e7c91f89d9c1bb061348fbb1b Mon Sep 17 00:00:00 2001
+From 341f2f5de09e59c3498d5f4e626b8fd86f4a0dcd Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn at redhat.com>
Date: Wed, 21 Aug 2013 09:53:25 +0200
-Subject: [PATCH 12/38] xwayland-shm: don't create alpha buffers if the window
+Subject: [PATCH 11/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
@@ -27,5 +27,5 @@ index f59bfe4..880b7ec 100644
return xwl_window->buffer ? Success : BadDrawable;
--
-1.8.3.1
+1.8.4.2
diff --git a/0013-xwayland-handle-global-object-destruction.patch b/0012-xwayland-handle-global-object-destruction.patch
similarity index 98%
rename from 0013-xwayland-handle-global-object-destruction.patch
rename to 0012-xwayland-handle-global-object-destruction.patch
index c74229b..e844d5a 100644
--- a/0013-xwayland-handle-global-object-destruction.patch
+++ b/0012-xwayland-handle-global-object-destruction.patch
@@ -1,7 +1,7 @@
-From 44131ac8626d8397bf40adf3511bf0b92909f94f Mon Sep 17 00:00:00 2001
+From 1e37681072a69decce7441e762cb5f4ce1a80d73 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn at redhat.com>
Date: Wed, 21 Aug 2013 09:53:26 +0200
-Subject: [PATCH 13/38] xwayland: handle global object destruction
+Subject: [PATCH 12/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.
@@ -230,5 +230,5 @@ index 880b7ec..2047a85 100644
}
--
-1.8.3.1
+1.8.4.2
diff --git a/0014-xwayland-add-support-for-multiple-outputs.patch b/0013-xwayland-add-support-for-multiple-outputs.patch
similarity index 98%
rename from 0014-xwayland-add-support-for-multiple-outputs.patch
rename to 0013-xwayland-add-support-for-multiple-outputs.patch
index e1bd140..ba72b97 100644
--- a/0014-xwayland-add-support-for-multiple-outputs.patch
+++ b/0013-xwayland-add-support-for-multiple-outputs.patch
@@ -1,7 +1,7 @@
-From 0d1ec467dd566895b5a71b02f8851a89f8a7512c Mon Sep 17 00:00:00 2001
+From c22c7d4062b24f10a1d841629cc1e1822cad1f45 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn at redhat.com>
Date: Thu, 22 Aug 2013 16:23:48 +0200
-Subject: [PATCH 14/38] xwayland: add support for multiple outputs
+Subject: [PATCH 13/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
@@ -211,5 +211,5 @@ index 7005db2..b0b2201 100644
--
-1.8.3.1
+1.8.4.2
diff --git a/0015-xwayland-Probe-outputs-on-preinit.patch b/0014-xwayland-Probe-outputs-on-preinit.patch
similarity index 89%
rename from 0015-xwayland-Probe-outputs-on-preinit.patch
rename to 0014-xwayland-Probe-outputs-on-preinit.patch
index e6ae850..4c168f6 100644
--- a/0015-xwayland-Probe-outputs-on-preinit.patch
+++ b/0014-xwayland-Probe-outputs-on-preinit.patch
@@ -1,7 +1,7 @@
-From ab2bf3a98241bc7a8e8a3d09b780dd8f975def8d Mon Sep 17 00:00:00 2001
+From 21d9ed2b2ad45c7c363194a4c4fe2306bb26b130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
Date: Sun, 1 Sep 2013 23:14:43 +0200
-Subject: [PATCH 15/38] xwayland: Probe outputs on preinit
+Subject: [PATCH 14/38] xwayland: Probe outputs on preinit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -30,5 +30,5 @@ index 66c7d48..691b5f0 100644
xf86SetScrnInfoModes(scrninfo);
--
-1.8.3.1
+1.8.4.2
diff --git a/0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch b/0015-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
similarity index 84%
rename from 0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
rename to 0015-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
index 4b5fe41..3da2eb6 100644
--- a/0016-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
+++ b/0015-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
@@ -1,7 +1,7 @@
-From 2553d412bf0b9c6dbf7a46dd8596ff7b9387e713 Mon Sep 17 00:00:00 2001
+From 4e8eb23a03e14ce149e302e4dfc6e6af6fa61424 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Fri, 16 Aug 2013 13:21:21 +0100
-Subject: [PATCH 16/38] XFree86: Load wlshm driver as fallback for Wayland
+Subject: [PATCH 15/38] XFree86: Load wlshm driver as fallback for Wayland
Since fbdev or vesa are unlikely to be too useful there ...
@@ -12,10 +12,10 @@ Signed-off-by: Daniel Stone <daniel at fooishbar.org>
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 95d58fe..d5a3370 100644
+index af2b7f8..a3e1fa7 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -283,10 +283,15 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -275,10 +275,15 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
#if !defined(sun)
/* Fallback to platform default frame buffer driver */
if (i < (nmatches - 1)) {
@@ -34,15 +34,15 @@ index 95d58fe..d5a3370 100644
}
#endif /* !sun */
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 39cd58c..c65cb80 100644
+index 3b0bb89..aebfc1b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -519,7 +519,11 @@ xf86InputDriverlistFromConfig(void)
static void
fixup_video_driver_list(char **drivers)
{
-- static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
-+ static const char *fallback_hw[4] = { "vesa", "fbdev", "wsfb", NULL };
+- static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL };
++ static const char *fallback_hw[4] = { "fbdev", "vesa", "wsfb", NULL };
+#ifdef XORG_WAYLAND
+ static const char *fallback_wayland[2] = { "wlshm", NULL };
+#endif
@@ -69,5 +69,5 @@ index 39cd58c..c65cb80 100644
*drv = *end;
*end = x;
--
-1.8.3.1
+1.8.4.2
diff --git a/0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch b/0016-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
similarity index 88%
rename from 0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
rename to 0016-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
index 0ef19c6..026f22e 100644
--- a/0017-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
+++ b/0016-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
@@ -1,7 +1,7 @@
-From c928d93ae7f803f1bda0bc0dca4d1ca3c580d28d Mon Sep 17 00:00:00 2001
+From 6cfe64769a4f8e9646e4d6766ffdf689a0963ffd Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Wed, 7 Nov 2012 17:22:42 +1100
-Subject: [PATCH 17/38] XWayland: Don't send out-of-bounds damage co-ordinates
+Subject: [PATCH 16/38] XWayland: Don't send out-of-bounds damage co-ordinates
Make sure we don't send damage regions larger than the buffer.
@@ -33,5 +33,5 @@ index 2047a85..6a515f5 100644
wl_surface_attach(xwl_window->surface,
xwl_window->buffer,
--
-1.8.3.1
+1.8.4.2
diff --git a/0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch b/0017-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
similarity index 87%
rename from 0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
rename to 0017-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
index 10c6d15..b09a6ca 100644
--- a/0018-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
+++ b/0017-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
@@ -1,7 +1,7 @@
-From d5a81751ea614f75bd4b53fea562667f3fa16c9b Mon Sep 17 00:00:00 2001
+From 70bf99f09cac43a9016039f762e5186c6ca2b6c6 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Tue, 16 Oct 2012 17:14:01 +1100
-Subject: [PATCH 18/38] xwayland: Introduce an auto mode for --enable-wayland
+Subject: [PATCH 17/38] xwayland: Introduce an auto mode for --enable-wayland
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
@@ -9,10 +9,10 @@ Signed-off-by: Daniel Stone <daniel at fooishbar.org>
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
-index ab693e9..3699525 100644
+index 8078846..c60fd44 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -636,7 +636,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg
+@@ -629,7 +629,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 ab693e9..3699525 100644
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -1026,12 +1026,16 @@ if test "x$MITSHM" = xauto; then
+@@ -1020,12 +1020,16 @@ if test "x$MITSHM" = xauto; then
MITSHM="$ac_cv_sysv_ipc"
fi
@@ -41,5 +41,5 @@ index ab693e9..3699525 100644
AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
if test "x$MITSHM" = xyes; then
--
-1.8.3.1
+1.8.4.2
diff --git a/0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch b/0018-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
similarity index 90%
rename from 0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
rename to 0018-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
index e0be897..7453d09 100644
--- a/0019-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
+++ b/0018-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
@@ -1,7 +1,7 @@
-From fe84a03afbc5d5b80735d106f699139d44769af0 Mon Sep 17 00:00:00 2001
+From c7d56befef2111c82e6720643824b9a46ae36670 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Wed, 7 Nov 2012 17:15:13 +1100
-Subject: [PATCH 19/38] XWayland: Don't hardcode DRM libs and -lwayland-client
+Subject: [PATCH 18/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.
@@ -42,5 +42,5 @@ index b739145..22ab154 100644
endif
--
-1.8.3.1
+1.8.4.2
diff --git a/0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch b/0019-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
similarity index 95%
rename from 0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
rename to 0019-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
index f6abe4a..b96174a 100644
--- a/0020-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
+++ b/0019-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
@@ -1,7 +1,7 @@
-From b69be44270c90b9048505d5b18930c1ac18e9ddc Mon Sep 17 00:00:00 2001
+From c6da90b55546748d3f4a2f536f94751da3abcd77 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Fri, 16 Aug 2013 13:51:08 +0100
-Subject: [PATCH 20/38] XWayland: Support 16bpp X surfaces in DRM/SHM
+Subject: [PATCH 19/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.
@@ -93,5 +93,5 @@ index 6a515f5..36f7cbf 100644
return xwl_window->buffer ? Success : BadDrawable;
--
-1.8.3.1
+1.8.4.2
diff --git a/0021-xwayland-Remove-Xdnd-selection-watching-code.patch b/0020-xwayland-Remove-Xdnd-selection-watching-code.patch
similarity index 93%
rename from 0021-xwayland-Remove-Xdnd-selection-watching-code.patch
rename to 0020-xwayland-Remove-Xdnd-selection-watching-code.patch
index 64c1e78..018cc5e 100644
--- a/0021-xwayland-Remove-Xdnd-selection-watching-code.patch
+++ b/0020-xwayland-Remove-Xdnd-selection-watching-code.patch
@@ -1,7 +1,7 @@
-From fdb47d16148e7cd2a4a7cc1d16fbd4a3b382046e Mon Sep 17 00:00:00 2001
+From caf0c07852843440139fcd23e621fe2e9522775f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Wed, 11 Sep 2013 11:15:18 -0700
-Subject: [PATCH 21/38] xwayland: Remove Xdnd selection watching code
+Subject: [PATCH 20/38] xwayland: Remove Xdnd selection watching code
We don't need this in the server, the wm can manage dnd proxying.
---
@@ -66,5 +66,5 @@ index 36f7cbf..e8c58fd 100644
xorg_list_init(&xwl_screen->seat_list);
xorg_list_init(&xwl_screen->damage_window_list);
--
-1.8.3.1
+1.8.4.2
diff --git a/0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch b/0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
similarity index 87%
rename from 0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
rename to 0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
index cf3f5bd..b9a1e21 100644
--- a/0022-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
+++ b/0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
@@ -1,7 +1,7 @@
-From cbca006b92b1ef56966b07e0573f9f068891cee5 Mon Sep 17 00:00:00 2001
+From d40219f38a33845d8a9850de47ff5d458a3d8209 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 13 Sep 2013 17:17:16 -0400
-Subject: [PATCH 22/38] xf86Init: trim out non-wayland capable servers from
+Subject: [PATCH 21/38] xf86Init: trim out non-wayland capable servers from
drive list
Otherwise they'll cause the server to crash when run in wayland mode.
@@ -30,5 +30,5 @@ index 2d3bb01..6282252 100644
xf86OpenConsole();
else
--
-1.8.3.1
+1.8.4.2
diff --git a/0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch b/0022-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
similarity index 53%
rename from 0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
rename to 0022-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
index e1fd0f6..6b522ef 100644
--- a/0023-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
+++ b/0022-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
@@ -1,30 +1,29 @@
-From e3fc1ac8cd899868f1679671380a484d61ec4882 Mon Sep 17 00:00:00 2001
+From a575da27027b91e44df75318f3b570bf8291fe7c Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn at redhat.com>
Date: Fri, 13 Sep 2013 15:52:29 +0200
-Subject: [PATCH 23/38] Add XORG_WAYLAND symbol to xorg-config.h.in
+Subject: [PATCH 22/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 | 6 ++++++
- 1 file changed, 6 insertions(+)
+ include/xorg-config.h.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
-index 487d7ad..a35a9b0 100644
+index 487d7ad..8aec1d8 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
-@@ -145,4 +145,10 @@
- /* Support APM/ACPI power management in the server */
- #undef XF86PM
+@@ -142,7 +142,7 @@
+ /* Define to 1 if you have the `seteuid' function. */
+ #undef HAVE_SETEUID
-+/* Have support for X shared memory fence library (xshmfence) */
-+#undef HAVE_XSHMFENCE
-+
+-/* Support APM/ACPI power management in the server */
+-#undef XF86PM
+/* Building Xorg server. */
+#undef XORG_WAYLAND
-+
+
#endif /* _XORG_CONFIG_H_ */
--
-1.8.3.1
+1.8.4.2
diff --git a/0024-Fix-fallback-loading-of-the-wayland-driver.patch b/0023-Fix-fallback-loading-of-the-wayland-driver.patch
similarity index 78%
rename from 0024-Fix-fallback-loading-of-the-wayland-driver.patch
rename to 0023-Fix-fallback-loading-of-the-wayland-driver.patch
index de23b92..a64ad92 100644
--- a/0024-Fix-fallback-loading-of-the-wayland-driver.patch
+++ b/0023-Fix-fallback-loading-of-the-wayland-driver.patch
@@ -1,7 +1,7 @@
-From 1df7c26010720e669d416b442e168002d7502d9d Mon Sep 17 00:00:00 2001
+From 7e1b4d2a4853e7a6c31e0ab0c1fe3405ec61c914 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn at redhat.com>
Date: Fri, 13 Sep 2013 15:52:30 +0200
-Subject: [PATCH 24/38] Fix fallback loading of the wayland driver
+Subject: [PATCH 23/38] Fix fallback loading of the wayland driver
Fix the array name to actually compile, and fix the driver name
with the new upstream.
@@ -11,10 +11,10 @@ with the new upstream.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index d5a3370..b35cb96 100644
+index a3e1fa7..51a7960 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -285,7 +285,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -277,7 +277,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
if (i < (nmatches - 1)) {
#ifdef XORG_WAYLAND
if (xorgWayland)
@@ -24,12 +24,12 @@ index d5a3370..b35cb96 100644
#endif
#if !defined(__linux__) && defined(__sparc__)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index c65cb80..8255d8d 100644
+index aebfc1b..66f98b2 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -521,7 +521,7 @@ fixup_video_driver_list(char **drivers)
{
- static const char *fallback_hw[4] = { "vesa", "fbdev", "wsfb", NULL };
+ static const char *fallback_hw[4] = { "fbdev", "vesa", "wsfb", NULL };
#ifdef XORG_WAYLAND
- static const char *fallback_wayland[2] = { "wlshm", NULL };
+ static const char *fallback_wl[2] = { "wayland", NULL };
@@ -37,5 +37,5 @@ index c65cb80..8255d8d 100644
const char **fallbacks;
char **end, **drv;
--
-1.8.3.1
+1.8.4.2
diff --git a/0025-xwayland-Don-t-include-xorg-server.h.patch b/0024-xwayland-Don-t-include-xorg-server.h.patch
similarity index 91%
rename from 0025-xwayland-Don-t-include-xorg-server.h.patch
rename to 0024-xwayland-Don-t-include-xorg-server.h.patch
index 82afb65..eb23738 100644
--- a/0025-xwayland-Don-t-include-xorg-server.h.patch
+++ b/0024-xwayland-Don-t-include-xorg-server.h.patch
@@ -1,7 +1,7 @@
-From 84fe9bdf95a03d7998132892899549a5233f619a Mon Sep 17 00:00:00 2001
+From b468fcfc1733feb014ef976fef29939f9f1dfc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 13 Sep 2013 14:52:13 -0700
-Subject: [PATCH 25/38] xwayland: Don't include xorg-server.h
+Subject: [PATCH 24/38] xwayland: Don't include xorg-server.h
xorg-config.h now has the XORG_WAYLAND define.
---
@@ -36,7 +36,7 @@ index 691b5f0..7004b9b 100644
#include <xf86Crtc.h>
#include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
-index 925d63c..b7677ed 100644
+index d56e0d0..88f57ce 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -33,7 +33,6 @@
@@ -60,5 +60,5 @@ index e8c58fd..c70a52d 100644
#include <xf86Xinput.h>
--
-1.8.3.1
+1.8.4.2
diff --git a/0026-os-Don-t-include-xorg-server.h.patch b/0025-os-Don-t-include-xorg-server.h.patch
similarity index 86%
rename from 0026-os-Don-t-include-xorg-server.h.patch
rename to 0025-os-Don-t-include-xorg-server.h.patch
index 6d9f67d..5fe6791 100644
--- a/0026-os-Don-t-include-xorg-server.h.patch
+++ b/0025-os-Don-t-include-xorg-server.h.patch
@@ -1,7 +1,7 @@
-From e02033116fe579a14e1ca499ff407b99178b1afd Mon Sep 17 00:00:00 2001
+From 6e6f302a5bfa72b195021c0053aab3286d12f87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 13 Sep 2013 14:53:16 -0700
-Subject: [PATCH 26/38] os: Don't include xorg-server.h
+Subject: [PATCH 25/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.
@@ -36,5 +36,5 @@ index a95e7da..0a858b7 100644
-
-#endif
--
-1.8.3.1
+1.8.4.2
diff --git a/0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch b/0026-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
similarity index 82%
rename from 0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
rename to 0026-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
index e9822bb..b986bc7 100644
--- a/0027-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
+++ b/0026-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
@@ -1,7 +1,7 @@
-From 7b45766152d2600279129722331df380f70a57ee Mon Sep 17 00:00:00 2001
+From 7f1df88e3c86e900fa22075aed41c5c3b3f36b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 13 Sep 2013 15:16:31 -0700
-Subject: [PATCH 27/38] os: Also define ListenOnOpenFD and AddClientOnOpenFD
+Subject: [PATCH 26/38] os: Also define ListenOnOpenFD and AddClientOnOpenFD
unconditionally
Remove the #ifdef from the header file as well.
@@ -10,7 +10,7 @@ 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 2a24f4b..542ca64 100644
+index c36d09a..8deb413 100644
--- a/include/os.h
+++ b/include/os.h
@@ -166,10 +166,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
@@ -26,5 +26,5 @@ index 2a24f4b..542ca64 100644
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
--
-1.8.3.1
+1.8.4.2
diff --git a/0028-xwayland-Remove-unused-variables.patch b/0027-xwayland-Remove-unused-variables.patch
similarity index 79%
rename from 0028-xwayland-Remove-unused-variables.patch
rename to 0027-xwayland-Remove-unused-variables.patch
index bb05860..19fea33 100644
--- a/0028-xwayland-Remove-unused-variables.patch
+++ b/0027-xwayland-Remove-unused-variables.patch
@@ -1,14 +1,14 @@
-From 190d17d13dcb7a784e80edc5564cb80b9ccf3b00 Mon Sep 17 00:00:00 2001
+From b2520bd345339bbf74ab0ee4e2194206f80f4d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Mon, 16 Sep 2013 11:51:57 -0700
-Subject: [PATCH 28/38] xwayland: Remove unused variables
+Subject: [PATCH 27/38] xwayland: Remove unused variables
---
hw/xfree86/xwayland/xwayland-window.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
-index b7677ed..3c85630 100644
+index 88f57ce..20db80c 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -92,9 +92,6 @@ xwl_create_window(WindowPtr window)
@@ -22,5 +22,5 @@ index b7677ed..3c85630 100644
xwl_screen = xwl_screen_get(screen);
--
-1.8.3.1
+1.8.4.2
diff --git a/0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch b/0028-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
similarity index 95%
rename from 0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
rename to 0028-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
index 61c0696..3b2dff7 100644
--- a/0029-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
+++ b/0028-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
@@ -1,7 +1,7 @@
-From 7da89f1639cd65a114cfc97e5556a5c238c2cac9 Mon Sep 17 00:00:00 2001
+From 2890dca70f04c3961578062207c5354d48730da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Mon, 16 Sep 2013 12:05:19 -0700
-Subject: [PATCH 29/38] xwayland: Use a per-screen private key for cursor
+Subject: [PATCH 28/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
@@ -81,5 +81,5 @@ index b0b2201..aa9fc03 100644
DestroyWindowProcPtr DestroyWindow;
RealizeWindowProcPtr RealizeWindow;
--
-1.8.3.1
+1.8.4.2
diff --git a/0030-XWayland-Don-t-commit-empty-surfaces.patch b/0029-XWayland-Don-t-commit-empty-surfaces.patch
similarity index 86%
rename from 0030-XWayland-Don-t-commit-empty-surfaces.patch
rename to 0029-XWayland-Don-t-commit-empty-surfaces.patch
index 622807e..5228c5a 100644
--- a/0030-XWayland-Don-t-commit-empty-surfaces.patch
+++ b/0029-XWayland-Don-t-commit-empty-surfaces.patch
@@ -1,7 +1,7 @@
-From 6ffe400e53f9dc7f66b8f2588cc766f4254a39da Mon Sep 17 00:00:00 2001
+From 1cac327a6ef9c0ca44ec32c7146da37ecb930dca Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels at collabora.com>
Date: Thu, 12 Sep 2013 16:58:00 -0400
-Subject: [PATCH 30/38] XWayland: Don't commit empty surfaces
+Subject: [PATCH 29/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
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Stone <daniels at collabora.com>
1 file changed, 1 deletion(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
-index 3c85630..fb9c64a 100644
+index 20db80c..5045e65 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -80,7 +80,6 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)
@@ -28,5 +28,5 @@ index 3c85630..fb9c64a 100644
callback = wl_display_sync(xwl_screen->display);
wl_callback_add_listener(callback, &free_pixmap_listener, pixmap);
--
-1.8.3.1
+1.8.4.2
diff --git a/0031-xwayland-Also-look-for-wlglamor.patch b/0030-xwayland-Also-look-for-wlglamor.patch
similarity index 72%
rename from 0031-xwayland-Also-look-for-wlglamor.patch
rename to 0030-xwayland-Also-look-for-wlglamor.patch
index c3cdb8e..206df01 100644
--- a/0031-xwayland-Also-look-for-wlglamor.patch
+++ b/0030-xwayland-Also-look-for-wlglamor.patch
@@ -1,17 +1,17 @@
-From 448ecd81741144f039d41feeca0319c70954e847 Mon Sep 17 00:00:00 2001
+From f3df4c8caf96cce10d7bd646f34df9c3bba4daa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 11 Oct 2013 16:14:54 -0700
-Subject: [PATCH 31/38] xwayland: Also look for wlglamor
+Subject: [PATCH 30/38] xwayland: Also look for wlglamor
---
hw/xfree86/common/xf86AutoConfig.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index b35cb96..9576b86 100644
+index 51a7960..523ddb7 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -285,6 +285,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -277,6 +277,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
if (i < (nmatches - 1)) {
#ifdef XORG_WAYLAND
if (xorgWayland)
@@ -20,5 +20,5 @@ index b35cb96..9576b86 100644
else
#endif
--
-1.8.3.1
+1.8.4.2
diff --git a/0032-xwayland-Add-wlglamor-the-right-way.patch b/0031-xwayland-Add-wlglamor-the-right-way.patch
similarity index 79%
rename from 0032-xwayland-Add-wlglamor-the-right-way.patch
rename to 0031-xwayland-Add-wlglamor-the-right-way.patch
index 586ffa5..25126ce 100644
--- a/0032-xwayland-Add-wlglamor-the-right-way.patch
+++ b/0031-xwayland-Add-wlglamor-the-right-way.patch
@@ -1,7 +1,7 @@
-From b7fccf0d62ecf16ad591270ed5130241f005b635 Mon Sep 17 00:00:00 2001
+From a7f4b0f1a49abdb79f7a787e582096af152382c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 11 Oct 2013 16:29:02 -0700
-Subject: [PATCH 32/38] xwayland: Add wlglamor the right way
+Subject: [PATCH 31/38] xwayland: Add wlglamor the right way
Defeated by #ifdefs.
---
@@ -9,10 +9,10 @@ Defeated by #ifdefs.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 9576b86..cc6dcce 100644
+index 523ddb7..4c5d1d5 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -282,12 +282,12 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -274,12 +274,12 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
#if !defined(sun)
/* Fallback to platform default frame buffer driver */
@@ -29,5 +29,5 @@ index 9576b86..cc6dcce 100644
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
--
-1.8.3.1
+1.8.4.2
diff --git a/0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch b/0032-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
similarity index 91%
rename from 0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
rename to 0032-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
index 5d37396..1615503 100644
--- a/0033-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
+++ b/0032-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
@@ -1,14 +1,14 @@
-From a7ba08d345c1f545f1f8711f5b6ec6b4f13865f5 Mon Sep 17 00:00:00 2001
+From 067752476a9c2bac9e01c3c923fa94b4bf0ec0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Date: Fri, 11 Oct 2013 15:41:59 -0700
-Subject: [PATCH 33/38] xwayland: Don't redirect windows, leave it to the wm
+Subject: [PATCH 32/38] xwayland: Don't redirect windows, leave it to the wm
---
hw/xfree86/xwayland/xwayland-window.c | 51 -----------------------------------
1 file changed, 51 deletions(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
-index fb9c64a..0cb4f28 100644
+index 5045e65..c03855c 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -31,11 +31,9 @@
@@ -73,7 +73,7 @@ index fb9c64a..0cb4f28 100644
static void
damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
{
-@@ -289,12 +244,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
+@@ -290,12 +245,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
if (!dixRegisterPrivateKey(&xwl_window_private_key, PRIVATE_WINDOW, 0))
return BadAlloc;
@@ -87,5 +87,5 @@ index fb9c64a..0cb4f28 100644
screen->RealizeWindow = xwl_realize_window;
--
-1.8.3.1
+1.8.4.2
diff --git a/0035-xwayland-Fix-hidden-cursor.patch b/0033-xwayland-Fix-hidden-cursor.patch
similarity index 90%
rename from 0035-xwayland-Fix-hidden-cursor.patch
rename to 0033-xwayland-Fix-hidden-cursor.patch
index 818ddc8..dd28a43 100644
--- a/0035-xwayland-Fix-hidden-cursor.patch
+++ b/0033-xwayland-Fix-hidden-cursor.patch
@@ -1,7 +1,7 @@
-From b6d7459e27814c23292e9e7172bb6f95b4aadd2b Mon Sep 17 00:00:00 2001
+From 844a73a64081044710d2f22ba5a52513c2cce708 Mon Sep 17 00:00:00 2001
From: Trevor McCort <tjmccort at gmail.com>
Date: Tue, 15 Oct 2013 19:41:12 -0500
-Subject: [PATCH 35/38] xwayland: Fix hidden cursor
+Subject: [PATCH 33/38] xwayland: Fix hidden cursor
If a cursor is set when bits->emptyMask is true, the xserver
sets a NULL cursor instead.
@@ -34,5 +34,5 @@ index 2cdd248..2b3cb5e 100644
&xwl_seat->xwl_screen->cursor_private_key);
--
-1.8.3.1
+1.8.4.2
diff --git a/0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch b/0034-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
similarity index 96%
rename from 0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
rename to 0034-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
index 202f130..6339734 100644
--- a/0036-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
+++ b/0034-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
@@ -1,7 +1,7 @@
-From 1a1c70ed93c53c340c54ee673bc631ea459a4bfa Mon Sep 17 00:00:00 2001
+From 3c9434f3f70420780e1fc606175a7436f6fdbb15 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos at gmail.com>
Date: Tue, 22 Oct 2013 16:50:29 +0200
-Subject: [PATCH 36/38] xkb: Repurpose XkbCopyDeviceKeymap to apply a given
+Subject: [PATCH 34/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
@@ -95,5 +95,5 @@ index 6c6af60..1f8a839 100644
XkbSendNewKeyboardNotify(dst, &nkn);
--
-1.8.3.1
+1.8.4.2
diff --git a/0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch b/0035-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
similarity index 94%
rename from 0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
rename to 0035-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
index 3c6b0fa..caf2696 100644
--- a/0037-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
+++ b/0035-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
@@ -1,7 +1,7 @@
-From a409085a514770bf8316f44af3c0697ba0ed516a Mon Sep 17 00:00:00 2001
+From 260ca040db20c397af0803da5c1bf15bc3bc08f2 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos at gmail.com>
Date: Mon, 21 Oct 2013 14:41:53 +0200
-Subject: [PATCH 37/38] xkb: Factor out a function to copy a keymap's controls
+Subject: [PATCH 35/38] xkb: Factor out a function to copy a keymap's controls
unto another
---
@@ -87,5 +87,5 @@ index 1f8a839..6cf6e79 100644
+ dst->ctrls->num_groups = nTG;
+}
--
-1.8.3.1
+1.8.4.2
diff --git a/0038-xwayland-Handle-keymap-changes.patch b/0036-xwayland-Handle-keymap-changes.patch
similarity index 95%
rename from 0038-xwayland-Handle-keymap-changes.patch
rename to 0036-xwayland-Handle-keymap-changes.patch
index 993444d..2d31062 100644
--- a/0038-xwayland-Handle-keymap-changes.patch
+++ b/0036-xwayland-Handle-keymap-changes.patch
@@ -1,7 +1,7 @@
-From 8263ec0fe27eb573e50485112e97f56f61d443b4 Mon Sep 17 00:00:00 2001
+From 6240dcadc8f51b00abe7d1fc4e682b442809fb91 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos at gmail.com>
Date: Mon, 21 Oct 2013 14:41:54 +0200
-Subject: [PATCH 38/38] xwayland: Handle keymap changes
+Subject: [PATCH 36/38] xwayland: Handle keymap changes
---
hw/xfree86/xwayland/xwayland-input.c | 39 +++++++++++++++++++++++++++++++++---
@@ -83,5 +83,5 @@ index b1cc3ff..6a814c2 100644
extern _X_EXPORT int AllocDevicePair(ClientPtr client,
const char *name,
--
-1.8.3.1
+1.8.4.2
diff --git a/0037-xwayland-Fix-re-wrapping-of-RealizeWindow.patch b/0037-xwayland-Fix-re-wrapping-of-RealizeWindow.patch
new file mode 100644
index 0000000..18a0a2f
--- /dev/null
+++ b/0037-xwayland-Fix-re-wrapping-of-RealizeWindow.patch
@@ -0,0 +1,25 @@
+From 408c17759542df3c906fc6fd0c01a3963ac0f345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
+Date: Wed, 4 Dec 2013 10:27:07 -0800
+Subject: [PATCH 37/38] xwayland: Fix re-wrapping of RealizeWindow
+
+---
+ hw/xfree86/xwayland/xwayland-window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
+index c03855c..ee95371 100644
+--- a/hw/xfree86/xwayland/xwayland-window.c
++++ b/hw/xfree86/xwayland/xwayland-window.c
+@@ -110,7 +110,7 @@ xwl_realize_window(WindowPtr window)
+
+ screen->RealizeWindow = xwl_screen->RealizeWindow;
+ ret = (*screen->RealizeWindow)(window);
+- xwl_screen->RealizeWindow = xwl_screen->RealizeWindow;
++ xwl_screen->RealizeWindow = screen->RealizeWindow;
+ screen->RealizeWindow = xwl_realize_window;
+
+ if (xwl_screen->flags & XWL_FLAGS_ROOTLESS) {
+--
+1.8.4.2
+
diff --git a/0038-xwayland-Adapt-to-1.15-Damage-API.patch b/0038-xwayland-Adapt-to-1.15-Damage-API.patch
new file mode 100644
index 0000000..876cb66
--- /dev/null
+++ b/0038-xwayland-Adapt-to-1.15-Damage-API.patch
@@ -0,0 +1,24 @@
+From 76e317e6e80465ecdda849931789f1b606ff75ae Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 12 Dec 2013 09:47:12 -0500
+Subject: [PATCH 38/38] xwayland: Adapt to 1.15 Damage API
+
+---
+ hw/xfree86/xwayland/xwayland-window.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
+index ee95371..9a6724e 100644
+--- a/hw/xfree86/xwayland/xwayland-window.c
++++ b/hw/xfree86/xwayland/xwayland-window.c
+@@ -190,7 +190,6 @@ xwl_unrealize_window(WindowPtr window)
+ xorg_list_del(&xwl_window->link);
+ if (RegionNotEmpty(DamageRegion(xwl_window->damage)))
+ xorg_list_del(&xwl_window->link_damage);
+- DamageUnregister(&window->drawable, xwl_window->damage);
+ DamageDestroy(xwl_window->damage);
+ free(xwl_window);
+ dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
+--
+1.8.4.2
+
diff --git a/driver-abi-rebuild.sh b/driver-abi-rebuild.sh
index 80750f0..b1276d9 100755
--- a/driver-abi-rebuild.sh
+++ b/driver-abi-rebuild.sh
@@ -39,10 +39,10 @@ echo $driverlist $extradrivers | xargs -n1 $pkg co $branch
for i in xorg-x11-drv-*/ ; do
[ -e $i/dead.package ] && continue
pushd $i
- rpmdev-bumpspec -c "- 1.15RC1 ABI rebuild" *.spec
- $pkg commit -c -p && $pkg build --nowait
+ #rpmdev-bumpspec -c "- 1.15RC4 ABI rebuild" *.spec
+ #$pkg commit -c -p && $pkg build --nowait
#$pkg mockbuild
- #$pkg srpm
+ $pkg srpm
#mockchain -r fedora-20-x86_64 -l $OLDPWD
#mockchain -r rhel-7.0-candidate-x86_64 -l $OLDPWD
popd
diff --git a/sources b/sources
index fabb4d8..8ee216d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57b14ddab3693ce48eafcb9607a87353 xorg-server-1.14.99.902.tar.bz2
+c2f45a61a3cdf480c59d3f3dcc11bdc7 xorg-server-1.14.99.904.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 92a2152..f6531f6 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -8,19 +8,19 @@
# 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 20131118
-%global stable_abi 0
+#global gitdate 20131118
+%global stable_abi 1
%if !0%{?gitdate} || %{stable_abi}
# Released ABI versions. Have to keep these manually in sync with the
# source because rpm is a terrible language.
%global ansic_major 0
%global ansic_minor 4
-%global videodrv_major 14
-%global videodrv_minor 1
-%global xinput_major 19
-%global xinput_minor 2
-%global extension_major 7
+%global videodrv_major 15
+%global videodrv_minor 0
+%global xinput_major 20
+%global xinput_minor 0
+%global extension_major 8
%global extension_minor 0
%endif
@@ -41,8 +41,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.14.99.902
-Release: 2%{?gitdate:.%{gitdate}}%{dist}
+Version: 1.14.99.904
+Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -75,56 +75,51 @@ Source31: xserver-sdk-abi-requires.git
Source40: driver-abi-rebuild.sh
# sync with tip
-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
+Patch0001: 0001-present-recursively-set-window-pixmaps-on-flip.patch
+
+# submitted
+Patch0050: 0001-configure-Fix-a-typo-near-dri3-shmfence-detection.patch
# xwayland. trivial rebase onto master:
-# http://cgit.freedesktop.org/~ajax/xserver/log/?h=wl-rebase-for-f20
+# http://cgit.freedesktop.org/~ajax/xserver/log/?h=wayland-f21
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-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
+Patch0107: 0007-Add-redirect-window-for-input-device-feature.patch
+Patch0108: 0008-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
+Patch0109: 0009-Add-xwayland-module.patch
+Patch0110: 0010-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
+Patch0111: 0011-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
+Patch0112: 0012-xwayland-handle-global-object-destruction.patch
+Patch0113: 0013-xwayland-add-support-for-multiple-outputs.patch
+Patch0114: 0014-xwayland-Probe-outputs-on-preinit.patch
+Patch0115: 0015-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
+Patch0116: 0016-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
+Patch0117: 0017-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
+Patch0118: 0018-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
+Patch0119: 0019-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
+Patch0120: 0020-xwayland-Remove-Xdnd-selection-watching-code.patch
+Patch0121: 0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
+Patch0122: 0022-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
+Patch0123: 0023-Fix-fallback-loading-of-the-wayland-driver.patch
+Patch0124: 0024-xwayland-Don-t-include-xorg-server.h.patch
+Patch0125: 0025-os-Don-t-include-xorg-server.h.patch
+Patch0126: 0026-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
+Patch0127: 0027-xwayland-Remove-unused-variables.patch
+Patch0128: 0028-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
+Patch0129: 0029-XWayland-Don-t-commit-empty-surfaces.patch
+Patch0130: 0030-xwayland-Also-look-for-wlglamor.patch
+Patch0131: 0031-xwayland-Add-wlglamor-the-right-way.patch
+Patch0132: 0032-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
+Patch0133: 0033-xwayland-Fix-hidden-cursor.patch
+Patch0134: 0034-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
+Patch0135: 0035-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
+Patch0136: 0036-xwayland-Handle-keymap-changes.patch
+Patch0137: 0037-xwayland-Fix-re-wrapping-of-RealizeWindow.patch
+Patch0138: 0038-xwayland-Adapt-to-1.15-Damage-API.patch
# restore ABI
Patch0200: 0001-mustard-Restore-XkbCopyDeviceKeymap.patch
@@ -136,10 +131,6 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch
Patch6030: xserver-1.6.99-right-of.patch
#Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
-# Fix libselinux-triggered build error
-# RedHat/Fedora-specific patch
-Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
-
Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch
# do not upstream - do not even use here yet
@@ -153,17 +144,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
-# also submitted
-Patch9011: 0001-xinerama-Export-the-screen-region.patch
-Patch9012: 0002-dix-Add-PostDispatchCallback.patch
-Patch9013: 0003-damageext-Xineramify-v6.patch
-Patch9014: 0004-composite-Fix-COW-creation-for-Xinerama.patch
-Patch9015: 0005-fixes-Fix-PanoramiXSetPictureClipRegion-for-window-p.patch
-Patch9016: 0006-fixes-Fix-PanoramiXSetWindowShapeRegion.patch
-
-# also also submitted, 1030454, 1030695
-Patch9050: 0001-xfree86-Prefer-fbdev-to-vesa.patch
-
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
%global sdkdir %{_includedir}/xorg
@@ -180,7 +160,7 @@ Patch9050: 0001-xfree86-Prefer-fbdev-to-vesa.patch
%global enable_xorg --disable-xorg
%endif
-%ifnarch %{ix86} x86_64 %{arm}
+%ifnarch %{ix86} x86_64
%global no_int10 --disable-vbe --disable-int10-module
%endif
@@ -192,10 +172,10 @@ BuildRequires: git-core
BuildRequires: automake autoconf libtool pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.17
-BuildRequires: xorg-x11-proto-devel >= 7.7-6
+BuildRequires: xorg-x11-proto-devel >= 7.7-8
BuildRequires: xorg-x11-font-utils >= 7.2-11
-BuildRequires: xorg-x11-xtrans-devel >= 1.2.7
+BuildRequires: xorg-x11-xtrans-devel >= 1.3.2
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
BuildRequires: libX11-devel libXext-devel
@@ -207,6 +187,7 @@ BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
%if !0%{?rhel}
BuildRequires: wayland-devel pkgconfig(wayland-client)
+BuildRequires: pkgconfig(xshmfence) >= 1.1
%endif
BuildRequires: libXv-devel
BuildRequires: pixman-devel >= 0.30.0
@@ -226,8 +207,6 @@ BuildRequires: libunwind-devel
BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm)
BuildRequires: pkgconfig(xcb-keysyms)
-# blocking on https://bugzilla.redhat.com/show_bug.cgi?id=1027380
-#BuildRequires: pkgconfig(xshmfence)
# All server subpackages have a virtual provide for the name of the server
# they deliver. The Xorg one is versioned, the others are intentionally
@@ -298,7 +277,7 @@ Requires: xorg-x11-server-common >= %{version}-%{release}
Provides: Xnest
%description Xnest
-Xnest is an X server, which has been implemented as an ordinary
+Xnest is an X server which has been implemented as an ordinary
X application. It runs in a window just like other X applications,
but it is an X server itself in which you can run other software. It
is a very useful tool for developers who wish to test their
@@ -345,7 +324,7 @@ Requires: xorg-x11-server-common >= %{version}-%{release}
Provides: Xephyr
%description Xephyr
-Xephyr is an X server, which has been implemented as an ordinary
+Xephyr is an X server which has been implemented as an ordinary
X application. It runs in a window just like other X applications,
but it is an X server itself in which you can run other software. It
is a very useful tool for developers who wish to test their
@@ -434,7 +413,7 @@ test `getminor extension` == %{extension_minor}
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
%if %{with_hw_servers}
-%global dri_flags --with-dri-driver-path=%{drimoduledir} --enable-dri2
+%global dri_flags --with-dri-driver-path=%{drimoduledir} --enable-dri2 --enable-dri3
%else
%global dri_flags --disable-dri
%endif
@@ -452,6 +431,7 @@ sed -i 's/WAYLAND_SCANNER_RULES.*//g' configure.ac
# --with-pie ?
autoreconf -f -v --install || exit 1
# export CFLAGS="${RPM_OPT_FLAGS}"
+# XXX without dtrace
%configure --enable-maintainer-mode %{xservers} \
--disable-static \
@@ -462,9 +442,9 @@ autoreconf -f -v --install || exit 1
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
--with-os-name="$(hostname -s) $(uname -r)" \
--with-xkb-output=%{_localstatedir}/lib/xkb \
- --with-dtrace \
+ --without-dtrace \
--disable-linux-acpi --disable-linux-apm \
- --enable-xselinux --enable-record \
+ --enable-xselinux --enable-record --enable-present \
--enable-config-udev \
--disable-unit-tests \
%{?wayland} \
@@ -538,7 +518,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/xorg-server
%endif
# wtf
-%ifnarch %{ix86} x86_64 %{arm}
+%ifnarch %{ix86} x86_64
rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so
%endif
}
@@ -586,7 +566,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xorg/modules/libshadowfb.so
%{_libdir}/xorg/modules/libvgahw.so
%{_libdir}/xorg/modules/libwfb.so
-%ifarch %{ix86} x86_64 %{arm}
+%ifarch %{ix86} x86_64
%{_libdir}/xorg/modules/libint10.so
%{_libdir}/xorg/modules/libvbe.so
%endif
@@ -643,9 +623,9 @@ rm -rf $RPM_BUILD_ROOT
%if %{with_hw_servers}
%files devel
-%defattr(-,root,root,-)
%doc COPYING
-%{_docdir}/xorg-server
+%defattr(-,root,root,-)
+#{_docdir}/xorg-server
%{_bindir}/xserver-sdk-abi-requires
%{_libdir}/pkgconfig/xorg-server.pc
%dir %{_includedir}/xorg
@@ -659,6 +639,10 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Tue Dec 17 2013 Adam Jackson <ajax at redhat.com> 1.14.99.904-1
+- 1.15RC4
+- Re-disable int10 on arm
+
* Mon Dec 2 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.14.99.902-2
- Add aarch64 to platforms that have libunwind
More information about the scm-commits
mailing list