Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xorg/sun-paths.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 21 Oct 2010 14:40:25 -0700
changeset 1018 baa7bc85407b
parent 851 d428083dbbdd
child 1088 1c99106ccbe0
permissions -rw-r--r--
6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1018
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     1
 
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     2
 
--- hw/xfree86/common/xf86Config.c	2010-05-03 17:47:58.000000000 -0700
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     3
 
+++ hw/xfree86/common/xf86Config.c	2010-10-20 20:27:00.062592706 -0700
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     4
 
@@ -77,9 +77,9 @@ extern DeviceAssocRec mouse_assoc;
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     5
 
  */
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     6
 
 #ifndef ROOT_CONFIGPATH
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     7
 
 #define ROOT_CONFIGPATH	"%A," "%R," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     8
 
-			"/etc/X11/%R," "%P/etc/X11/%R," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     9
 
+			"/etc/X11/%R," "%P/lib/X11/%R," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    10
 
 			"%E," "%F," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    11
 
-			"/etc/X11/%F," "%P/etc/X11/%F," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    12
 
+			"/etc/X11/%F," "%P/lib/X11/%F," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    13
 
 			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    14
 
 			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    15
 
 			"%P/etc/X11/%X," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    16
 
@@ -87,8 +87,8 @@ extern DeviceAssocRec mouse_assoc;
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    17
 
 			"%P/lib/X11/%X"
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    18
 
 #endif
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    19
 
 #ifndef USER_CONFIGPATH
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    20
 
-#define USER_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    21
 
-			"/etc/X11/%G," "%P/etc/X11/%G," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    22
 
+#define USER_CONFIGPATH	"/etc/X11/%S," "%P/lib/X11/%S," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    23
 
+			"/etc/X11/%G," "%P/lib/X11/%G," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    24
 
 			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    25
 
 			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    26
 
 			"%P/etc/X11/%X," \
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    27
 
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    28
 
--- hw/xfree86/common/xf86Globals.c	2009-11-22 16:35:01.000000000 -0800
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    29
 
+++ hw/xfree86/common/xf86Globals.c	2009-12-02 18:57:45.196668578 -0800
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    30
 
@@ -143,7 +143,8 @@ xf86InfoRec xf86Info = {
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    31
 
 #endif
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    32
 
 };
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    33
 
 const char *xf86ConfigFile = NULL;
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    34
 
-const char *xf86ModulePath = DEFAULT_MODULE_PATH;
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    35
 
+/* Sun: add old module path for compatibility with out-of-tree driver packages */
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    36
 
+const char *xf86ModulePath = DEFAULT_MODULE_PATH ",/usr/X11/lib/modules/";
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    37
 
 MessageType xf86ModPathFrom = X_DEFAULT;
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    38
 
 const char *xf86LogFile = DEFAULT_LOGPREFIX;
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 815
diff changeset 
    39
 
 MessageType xf86LogFileFrom = X_DEFAULT;
1018
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    40
 
diff -urp -x '*~' -x '*.orig' hw/xfree86/doc/man/xorg.conf.man.pre hw/xfree86/doc/man/xorg.conf.man.pre
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    41
 
--- hw/xfree86/doc/man/xorg.conf.man.pre	2010-05-03 17:47:59.000000000 -0700
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    42
 
+++ hw/xfree86/doc/man/xorg.conf.man.pre	2010-10-20 20:27:00.063252935 -0700
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    43
 
@@ -28,9 +28,9 @@ server is started as a normal user:
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    44
 
 .RS 4
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    45
 
 .nf
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    46
 
 .IR /etc/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    47
 
-.IR __projectroot__/etc/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    48
 
+.IR __projectroot__/lib/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    49
 
 .IB /etc/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    50
 
-.IB __projectroot__/etc/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    51
 
+.IB __projectroot__/lib/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    52
 
 .I /etc/X11/__xconfigfile__\-4
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    53
 
 .I /etc/X11/__xconfigfile__
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    54
 
 .I /etc/__xconfigfile__
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    55
 
@@ -62,10 +62,10 @@ search locations are as follows:
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    56
 
 .nf
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    57
 
 <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    58
 
 .IR /etc/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    59
 
-.IR __projectroot__/etc/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    60
 
+.IR __projectroot__/lib/X11/ <cmdline>
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    61
 
 .B $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    62
 
 .IB /etc/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    63
 
-.IB __projectroot__/etc/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    64
 
+.IB __projectroot__/lib/X11/ $XORGCONFIG
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    65
 
 .I /etc/X11/__xconfigfile__\-4
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    66
 
 .I /etc/X11/__xconfigfile__
baa7bc85407b 6935429 xorg.conf.vesa should be delivered with X server [PSARC/2010/161]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    67
 
 .I /etc/__xconfigfile__
upstream/oracle/x-cons/x-s11-update-clone