fontmod.patch revision 1265
943N/A# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
234N/A#
234N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
1265N/A
879N/AAdd Sun's old "bitstream" font module to the list of obsolete modules
879N/Ato ignore in xorg.conf files.
234N/A
1124N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
1265N/Aindex 1455dae..f02a7ba 100644
1124N/A--- a/hw/xfree86/common/xf86Config.c
1124N/A+++ b/hw/xfree86/common/xf86Config.c
1265N/A@@ -252,6 +252,7 @@ xf86ModulelistFromConfig(pointer **optlist)
606N/A char **modulearray;
1265N/A const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
1265N/A "freetype", "type1",
1265N/A+ "bitstream",
1265N/A NULL };
606N/A pointer *optarray;
606N/A XF86LoadPtr modp;