open-src/xserver/xorg/fontmod.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Tue, 02 Mar 2010 13:31:46 -0800
changeset 919 425233ae7236
parent 879 4bb8651330bd
child 943 294f64612d23
permissions -rw-r--r--
6931307 Standardize Sun copyright & license notices in X gate on current format
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
879
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
     1
# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
     2
# Use is subject to license terms.
234
2ff870054a37 6611542 Xorg unable to load Type1 font module in snv_74
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     3
#
2ff870054a37 6611542 Xorg unable to load Type1 font module in snv_74
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     4
# Permission is hereby granted, free of charge, to any person obtaining a
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
     5
# copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
     6
# to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
     7
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
     8
# and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
     9
# Software is furnished to do so, subject to the following conditions:
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    10
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    11
# The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    12
# paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    13
# Software.
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    14
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    15
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    16
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    17
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    18
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    19
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    20
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 879
diff changeset
    21
# DEALINGS IN THE SOFTWARE.
879
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    22
Add Sun's old "bitstream" font module to the list of obsolete modules
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    23
to ignore in xorg.conf files.
234
2ff870054a37 6611542 Xorg unable to load Type1 font module in snv_74
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    24
2ff870054a37 6611542 Xorg unable to load Type1 font module in snv_74
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
879
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    26
--- hw/xfree86/common/xf86Config.c	2010-01-07 18:14:17.933694496 -0800
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    27
+++ hw/xfree86/common/xf86Config.c	2010-01-07 18:14:19.290141839 -0800
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    28
@@ -246,6 +246,7 @@ xf86ModulelistFromConfig(pointer **optli
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 234
diff changeset
    29
     char **modulearray;
879
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    30
     char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    31
 		       "freetype", "type1",
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    32
+		       "bitstream",
4bb8651330bd 6915162 Xorg server upgrade from 1.7.3 to 1.7.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
    33
 		       NULL };
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 234
diff changeset
    34
     pointer *optarray;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 234
diff changeset
    35
     XF86LoadPtr modp;