fontmod.patch revision 1124
98N/A# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
98N/A#
684N/A# Permission is hereby granted, free of charge, to any person obtaining a
851N/A# copy of this software and associated documentation files (the "Software"),
98N/A# to deal in the Software without restriction, including without limitation
235N/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
493N/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,
493N/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.
919N/AAdd Sun's old "bitstream" font module to the list of obsolete modules
919N/Ato ignore in xorg.conf files.
919N/A
235N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
98N/Aindex 7c548eb..7638e5c 100644
98N/A--- a/hw/xfree86/common/xf86Config.c
98N/A+++ b/hw/xfree86/common/xf86Config.c
98N/A@@ -253,6 +253,7 @@ xf86ModulelistFromConfig(pointer **optlist)
98N/A char **modulearray;
98N/A char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
241N/A "freetype", "type1",
241N/A+ "bitstream",
520N/A NULL };
520N/A pointer *optarray;
98N/A XF86LoadPtr modp;
98N/A