From 01e1892583a74a9344a774d57be6fa86360212d0 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 31 Jan 2010 18:37:21 -0600 Subject: system-templates: remove load type1 per FS#579 --- abs/core-testing/system-templates/PKGBUILD | 2 +- abs/core-testing/system-templates/templates/xorg/modeline.ATSC | 4 ++-- abs/core-testing/system-templates/templates/xorg/xorg.conf.ati | 2 +- abs/core-testing/system-templates/templates/xorg/xorg.conf.intel | 2 +- abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia | 2 +- abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa | 2 +- abs/core-testing/system-templates/templates/xorg/xorg.conf.via | 2 +- abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD index 0dd7fb4..eb37335 100755 --- a/abs/core-testing/system-templates/PKGBUILD +++ b/abs/core-testing/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=1.0 -pkgrel=37 +pkgrel=38 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core-testing/system-templates/templates/xorg/modeline.ATSC b/abs/core-testing/system-templates/templates/xorg/modeline.ATSC index b2cd709..a4e1a6b 100644 --- a/abs/core-testing/system-templates/templates/xorg/modeline.ATSC +++ b/abs/core-testing/system-templates/templates/xorg/modeline.ATSC @@ -4,9 +4,9 @@ ModeLine "My480p" 28.6 720 744 768 900 480 484 492 525 ModeLine "My540p" 37.26 960 976 1008 1104 540 542 548 563 +hsync +vsync -ModeLine "My720p" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync 74.086 MHz 44.955 kHz 5$ +ModeLine "My720p" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync -ModeLine "My720p2" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync 74.086 MHz 44.955 kHz 5$ +ModeLine "My720p2" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync ModeLine "My1080i" 79.84 1920 2040 2200 2368 1080 1090 1106 1125 +vsync -hsync interlace diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.ati b/abs/core-testing/system-templates/templates/xorg/xorg.conf.ati index 8c75552..529e186 100644 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.ati +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.ati @@ -25,7 +25,7 @@ Section "Module" Load "record" Load "extmod" Load "dri" - Load "type1" +# Load "type1" Load "freetype" EndSection diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.intel b/abs/core-testing/system-templates/templates/xorg/xorg.conf.intel index c4a67c9..5bc73f8 100644 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.intel +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.intel @@ -49,7 +49,7 @@ Section "Module" Load "extmod" Load "glx" Load "bitmap" # bitmap-fonts - Load "type1" +# Load "type1" Load "freetype" Load "record" EndSection diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia b/abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia index 3a53183..2c3b7f1 100755 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia @@ -18,7 +18,7 @@ EndSection Section "Module" Load "dbe" Load "extmod" - Load "type1" +# Load "type1" Load "freetype" Load "glx" EndSection diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa b/abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa index fa96ea5..dbc607d 100755 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa @@ -18,7 +18,7 @@ EndSection Section "Module" Load "dbe" Load "extmod" - Load "type1" +# Load "type1" Load "freetype" EndSection diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.via b/abs/core-testing/system-templates/templates/xorg/xorg.conf.via index 91c517f..c18eb6f 100644 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.via +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.via @@ -19,7 +19,7 @@ Section "Module" Load "dbe" Load "glx" Load "extmod" - Load "type1" +# Load "type1" Load "freetype" Load "dri" EndSection diff --git a/abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware b/abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware index 4e9fd4a..1c038ef 100755 --- a/abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware +++ b/abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware @@ -18,7 +18,7 @@ EndSection Section "Module" Load "dbe" Load "extmod" - Load "type1" +# Load "type1" Load "freetype" Load "glx" EndSection -- cgit v0.12