rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 227104 from X11:XOrg

Browse Source 
- obsolete glamor-devel from the correct package (forwarded request 227099 from coolo)

OBS-URL: https://build.opensuse.org/request/show/227104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=284
This commit is contained in:
Stephan Kulow 2014-03-22 18:46:16 +00:00 committed by Git OBS Bridge
commit b8a810d27b
6 changed files with 35 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
U_keep_non_seat0_x_server_from_touching_vts.patch
View File

@ -1,45 +0,0 @@
From 405e2805d3903a8a631f01924593a227c634f05d Mon Sep 17 00:00:00 2001
From: Laércio de Sousa <lbsousajr@gmail.com>
Date: Thu, 12 Dec 2013 16:22:48 +0000
Subject: xfree86: Keep a non-seat0 X server from touching VTs (#71258)
Updated patch following Hans de Goede's advice.
If -seat option is passed with a value different from seat0,
X server won't call xf86OpenConsole().
This is needed to avoid any race condition between seat0 and
non-seat0 X servers. If a non-seat0 X server opens a given VT
before a seat0 one which expects to open the same VT, one can
get an inactive systemd-logind graphical session for seat0.
This patch was first tested in a multiseat setup with multiple
video cards and works quite well.
I suppose it can also make things like DontVTSwitch and -sharevts
meaningless for non-seat0 seats, so it may fix bug #69477, too.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=71258
https://bugs.freedesktop.org/show_bug.cgi?id=69477 (maybe)
See also: http://lists.x.org/archives/xorg-devel/2013-October/038391.html
https://bugzilla.redhat.com/show_bug.cgi?id=1018196
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 91ec4c8..1e95061 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -544,7 +544,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (NEED_IO_ENABLED(flags))
want_hw_access = TRUE;
- if (!(flags & HW_SKIP_CONSOLE))
+ /* Non-seat0 X servers should not open console */
+ if (!(flags & HW_SKIP_CONSOLE) && !ServerIsNotSeat0())
xorgHWOpenConsole = TRUE;
}
--
cgit v0.9.0.2-2-gbebe

3
xorg-server-1.15.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8
size 5546579

3
xorg-server-1.15.99.901.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:011bc1cbda0d6968d0cd987434582e22282466f3a129738a547666640e508b8d
size 3779951

4
xorg-server-provides
View File

@ -1,4 +1,4 @@
Provides: X11_ABI_XINPUT = 20.0
Provides: X11_ABI_VIDEODRV = 15.0
Provides: X11_ABI_XINPUT = 21.0
Provides: X11_ABI_VIDEODRV = 16.0
Provides: X11_ABI_ANSIC = 0.4
Provides: X11_ABI_EXTENSION = 8.0

17
xorg-x11-server.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Mar 22 07:02:56 UTC 2014 - coolo@suse.com
- obsolete glamor-devel from the correct package
-------------------------------------------------------------------
Fri Mar 21 09:40:03 UTC 2014 - sndirsch@suse.com
- obsolete also glamor and glamor-devel in addition to glamor-egl
-------------------------------------------------------------------
Mon Feb 24 23:15:41 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
- Update to version 1.16.0pre:
- Remove upstreamed patches:
+ Patch223: U_keep_non_seat0_x_server_from_touching_vts.patch
-------------------------------------------------------------------
Mon Feb 24 11:01:00 UTC 2014 - eich@suse.com

18
xorg-x11-server.spec
View File

@ -18,7 +18,7 @@
Name: xorg-x11-server
%define dirsuffix 1.15.0
%define dirsuffix 1.15.99.901.7
Summary: X
License: MIT
@ -42,6 +42,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0
BuildRequires: pkgconfig(damageproto) >= 1.1
BuildRequires: pkgconfig(dmx) >= 1.0.99.1
BuildRequires: pkgconfig(epoxy) >= 1.1
BuildRequires: pkgconfig(fixesproto) >= 4.1
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(fontenc)
@ -109,6 +110,12 @@ Provides: xorg-x11-Xvfb
Provides: xorg-x11-server-glx
Obsoletes: xorg-x11-Xvfb
Obsoletes: xorg-x11-server-glx
Provides: glamor = %{version}
Provides: glamor-egl = %{version}
Obsoletes: glamor < %{version}
Obsoletes: glamor-egl < %{version}
# Xvfb requires keyboard files as well (bnc#797124)
Requires: xkeyboard-config
@ -135,7 +142,6 @@ Patch107: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch
Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
Patch222: b_sync-fix.patch
Patch223: U_keep_non_seat0_x_server_from_touching_vts.patch
%description
This package contains the X.Org Server.
@ -180,6 +186,8 @@ Requires: pkgconfig(xtrans)
Requires: pkgconfig(xv)
Provides: xorg-x11-sdk
Obsoletes: xorg-x11-sdk
Provides: glamor-devel = %{version}
Obsoletes: glamor-devel < %{version}
%description sdk
This package contains the X.Org Server SDK.
@ -190,12 +198,13 @@ This package contains the X.Org Server SDK.
sh %{SOURCE92} --verify . %{SOURCE91}
cp %{SOURCE90} .
%patch0 -p1
%patch1
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch6 -p0
#
%patch100
%patch101
%patch102 -p1
@ -212,8 +221,6 @@ cp %{SOURCE90} .
### patch222 might not be applicable anymore
#%patch222 -p1
%patch223 -p1
%build
autoreconf -fi
%configure CFLAGS="%{optflags} -fno-strict-aliasing" \
@ -223,6 +230,7 @@ autoreconf -fi
--enable-dri \
--enable-dri2 \
--enable-dri3 \
--enable-glamor \
--enable-dmx \
--enable-xnest \
--enable-kdrive \