debian/changelog | 7 ++++
debian/patches/198_nohwaccess.patch | 56 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 64 insertions(+)
New commits:
commit 790c92848851ba3e92d014653cb718485acbdac9
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Mon Feb 8 19:22:34 2010 -0800
Add -nohwaccess patch
diff --git a/debian/changelog b/debian/changelog
index 65d8c86..c0002ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,13 @@ xorg-server (2:1.7.4-1) unstable; urgency=low
-- Julien Cristau <jcris...@debian.org> Tue, 12 Jan 2010 10:49:22 +0000
+xorg-server (2:1.7.3.902-1ubuntu12) lucid; urgency=low
+
+ * Add 198_nohwaccess.patch: Needed for rootless X. Adds a -nohwaccess
+ argument to make X not access the hardware ports directly.
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 05 Feb 2010 22:17:20 -0800
+
xorg-server (2:1.7.3.902-1ubuntu11) lucid; urgency=low
* Add 196_xvfb-fbscreeninit-handling.patch and 197_xvfb-randr.patch:
diff --git a/debian/patches/198_nohwaccess.patch
b/debian/patches/198_nohwaccess.patch
new file mode 100644
index 0000000..b7fc38f
--- /dev/null
+++ b/debian/patches/198_nohwaccess.patch
@@ -0,0 +1,56 @@
+Two chunks of jbarne's nohwaccess patch got taken upstream; this patch
+contains just the remainder, which implements a -nohwaccess option.
+
+diff --git a/hw/xfree86/os-support/linux/lnx_init.c
b/hw/xfree86/os-support/linux/lnx_init.c
+index 7f40857..cf58c01 100644
+--- a/hw/xfree86/os-support/linux/lnx_init.c
++++ b/hw/xfree86/os-support/linux/lnx_init.c
+@@ -49,6 +49,7 @@ static Bool KeepTty = FALSE;
+ static int VTnum = -1;
+ static Bool VTSwitch = TRUE;
+ static Bool ShareVTs = FALSE;
++Bool NoHwAccess = FALSE;
+ static int activeVT = -1;
+
+ static int vtPermSave[4];
+@@ -433,6 +438,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
+ ShareVTs = TRUE;
+ return(1);
+ }
++ if (!strcmp(argv[i], "-nohwaccess"))
++ {
++ NoHwAccess = TRUE;
++ return(1);
++ }
+ if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
+ {
+ if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
+@@ -454,5 +464,6 @@ xf86UseMsg()
+ ErrorF("don't detach controlling tty (for debugging only)\n");
+ ErrorF("-novtswitch don't immediately switch to new VT\n");
+ ErrorF("-sharevts share VTs with another X server\n");
++ ErrorF("-nohwaccess don't access hardware ports directly\n");
+ return;
+ }
+diff --git a/hw/xfree86/os-support/linux/lnx_video.c
b/hw/xfree86/os-support/linux/lnx_video.c
+index 688106a..34a845b 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -51,6 +51,7 @@
+ #define MAP_FAILED ((void *)-1)
+ #endif
+
++extern Bool NoHwAccess;
+ static Bool ExtendedEnabled = FALSE;
+
+ #ifdef __ia64__
+@@ -509,6 +510,9 @@ xf86EnableIO(void)
+ int fd;
+ unsigned int ioBase_phys;
+ #endif
++ /* Fake it... */
++ if (NoHwAccess)
++ return TRUE;
+
+ if (ExtendedEnabled)
+ return TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index 3fe762f..0c0d23f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@
191-Xorg-add-an-extra-module-path.patch
196_xvfb-fbscreeninit-handling.patch
197_xvfb-randr.patch
+198_nohwaccess.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
