[xorg-x11-server] xserver 1.11rc2
Adam Jackson
ajax at fedoraproject.org
Thu Aug 18 15:12:26 UTC 2011
commit 82739d88d573187b404a350a1e855357e21eecce
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Aug 18 11:12:10 2011 -0400
xserver 1.11rc2
.gitignore | 1 +
commitid | 2 +-
sources | 1 +
xorg-x11-server.spec | 31 +-
xserver-1.10-pointer-barriers.patch | 645 --------------------
...onfig-add-udev-systemd-multi-seat-support.patch | 67 +-
xserver-1.5.0-bg-none-root.patch | 155 -----
7 files changed, 48 insertions(+), 854 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f861ff..8153500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.10.0.tar.bz2
/xorg-server-20110418.tar.xz
/xorg-server-20110510.tar.xz
+/xorg-server-20110818.tar.xz
diff --git a/commitid b/commitid
index 95bc95f..04f751b 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3
+ac2c307f4716ebd3e955c004ceec9f4c029401a0
diff --git a/sources b/sources
index ec050ca..1dd1a10 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
057d7e203b21055711e545373d07c5d6 xorg-server-20110510.tar.xz
+4e9245e6a9a7e71d2176d8d8e85c7ec4 xorg-server-20110818.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 97f009a..16edaec 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -17,24 +17,23 @@
# because rpm is a terrible language. HTFU.
%define ansic_major 0
%define ansic_minor 4
-%define videodrv_major 10
+%define videodrv_major 11
%define videodrv_minor 0
-%define xinput_major 12
-%define xinput_minor 2
+%define xinput_major 13
+%define xinput_minor 0
%define extension_major 5
%define extension_minor 0
%define pkgname xorg-server
-%define gitdate 20110510
+%define gitdate 20110818
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.10.99.1
-Release: 10%{?gitdate:.%{gitdate}}%{dist}
+Version: 1.10.99.902
+Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#VCS: git:git://git.freedesktop.org/git/xorg/xserver
%if 0%{?gitdate}
@@ -81,8 +80,6 @@ Patch6030: xserver-1.6.99-right-of.patch
# fallback to vesa when module is missing seems broken
Patch6053: xserver-1.8-disable-vboxvideo.patch
-# misc
-Patch7006: xserver-1.10-pointer-barriers.patch
# tests require Xorg
Patch7007: xserver-1.10.99.1-test.patch
@@ -392,18 +389,11 @@ install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}
# Make the source package
%define xserver_source_dir %{_datadir}/xorg-x11-server-source
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
-mkdir -p %{inst_srcdir}/{doc/xml{,/dtrace},Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
-mkdir -p %{inst_srcdir}/{hw/dmx/doc,doc/man}
-cp {,%{inst_srcdir}/}doc/xml/xmlrules.in
-cp {,%{inst_srcdir}/}doc/xml/xmlrules-noinst.in
-cp {,%{inst_srcdir}/}doc/xml/xmlrules-inst.in
-cp {,%{inst_srcdir}/}doc/xml/xserver.ent.in
-cp {,%{inst_srcdir}/}doc/xml/Xserver-spec.xml
-cp {,%{inst_srcdir}/}doc/xml/dtrace/Xserver-DTrace.xml
+mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
+mkdir -p %{inst_srcdir}/{hw/dmx/doc,man,doc}
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
-cp {,%{inst_srcdir}/}doc/man/Xserver.man
+cp {,%{inst_srcdir}/}man/Xserver.man
cp {,%{inst_srcdir}/}doc/smartsched
-cp {,%{inst_srcdir}/}hw/dmx/doc/doxygen.conf.in
cp xkb/README.compiled %{inst_srcdir}/xkb
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
@@ -560,6 +550,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> 1.10.99.902-1.20110818
+- xserver 1.11rc2
+
* Fri Jul 29 2011 Dave Airlie <airlied at redhat.com> 1.10.99.1-10.2011051
- xvfb-run requires xauth installed, fix requires (from jlaska on irc)
diff --git a/xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch b/xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch
index f07fdba..bd832f8 100644
--- a/xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch
+++ b/xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch
@@ -1,4 +1,4 @@
-From 8d9371f9035654cbb694ad51cf384a78b044bb9f Mon Sep 17 00:00:00 2001
+From 5a555338bf11afb5942daabfdae8638e7aab2ac6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 18 Jul 2011 21:19:23 +0200
Subject: [PATCH] config: add udev/systemd multi-seat support
@@ -36,16 +36,16 @@ Conflicts:
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
- config/udev.c | 19 +++++++++++++++++++
- doc/man/Xserver.man | 6 ++++++
+ config/udev.c | 18 ++++++++++++++++++
hw/xfree86/common/xf86Init.c | 19 +++++++++++++++++++
include/globals.h | 2 +-
include/xserver-properties.h | 3 +++
+ man/Xserver.man | 6 ++++++
os/utils.c | 10 ++++++++++
- 6 files changed, 58 insertions(+), 1 deletions(-)
+ 6 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/config/udev.c b/config/udev.c
-index 9ac34ee..ca978b0 100644
+index e7383dc..fc6ee5d 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -35,6 +35,7 @@
@@ -81,9 +81,9 @@ index 9ac34ee..ca978b0 100644
if (!udev_device_get_property_value(udev_device, "ID_INPUT")) {
LogMessageVerb(X_INFO, 10,
"config/udev: ignoring device %s without "
-@@ -283,6 +295,9 @@ config_udev_init(void)
- if (!udev_monitor)
- return 0;
+@@ -284,6 +296,9 @@ config_udev_init(void)
+ udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "input", NULL);
+ udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "tty", NULL); /* For Wacom serial devices */
+ if (SeatId && strcmp(SeatId, "seat0"))
+ udev_monitor_filter_add_match_tag(udev_monitor, SeatId);
@@ -91,36 +91,18 @@ index 9ac34ee..ca978b0 100644
if (udev_monitor_enable_receiving(udev_monitor)) {
ErrorF("config/udev: failed to bind the udev monitor\n");
return 0;
-@@ -291,6 +306,10 @@ config_udev_init(void)
- enumerate = udev_enumerate_new(udev);
- if (!enumerate)
- return 0;
-+
+@@ -296,6 +311,9 @@ config_udev_init(void)
+ udev_enumerate_add_match_subsystem(enumerate, "input");
+ udev_enumerate_add_match_subsystem(enumerate, "tty");
+
+ if (SeatId && strcmp(SeatId, "seat0"))
+ udev_enumerate_add_match_tag(enumerate, SeatId);
+
udev_enumerate_scan_devices(enumerate);
devices = udev_enumerate_get_list_entry(enumerate);
udev_list_entry_foreach(device, devices) {
-diff --git a/doc/man/Xserver.man b/doc/man/Xserver.man
-index b725949..8d23894 100644
---- a/doc/man/Xserver.man
-+++ b/doc/man/Xserver.man
-@@ -220,6 +220,12 @@ sets screen-saver timeout time in minutes.
- .B \-su
- disables save under support on all screens.
- .TP 8
-+.B \-seat \fIseat\fP
-+seat to run on. Takes a string identifying a seat in a platform
-+specific syntax. On platforms which support this feature this may be
-+used to limit the server to expose only a specific subset of devices
-+connected to the system.
-+.TP 8
- .B \-t \fInumber\fP
- sets pointer acceleration threshold in pixels (i.e. after how many pixels
- pointer acceleration should take effect).
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 0b36163..6dbbd77 100644
+index 71926f8..a268ced 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -80,6 +80,7 @@
@@ -170,7 +152,7 @@ index 8b80a65..17bca82 100644
#ifdef DPMSExtension
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
-index c6259ae..a0936a5 100644
+index 2b1feab..bf50042 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -30,6 +30,9 @@
@@ -183,8 +165,25 @@ index c6259ae..a0936a5 100644
/* BOOL. 0 - device disabled, 1 - device enabled */
#define XI_PROP_ENABLED "Device Enabled"
/* BOOL. If present, device is a virtual XTEST device */
+diff --git a/man/Xserver.man b/man/Xserver.man
+index f743912..1a36b09 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -220,6 +220,12 @@ sets screen-saver timeout time in minutes.
+ .B \-su
+ disables save under support on all screens.
+ .TP 8
++.B \-seat \fIseat\fP
++seat to run on. Takes a string identifying a seat in a platform
++specific syntax. On platforms which support this feature this may be
++used to limit the server to expose only a specific subset of devices
++connected to the system.
++.TP 8
+ .B \-t \fInumber\fP
+ sets pointer acceleration threshold in pixels (i.e. after how many pixels
+ pointer acceleration should take effect).
diff --git a/os/utils.c b/os/utils.c
-index 36cb46f..e8ecb71 100644
+index 6338860..db2ae84 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -201,6 +201,8 @@ Bool PanoramiXExtensionDisabledHack = FALSE;
@@ -204,7 +203,7 @@ index 36cb46f..e8ecb71 100644
ErrorF("-t # default pointer threshold (pixels/t)\n");
ErrorF("-terminate terminate at server reset\n");
ErrorF("-to # connection time out\n");
-@@ -802,6 +805,13 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -813,6 +816,13 @@ ProcessCommandLine(int argc, char *argv[])
else
UseMsg();
}
More information about the scm-commits
mailing list