rpms/xorg-x11-server/F-8 xserver-1.3.0-yet-more-vt-ioctl-hate.patch, NONE, 1.1 xorg-x11-server.spec, 1.259, 1.260
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Fri Nov 2 00:52:04 UTC 2007
- Previous message: rpms/rainbow/OLPC-2 .cvsignore, 1.5, 1.6 rainbow.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message: rpms/python-telepathy/F-8 .cvsignore, 1.8, 1.9 python-telepathy.spec, 1.13, 1.14 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18636
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.3.0-yet-more-vt-ioctl-hate.patch
Log Message:
* Thu Nov 01 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-34
- xserver-1.3.0-yet-more-vt-ioctl-hate.patch: You don't even want to know.
xserver-1.3.0-yet-more-vt-ioctl-hate.patch:
--- NEW FILE xserver-1.3.0-yet-more-vt-ioctl-hate.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_init.c.jx xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_init.c
--- xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_init.c.jx 2007-11-01 20:20:37.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_init.c 2007-11-01 20:33:00.000000000 -0400
@@ -87,7 +87,7 @@ restoreVtPerms(void)
void
xf86OpenConsole(void)
{
- int i, fd = -1;
+ int i, fd = -1, ret;
struct vt_mode VT;
struct vt_stat vts;
MessageType from = X_PROBED;
@@ -252,12 +252,18 @@ xf86OpenConsole(void)
* So we have to fail in that case. There's really no fixing this,
* it's a racy protocol.
*/
- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno)
+ );
+ if (ret < 0)
FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n",
strerror(errno));
- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno)
+ );
+ if (ret < 0)
FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
@@ -300,14 +306,20 @@ xf86OpenConsole(void)
/*
* now get the VT
*/
- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno)
+ );
+ if (ret < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed %s\n",
strerror(errno));
}
- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
- xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed %s\n",
- strerror(errno));
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno)
+ );
+ if (ret < 0)
+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed %s\n",
+ strerror(errno));
}
return;
}
@@ -349,14 +361,21 @@ xf86CloseConsole()
if (VTSwitch)
{
+ int ret;
/*
* Perform a switch back to the active VT when we were started
*/
if (activeVT >= 0) {
- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0)
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT)
+ );
+ if (ret < 0)
xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
strerror(errno));
- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT) < 0)
+ SYSCALL(
+ ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT)
+ );
+ if (ret < 0)
xf86Msg(X_WARNING, "xf86CloseConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
activeVT = -1;
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- xorg-x11-server.spec 18 Oct 2007 00:12:10 -0000 1.259
+++ xorg-x11-server.spec 2 Nov 2007 00:51:25 -0000 1.260
@@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
-Release: 33%{?dist}
+Release: 420%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -76,6 +76,8 @@
Patch2015: xserver-1.3.0-accidental-abi.patch
Patch2016: xserver-1.3.0-xorg-conf-man-randr-update.patch
Patch2017: xserver-1.3.0-update-quirks.patch
+Patch2018: xserver-1.3.0-late-sigusr1.patch
+Patch2019: xserver-1.3.0-yet-more-vt-ioctl-hate.patch
# assorted PCI layer shenanigans. oh the pain.
Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -85,8 +87,6 @@
Patch2504: xserver-1.3.0-domain-obiwan.patch
Patch2505: xserver-1.3.0-pci-device-enable.patch
-Patch9999: xserver-1.3.0-late-sigusr1.patch
-
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg
@@ -343,6 +343,8 @@
%patch2015 -p1 -b .accidental-abi
%patch2016 -p1 -b .document-randr
%patch2017 -p1 -b .update-quirk
+%patch2018 -p1 -b .sigusr1
+%patch2019 -p1 -b .jx
%patch2500 -p1 -b .unbreak-domains
%patch2501 -p1 -b .pci-bus-count
@@ -351,8 +353,6 @@
%patch2504 -p1 -b .domain-obiwan
%patch2505 -p1 -b .device-enable
-%patch9999 -p1 -b .jx
-
%build
%if %{fedora} == 7
@@ -620,6 +620,9 @@
%changelog
+* Thu Nov 01 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-34
+- xserver-1.3.0-yet-more-vt-ioctl-hate.patch: You don't even want to know.
+
* Thu Oct 18 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-33
- xserver-1.3.0-xorg-conf-man-randr-update.patch - update man page for randr setup
- xserver-1.3.0-update-quirks.patch - update quirks for more monitor issues
- Previous message: rpms/rainbow/OLPC-2 .cvsignore, 1.5, 1.6 rainbow.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message: rpms/python-telepathy/F-8 .cvsignore, 1.8, 1.9 python-telepathy.spec, 1.13, 1.14 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list