rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Only look at wayland-capable drivers when run with -wayland

Browse Source
This commit is contained in:
Adam Jackson 2013-10-02 12:52:58 -04:00
parent 15e2ab311c
commit 38831524ad
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch Normal file
View File

@ -0,0 +1,55 @@
From 6c6e1299492699d1f4cedaeb41503f31d1e9c6ec Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 2 Oct 2013 12:38:45 -0400
Subject: [PATCH] xfree86: Only look at wayland-capable drivers when -wayland
given
There's no particularly good reason to support mixing wayland and
non-wayland screens in the same Xorg instance, and it probably doesn't
work correctly, so let's prevent people from injuring themselves.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ray Strode <rstrode@redhat.com>
---
hw/xfree86/common/xf86Init.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a5a7daf..a7d2e0e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -550,22 +550,22 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
xf86DriverList[i]->driverFunc(NULL,
GET_REQUIRED_HW_INTERFACES,
&flags);
-
- if (NEED_IO_ENABLED(flags))
- want_hw_access = TRUE;
-
- if (!(flags & HW_SKIP_CONSOLE))
- xorgHWOpenConsole = TRUE;
-
if (xorgWayland) {
- if (flags != HW_WAYLAND) {
+ if (!(flags & HW_WAYLAND)) {
xf86DeleteDriver(i);
continue;
}
want_hw_access = FALSE;
xorgHWOpenConsole = FALSE;
- }
+
+ } else {
+ if (NEED_IO_ENABLED(flags))
+ want_hw_access = TRUE;
+
+ if (!(flags & HW_SKIP_CONSOLE))
+ xorgHWOpenConsole = TRUE;
+ }
}
for (i = 0; i < xf86NumDrivers; i++) {
--
1.8.3.1

6
xorg-x11-server.spec
View File

@ -42,7 +42,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.14.3
Release: 2%{?gitdate:.%{gitdate}}%{dist}
Release: 3%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -152,6 +152,7 @@ Patch9027: 0027-os-Don-t-include-xorg-server.h.patch
Patch9028: 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
Patch9029: 0029-xwayland-Remove-unused-variables.patch
Patch9030: 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
Patch9031: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
@ -631,6 +632,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Wed Oct 02 2013 Adam Jackson <ajax@redhat.com> 1.14.3-3
- Only look at wayland-capable drivers when run with -wayland
* Mon Sep 23 2013 Adam Jackson <ajax@redhat.com> 1.14.3-2
- xwayland support