Mercurial Mercurial > upstream > oracle > x-cons > x-s12-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@Sun.COM>
Thu, 15 Jan 2009 12:55:00 -0800
changeset 606 068c11b419c9
parent 198 7cb95e4f130b
child 677 ee6c21760fea
permissions -rw-r--r--
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Includes changes contributed by Liang, Kan <[email protected]>: - G41 support patches - DRM_CAS in libdrm type error can cause deadlock and hang the glxgears. Includes changes contributed by Martin Bochnig <[email protected]>: - Make SUNWxorg-mesa package platform-clean
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
     1
 
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Configure.c hw/xfree86/common/xf86Configure.c
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
     2
 
--- hw/xfree86/common/xf86Configure.c	2008-09-23 11:24:58.000000000 -0700
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
     3
 
+++ hw/xfree86/common/xf86Configure.c	2008-09-24 20:18:22.067988000 -0700
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
     4
 
@@ -555,7 +555,8 @@ configureModuleSection (void)
144
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
     5
 
             /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
     6
 
     	    if (defaultFontPath && (
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
     7
 
 		(strcmp(*el, "freetype")  == 0 &&
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
     8
 
-		 strstr(defaultFontPath, "/TTF")) ||
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
     9
 
+ 		 (strstr(defaultFontPath, "/TrueType") ||
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
    10
 
+ 		  strstr(defaultFontPath, "/TTF"))) ||
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
    11
 
     	        (strcmp(*el, "type1")  == 0 &&
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
    12
 
 		 strstr(defaultFontPath, "/Type1"))))
be9658af83e1 6546692 Xorg -configure should create xorg.file to include bitstream by default
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 98
diff changeset 
    13
 
 	    	ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    14
 
diff -urp -x '*~' -x '*.orig' xkb/xkbInit.c xkb/xkbInit.c
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    15
 
--- xkb/xkbInit.c	2008-09-23 11:25:01.000000000 -0700
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    16
 
+++ xkb/xkbInit.c	2008-09-24 20:18:22.068856000 -0700
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    17
 
@@ -123,7 +123,7 @@ typedef struct	_SrvXkmInfo {
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    18
 
 #endif
198
7cb95e4f130b 6582847 XErrorDB path is incorrect
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 144
diff changeset 
    19
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    20
 
 char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    21
 
-char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    22
 
+char	*		XkbBinDirectory=	XKB_BASE_DIRECTORY;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    23
 
 static int	 	XkbWantAccessX=		0;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    24
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 198
diff changeset 
    25
 
 static Bool		rulesDefined=		False;
upstream/oracle/x-cons/x-s12-clone