diff options
| -rw-r--r-- | rules/xorg-font-adobe-utopia-type1.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font-bh-ttf.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font-bitstream-speedo.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font-bitstream-type1.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font-ibm-type1.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font-speedo.in | 7 | ||||
| -rw-r--r-- | rules/xorg-font-ttf.in | 7 | ||||
| -rw-r--r-- | rules/xorg-font-type1.in (renamed from rules/xorg-font-scalable.in) | 5 | ||||
| -rw-r--r-- | rules/xorg-font-xfree86-type1.in | 2 | ||||
| -rw-r--r-- | rules/xorg-font.in | 5 | ||||
| -rw-r--r-- | rules/xorg-lib-Xfont.in | 11 |
11 files changed, 27 insertions, 20 deletions
diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in index bc927b972..788a37647 100644 --- a/rules/xorg-font-adobe-utopia-type1.in +++ b/rules/xorg-font-adobe-utopia-type1.in @@ -1,7 +1,7 @@ config XORG_FONT_ADOBE_UTOPIA_TYPE1 bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_TYPE1 prompt "Adobe Utopia type1" help FIXME diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in index 82298e02b..3c15c0af0 100644 --- a/rules/xorg-font-bh-ttf.in +++ b/rules/xorg-font-bh-ttf.in @@ -1,7 +1,7 @@ config XORG_FONT_BH_TTF bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_TTF default y prompt "BH ttf" help diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in index cbbc0b404..98a822952 100644 --- a/rules/xorg-font-bitstream-speedo.in +++ b/rules/xorg-font-bitstream-speedo.in @@ -1,7 +1,7 @@ config XORG_FONT_BITSTREAM_SPEEDO bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_SPEEDO prompt "Bitstream speedo" help This package contains the Speedo version of Bitstream diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in index febbb39be..a57b06465 100644 --- a/rules/xorg-font-bitstream-type1.in +++ b/rules/xorg-font-bitstream-type1.in @@ -1,7 +1,7 @@ config XORG_FONT_BITSTREAM_TYPE1 bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_TYPE1 default y prompt "Bitstream type1" help diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in index 38447dbb6..69e4374f9 100644 --- a/rules/xorg-font-ibm-type1.in +++ b/rules/xorg-font-ibm-type1.in @@ -1,7 +1,7 @@ config XORG_FONT_IBM_TYPE1 bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_TYPE1 prompt "IBM type1" help scalable IBM type1 fonts, as used on OS/2 systems. diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in new file mode 100644 index 000000000..06b17729f --- /dev/null +++ b/rules/xorg-font-speedo.in @@ -0,0 +1,7 @@ +menuconfig XORG_FONT_SPEEDO + depends on MENU_XORG_FONTS + select XORG_LIB_XFONT_SPEEDO_FONTS + bool + prompt "xorg speedo fonts " + +source "rules/xorg-font-bitstream-speedo.in" diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in new file mode 100644 index 000000000..88b192b7e --- /dev/null +++ b/rules/xorg-font-ttf.in @@ -0,0 +1,7 @@ +menuconfig XORG_FONT_TTF + depends on MENU_XORG_FONTS + select XORG_LIB_XFONT_FREETYPE + bool + prompt "xorg true/open type fonts " + +source "rules/xorg-font-bh-ttf.in" diff --git a/rules/xorg-font-scalable.in b/rules/xorg-font-type1.in index 23dde5b42..696a1e13b 100644 --- a/rules/xorg-font-scalable.in +++ b/rules/xorg-font-type1.in @@ -1,11 +1,10 @@ -menuconfig XORG_FONT_SCALEABLE +menuconfig XORG_FONT_TYPE1 depends on MENU_XORG_FONTS + select XORG_LIB_XFONT_TYPE1_FONTS bool prompt "xorg scalable fonts " source "rules/xorg-font-adobe-utopia-type1.in" -source "rules/xorg-font-bitstream-speedo.in" source "rules/xorg-font-bitstream-type1.in" -source "rules/xorg-font-bh-ttf.in" source "rules/xorg-font-ibm-type1.in" source "rules/xorg-font-xfree86-type1.in" diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in index 230d64e87..29f840898 100644 --- a/rules/xorg-font-xfree86-type1.in +++ b/rules/xorg-font-xfree86-type1.in @@ -1,7 +1,7 @@ config XORG_FONT_XFREE86_TYPE1 bool select XORG_FONTS - depends on XORG_FONT_SCALEABLE + depends on XORG_FONT_TYPE1 prompt "Xfree86 type1" help scalable font of old style xfree86 cursor diff --git a/rules/xorg-font.in b/rules/xorg-font.in index 9c4262e64..b8c6011d2 100644 --- a/rules/xorg-font.in +++ b/rules/xorg-font.in @@ -5,6 +5,7 @@ source "rules/xorg-fonts.in" menuconfig MENU_XORG_FONTS bool prompt "xorg fonts " + select XORG_LIB_XFONT_PCF_FONTS source "rules/xorg-font-util-alias.in" source "rules/xorg-font-base.in" @@ -13,5 +14,7 @@ source "rules/xorg-font-100dpi.in" source "rules/xorg-font-100dpi-trans.in" source "rules/xorg-font-75dpi.in" source "rules/xorg-font-75dpi-trans.in" -source "rules/xorg-font-scalable.in" +source "rules/xorg-font-type1.in" +source "rules/xorg-font-speedo.in" +source "rules/xorg-font-ttf.in" source "rules/xorg-font-intl.in" diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in index 0a6332ec0..5014ef2b3 100644 --- a/rules/xorg-lib-Xfont.in +++ b/rules/xorg-lib-Xfont.in @@ -20,7 +20,6 @@ menuconfig XORG_LIB_XFONT config XORG_LIB_XFONT_FREETYPE depends on XORG_LIB_XFONT bool - default n prompt "Use freetype as rendering library" help This will enable freetype 2.x library. @@ -28,7 +27,6 @@ config XORG_LIB_XFONT_FREETYPE config XORG_LIB_XFONT_FONTCACHE depends on XORG_LIB_XFONT bool - default n prompt "Use fontcache" help This will enable fontcache support @@ -36,7 +34,6 @@ config XORG_LIB_XFONT_FONTCACHE config XORG_LIB_XFONT_FONTSERVER depends on XORG_LIB_XFONT bool - default n prompt "Support font server connections" help This will support connections to font server. @@ -45,7 +42,6 @@ config XORG_LIB_XFONT_FONTSERVER config XORG_LIB_XFONT_TYPE1_FONTS depends on XORG_LIB_XFONT bool - default n prompt "Support type1 fonts" help Enable Type 1 fonts in this X server. @@ -53,7 +49,6 @@ config XORG_LIB_XFONT_TYPE1_FONTS config XORG_LIB_XFONT_CID_FONTS depends on XORG_LIB_XFONT bool - default n prompt "Support CID fonts" help Enable CID fonts in this X server. @@ -61,7 +56,6 @@ config XORG_LIB_XFONT_CID_FONTS config XORG_LIB_XFONT_SPEEDO_FONTS depends on XORG_LIB_XFONT bool - default n prompt "Support Speedo fonts" help Enable Speedo fonts in this X server. @@ -69,7 +63,6 @@ config XORG_LIB_XFONT_SPEEDO_FONTS config XORG_LIB_XFONT_PCF_FONTS depends on XORG_LIB_XFONT bool - default n prompt "Support pcf format fonts" help Enable pcf format fonts in this X server. @@ -77,7 +70,7 @@ config XORG_LIB_XFONT_PCF_FONTS config XORG_LIB_XFONT_BDF_FONTS depends on XORG_LIB_XFONT bool - default n + default y prompt "Support bdf format fonts" help Enable bdf format fonts in this X server. @@ -85,7 +78,6 @@ config XORG_LIB_XFONT_BDF_FONTS config XORG_LIB_XFONT_SNF_FONTS depends on XORG_LIB_XFONT bool - default n prompt "Support snf format fonts" help Enable snf format fonts in this X server. @@ -93,7 +85,6 @@ config XORG_LIB_XFONT_SNF_FONTS config XORG_LIB_XFONT_BUILTIN_FONTS depends on XORG_LIB_XFONT bool - default y prompt "Support builtin fonts" help Builtins (gzipped pcf format in .text segment). Enable this font type |