equal
deleted
inserted
replaced
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 Add Sun's old "bitstream" font module to the list of obsolete modules |
21 Add Sun's old "bitstream" font module to the list of obsolete modules |
22 to ignore in xorg.conf files. |
22 to ignore in xorg.conf files. |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
24 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
25 --- hw/xfree86/common/xf86Config.c 2010-01-07 18:14:17.933694496 -0800 |
25 --- hw/xfree86/common/xf86Config.c 2010-09-03 16:45:07.229888581 -0700 |
26 +++ hw/xfree86/common/xf86Config.c 2010-01-07 18:14:19.290141839 -0800 |
26 +++ hw/xfree86/common/xf86Config.c 2010-09-03 16:45:09.170375390 -0700 |
27 @@ -246,6 +246,7 @@ xf86ModulelistFromConfig(pointer **optli |
27 @@ -256,6 +256,7 @@ xf86ModulelistFromConfig(pointer **optli |
28 char **modulearray; |
28 char **modulearray; |
29 char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", |
29 char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", |
30 "freetype", "type1", |
30 "freetype", "type1", |
31 + "bitstream", |
31 + "bitstream", |
32 NULL }; |
32 NULL }; |