xserver: Branch 'xwayland' - 5 commits
Kristian Høgsberg
krh at kemper.freedesktop.org
Fri Sep 13 15:02:41 PDT 2013
hw/xfree86/common/xf86AutoConfig.c | 2 +-
hw/xfree86/common/xf86Config.c | 2 +-
hw/xfree86/common/xf86Init.c | 9 +++++++++
hw/xfree86/xwayland/xwayland-cursor.c | 1 -
hw/xfree86/xwayland/xwayland-output.c | 1 -
hw/xfree86/xwayland/xwayland-window.c | 1 -
hw/xfree86/xwayland/xwayland.c | 1 -
include/xorg-config.h.in | 3 +++
os/connection.c | 4 ----
9 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 1aff23235a72c5041a399dbbc56b2d67df577afd
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Fri Sep 13 14:53:16 2013 -0700
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/os/connection.c b/os/connection.c
index 499a4dd..65ca01b 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -64,7 +64,6 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <xorg-server.h>
#ifdef WIN32
#include <X11/Xwinsock.h>
#endif
@@ -1259,7 +1258,6 @@ MakeClientGrabPervious(ClientPtr client)
}
}
-#if defined(XQUARTZ) || defined(XORG_WAYLAND)
/* Add a fd (from launchd) to our listeners */
void
ListenOnOpenFD(int fd, int noxauth)
@@ -1334,5 +1332,3 @@ AddClientOnOpenFD(int fd)
return;
}
}
-
-#endif
commit 5144cbc9c131c19895ac25a60d325b50236f44e5
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Fri Sep 13 14:52:13 2013 -0700
xwayland: Don't include xorg-server.h
xorg-config.h now has the XORG_WAYLAND define.
diff --git a/hw/xfree86/xwayland/xwayland-cursor.c b/hw/xfree86/xwayland/xwayland-cursor.c
index f8860bd..1cd6457 100644
--- a/hw/xfree86/xwayland/xwayland-cursor.c
+++ b/hw/xfree86/xwayland/xwayland-cursor.c
@@ -32,7 +32,6 @@
#include <sys/mman.h>
#include <wayland-client.h>
-#include <xorg-server.h>
#include <cursorstr.h>
#include <xf86Crtc.h>
#include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index 53829c3..25f425f 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -32,7 +32,6 @@
#include <sys/mman.h>
#include <wayland-client.h>
-#include <xorg-server.h>
#include <cursorstr.h>
#include <xf86Crtc.h>
#include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index d56e0d0..88f57ce 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -33,7 +33,6 @@
#include <wayland-client.h>
#include <X11/extensions/compositeproto.h>
-#include <xorg-server.h>
#include <xf86Crtc.h>
#include <selection.h>
#include <compositeext.h>
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index e8c58fd..c70a52d 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -34,7 +34,6 @@
#include <wayland-util.h>
#include <wayland-client.h>
-#include <xorg-server.h>
#include <extinit.h>
#include <xf86Xinput.h>
commit 96a9c5b83b9942214e3e7850d4737312d55b67e6
Author: Giovanni Campagna <gcampagn at redhat.com>
Date: Fri Sep 13 15:52:30 2013 +0200
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/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index d5a3370..b35cb96 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -285,7 +285,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
if (i < (nmatches - 1)) {
#ifdef XORG_WAYLAND
if (xorgWayland)
- matches[i++] = xnfstrdup("wlshm");
+ matches[i++] = xnfstrdup("wayland");
else
#endif
#if !defined(__linux__) && defined(__sparc__)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index c68b8db..4a2c7c0 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 };
#ifdef XORG_WAYLAND
- static const char *fallback_wayland[2] = { "wlshm", NULL };
+ static const char *fallback_wl[2] = { "wayland", NULL };
#endif
const char **fallbacks;
char **end, **drv;
commit a03dc2a9d79a3311584cbca7b9e99f5af5808c3e
Author: Giovanni Campagna <gcampagn at redhat.com>
Date: Fri Sep 13 15:52:29 2013 +0200
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.
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 0df31ae..8aec1d8 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -142,4 +142,7 @@
/* Define to 1 if you have the `seteuid' function. */
#undef HAVE_SETEUID
+/* Building Xorg server. */
+#undef XORG_WAYLAND
+
#endif /* _XORG_CONFIG_H_ */
commit 585f8f14be5b968d5c254de1f8e33e9580c69dfa
Author: Ray Strode <rstrode at redhat.com>
Date: Fri Sep 13 17:17:16 2013 -0400
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/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2d3bb01..6282252 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -558,6 +558,15 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
+ for (i = 0; i < xf86NumDrivers; i++) {
+ if (xf86DriverList[i] == NULL) {
+ for (j = i; j < xf86NumDrivers; j++) {
+ xf86DriverList[j] = xf86DriverList[j + 1];
+ }
+ xf86NumDrivers--;
+ }
+ }
+
if (xorgHWOpenConsole)
xf86OpenConsole();
else
More information about the xorg-commit
mailing list