Changes between Version 6 and Version 7 of C201


Ignore:
Timestamp:
07/26/16 19:07:06 (6 years ago)
Author:
admin
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • C201

    v6 v7  
    1313== Xorg ==
    1414Recompile x without config_vt, so that we work with the chrome-OS kernel.
     15{{{
     16diff --git a/xorg-server-1.18.4/hw/xfree86/common/xf86Globals.c b/xorg-server-1.18.4/hw/xfree86/common/xf86Globals.c
     17index 93a35b8..6d5f77a 100644
     18--- a/xorg-server-1.18.4/hw/xfree86/common/xf86Globals.c
     19+++ b/xorg-server-1.18.4/hw/xfree86/common/xf86Globals.c
     20@@ -104,6 +104,9 @@ xf86InfoRec xf86Info = {
     21     .dontVTSwitch = FALSE,
     22     .autoVTSwitch = TRUE,
     23     .ShareVTs = FALSE,
     24+#ifdef linux
     25+    .NoVTs = FALSE,
     26+#endif
     27     .dontZap = FALSE,
     28     .dontZoom = FALSE,
     29     .notrapSignals = FALSE,
     30diff --git a/xorg-server-1.18.4/hw/xfree86/common/xf86Init.c b/xorg-server-1.18.4/hw/xfree86/common/xf86Init.c
     31index 9bade90..4ce6cfc 100644
     32--- a/xorg-server-1.18.4/hw/xfree86/common/xf86Init.c
     33+++ b/xorg-server-1.18.4/hw/xfree86/common/xf86Init.c
     34@@ -1457,6 +1457,12 @@ ddxProcessArgument(int argc, char **argv, int i)
     35         xf86Info.ShareVTs = TRUE;
     36         return 1;
     37     }
     38+#ifdef linux
     39+    if (!strcmp(argv[i], "-novts")) {
     40+        xf86Info.NoVTs = TRUE;
     41+        return 1;
     42+    }
     43+#endif
     44     if (!strcmp(argv[i], "-iglx") || !strcmp(argv[i], "+iglx")) {
     45         xf86Info.iglxFrom = X_CMDLINE;
     46         return 0;
     47diff --git a/xorg-server-1.18.4/hw/xfree86/common/xf86Privstr.h b/xorg-server-1.18.4/hw/xfree86/common/xf86Privstr.h
     48index c5d24ea..3269372 100644
     49--- a/xorg-server-1.18.4/hw/xfree86/common/xf86Privstr.h
     50+++ b/xorg-server-1.18.4/hw/xfree86/common/xf86Privstr.h
     51@@ -61,6 +61,9 @@ typedef struct {
     52     Bool dontVTSwitch;
     53     Bool autoVTSwitch;
     54     Bool ShareVTs;
     55+#ifdef linux
     56+    Bool NoVTs;
     57+#endif
     58     Bool dontZap;
     59     Bool dontZoom;
     60     Bool notrapSignals;         /* don't exit cleanly - die at fault */
     61diff --git a/xorg-server-1.18.4/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server-1.18.4/hw/xfree86/os-support/linux/lnx_init.c
     62index ca17493..6a6c349 100644
     63--- a/xorg-server-1.18.4/hw/xfree86/os-support/linux/lnx_init.c
     64+++ b/xorg-server-1.18.4/hw/xfree86/os-support/linux/lnx_init.c
     65@@ -179,6 +179,7 @@ xf86OpenConsole(void)
     66     const char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
     67 
     68     if (serverGeneration == 1) {
     69+        if (xf86Info.NoVTs != FALSE) {
     70         linux_parse_vt_settings(FALSE);
     71 
     72         if (!KeepTty) {
     73@@ -289,6 +290,7 @@ xf86OpenConsole(void)
     74             cfsetospeed(&nTty, 9600);
     75             tcsetattr(xf86Info.consoleFd, TCSANOW, &nTty);
     76         }
     77+        }
     78     }
     79     else {                      /* serverGeneration != 1 */
     80         if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
     81}}}
    1582
    1683== locales ==