* [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
@ 2018-07-30 14:13 Florian Bäuerle
2018-07-30 15:46 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Florian Bäuerle @ 2018-07-30 14:13 UTC (permalink / raw)
To: ptxdist
---
rules/graphics_and_multimedia.in | 6 +++---
rules/xorg-font-100dpi-trans.in | 8 ++++----
rules/xorg-font-100dpi.in | 2 +-
rules/xorg-font-75dpi-trans.in | 8 ++++----
rules/xorg-font-75dpi.in | 2 +-
rules/xorg-font-adobe-utopia-type1.in | 2 +-
rules/xorg-font-alias.in | 2 +-
rules/xorg-font-arabic-misc.in | 2 +-
rules/xorg-font-arphic-ukai.in | 2 +-
rules/xorg-font-arphic-uming.in | 2 +-
rules/xorg-font-base-trans.in | 4 ++--
rules/xorg-font-bh-ttf.in | 2 +-
rules/xorg-font-bitstream-speedo.in | 2 +-
rules/xorg-font-bitstream-type1.in | 2 +-
rules/xorg-font-cronyx-cyrillic.in | 2 +-
rules/xorg-font-ibm-type1.in | 2 +-
rules/xorg-font-intl.in | 12 ++++++------
rules/xorg-font-misc-cyrillic.in | 2 +-
rules/xorg-font-misc-ethiopic.in | 2 +-
rules/xorg-font-misc-meltho.in | 2 +-
rules/xorg-font-screen-cyrillic.in | 2 +-
rules/xorg-font-speedo.in | 2 +-
rules/xorg-font-ttf-android.in | 2 +-
rules/xorg-font-ttf-bitstream-vera.in | 2 +-
rules/xorg-font-ttf-caladea.in | 2 +-
rules/xorg-font-ttf-carlito.in | 2 +-
rules/xorg-font-ttf-comic-jens.in | 2 +-
rules/xorg-font-ttf-dejavu.in | 2 +-
rules/xorg-font-ttf-hanazono.in | 2 +-
rules/xorg-font-ttf-liberation.in | 2 +-
rules/xorg-font-ttf-lohit-assamese.in | 2 +-
rules/xorg-font-ttf-lohit-bengali.in | 2 +-
rules/xorg-font-ttf-lohit-devanagari.in | 2 +-
rules/xorg-font-ttf-lohit-gujarati.in | 2 +-
rules/xorg-font-ttf-lohit-kannada.in | 2 +-
rules/xorg-font-ttf-lohit-malayalam.in | 2 +-
rules/xorg-font-ttf-lohit-oriya.in | 2 +-
rules/xorg-font-ttf-lohit-punjabi.in | 2 +-
rules/xorg-font-ttf-lohit-tamil-classical.in | 2 +-
rules/xorg-font-ttf-lohit-tamil.in | 2 +-
rules/xorg-font-ttf-lohit-telugu.in | 2 +-
rules/xorg-font-ttf-noto.in | 2 +-
rules/xorg-font-ttf-vlgothic.in | 2 +-
rules/xorg-font-ttf.in | 2 +-
rules/xorg-font-type1.in | 2 +-
rules/xorg-font-winitzki-cyrillic.in | 2 +-
rules/xorg-font-xfree86-type1.in | 2 +-
47 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index 54e53ad7a..f96a381e3 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -1,7 +1,7 @@
## SECTION=graphics_and_multimedia
menuconfig MENU_XORG_FONTS
- bool
+ tristate
prompt "fonts "
select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER
default y if XORG_SERVER
@@ -13,7 +13,7 @@ if MENU_XORG_FONTS
config XORG_FONTS
depends on MENU_XORG_FONTS
- bool
+ tristate
select XORG_FONT_UTIL
select XORG_FONT_ALIAS
select HOST_XORG_APP_MKFONTDIR
@@ -25,7 +25,7 @@ config XORG_FONTS
config XORG_FONTS_FC_CACHE
default FONTCONFIG
select FONTCONFIG_UTILS
- bool
+ tristate
config XORG_FONTS_QT4_LINKS
depends on QT4_PLATFORM_EMBEDDED
diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
index 07c637681..846e290f3 100644
--- a/rules/xorg-font-100dpi-trans.in
+++ b/rules/xorg-font-100dpi-trans.in
@@ -9,7 +9,7 @@ menu "xorg 100 dpi fonts(transcoded)"
depends on XORG_FONT_100DPI
config XORG_FONT_ADOBE_100DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_ADOBE_100DPI
prompt "Adobe 100dpi transcoded"
help
@@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_100DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_ADOBE_UTOPIA_100DPI
prompt "Adobe Utopia 100dpi transcoded"
help
@@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_BH_100DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_BH_100DPI
prompt "BH 100dpi transcoded"
help
@@ -39,7 +39,7 @@ config XORG_FONT_BH_100DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
prompt "BH Lucida Typewriter 100dpi transcoded"
help
diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
index 74d400052..7bfb43e32 100644
--- a/rules/xorg-font-100dpi.in
+++ b/rules/xorg-font-100dpi.in
@@ -2,7 +2,7 @@
menuconfig XORG_FONT_100DPI
prompt "xorg 100 dpi fonts "
- bool
+ tristate
depends on MENU_XORG_FONTS
source "generated/multimedia_xorg_font_100dpi.in"
diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in
index ee079eb9e..cf1e2b7a3 100644
--- a/rules/xorg-font-75dpi-trans.in
+++ b/rules/xorg-font-75dpi-trans.in
@@ -9,7 +9,7 @@ menu "xorg 75 dpi fonts (transcoded)"
depends on XORG_FONT_75DPI
config XORG_FONT_ADOBE_75DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_ADOBE_75DPI
prompt "Adobe 75dpi transcoded"
help
@@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_75DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_ADOBE_UTOPIA_75DPI
prompt "Adobe Utopia 75dpi transcoded"
help
@@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_BH_75DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_BH_75DPI
prompt "BH 75dpi transcoded"
help
@@ -39,7 +39,7 @@ config XORG_FONT_BH_75DPI_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS
- bool
+ tristate
depends on XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
prompt "BH Lucida Typewriter 75dpi transcoded"
help
diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
index c96404eaf..396c88d86 100644
--- a/rules/xorg-font-75dpi.in
+++ b/rules/xorg-font-75dpi.in
@@ -2,7 +2,7 @@
menuconfig XORG_FONT_75DPI
depends on MENU_XORG_FONTS
- bool
+ tristate
prompt "xorg 75 dpi fonts "
source "generated/multimedia_xorg_font_75dpi.in"
diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
index 265685f1d..3b5220ee4 100644
--- a/rules/xorg-font-adobe-utopia-type1.in
+++ b/rules/xorg-font-adobe-utopia-type1.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_type1
config XORG_FONT_ADOBE_UTOPIA_TYPE1
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TYPE1
prompt "Adobe Utopia type1"
diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in
index 9db36d8dc..8e764e5df 100644
--- a/rules/xorg-font-alias.in
+++ b/rules/xorg-font-alias.in
@@ -1,4 +1,4 @@
## SECTION=multimedia_xorg_font_utils
config XORG_FONT_ALIAS
- bool
+ tristate
diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in
index 82302a960..49eaabea9 100644
--- a/rules/xorg-font-arabic-misc.in
+++ b/rules/xorg-font-arabic-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_other
config XORG_FONT_ARABIC_MISC
- bool
+ tristate
select XORG_FONTS
prompt "Arabic misc."
help
diff --git a/rules/xorg-font-arphic-ukai.in b/rules/xorg-font-arphic-ukai.in
index eff2703a7..85b1258e0 100644
--- a/rules/xorg-font-arphic-ukai.in
+++ b/rules/xorg-font-arphic-ukai.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_other
config XORG_FONT_ARPHIC_UKAI
- bool
+ tristate
select XORG_FONTS
prompt "'AR PL UKai' Chinese font collection Kaiti style"
help
diff --git a/rules/xorg-font-arphic-uming.in b/rules/xorg-font-arphic-uming.in
index a3adec507..923ccd65d 100644
--- a/rules/xorg-font-arphic-uming.in
+++ b/rules/xorg-font-arphic-uming.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_other
config XORG_FONT_ARPHIC_UMING
- bool
+ tristate
select XORG_FONTS
prompt "'AR PL UMing' Chinese font collection Mingti style"
help
diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in
index 8094b6fdf..898216fc9 100644
--- a/rules/xorg-font-base-trans.in
+++ b/rules/xorg-font-base-trans.in
@@ -4,7 +4,7 @@ menu "xorg base fonts(transcoded) "
depends on MENU_XORG_FONTS
config XORG_FONT_MISC_MISC_TRANS
- bool
+ tristate
depends on XORG_FONT_MISC_MISC
prompt "misc misc transcoded"
help
@@ -14,7 +14,7 @@ config XORG_FONT_MISC_MISC_TRANS
encodings: -2, -3, -4, -9, -10, -13 and -14.
config XORG_FONT_SCHUMACHER_MISC_TRANS
- bool
+ tristate
depends on XORG_FONT_SCHUMACHER_MISC
select XORG_FONTS
prompt "Schumacher misc transcoded"
diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
index 8cf397fd0..b0aaa4c66 100644
--- a/rules/xorg-font-bh-ttf.in
+++ b/rules/xorg-font-bh-ttf.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_BH_TTF
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
default y
diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
index ebd43d8a8..a2fe26de8 100644
--- a/rules/xorg-font-bitstream-speedo.in
+++ b/rules/xorg-font-bitstream-speedo.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_speedo
config XORG_FONT_BITSTREAM_SPEEDO
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_SPEEDO
prompt "Bitstream speedo"
diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
index 58a2ff117..3b3c83536 100644
--- a/rules/xorg-font-bitstream-type1.in
+++ b/rules/xorg-font-bitstream-type1.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_type1
config XORG_FONT_BITSTREAM_TYPE1
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TYPE1
default y
diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in
index ddda75492..c7cd12b84 100644
--- a/rules/xorg-font-cronyx-cyrillic.in
+++ b/rules/xorg-font-cronyx-cyrillic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_cyrillic
config XORG_FONT_CRONYX_CYRILLIC
- bool
+ tristate
select XORG_FONTS
prompt "Cronyx cyrillic"
help
diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
index 9e6fda056..18f108c49 100644
--- a/rules/xorg-font-ibm-type1.in
+++ b/rules/xorg-font-ibm-type1.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_type1
config XORG_FONT_IBM_TYPE1
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TYPE1
prompt "IBM type1"
diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
index 1235e38ed..981a954ff 100644
--- a/rules/xorg-font-intl.in
+++ b/rules/xorg-font-intl.in
@@ -4,12 +4,12 @@ menu "international fonts for X "
depends on MENU_XORG_FONTS
menuconfig XORG_FONT_INTL
- bool
+ tristate
prompt "chinese and other asian fonts"
select XORG_FONTS
config XORG_FONT_INTL_CHIN
- bool
+ tristate
prompt "chinese fonts"
depends on XORG_FONT_INTL
help
@@ -18,14 +18,14 @@ config XORG_FONT_INTL_CHIN
documents written in Chinese and using any of the encodings mentioned above.
config XORG_FONT_INTL_CHIN_BIG
- bool
+ tristate
prompt "chinese fonts (big size)"
depends on XORG_FONT_INTL
help
This package contains two GB coded fonts in big size
config XORG_FONT_INTL_JAP
- bool
+ tristate
prompt "japanese fonts"
depends on XORG_FONT_INTL
help
@@ -35,7 +35,7 @@ config XORG_FONT_INTL_JAP
the Japanese language and any of the encodings specified above.
config XORG_FONT_INTL_JAP_BIG
- bool
+ tristate
prompt "Japanese fonts (big size)"
depends on XORG_FONT_INTL
help
@@ -43,7 +43,7 @@ config XORG_FONT_INTL_JAP_BIG
config XORG_FONT_INTL_ASIAN
- bool
+ tristate
prompt "other asian languages"
depends on XORG_FONT_INTL
help
diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in
index ce2992473..e5846d955 100644
--- a/rules/xorg-font-misc-cyrillic.in
+++ b/rules/xorg-font-misc-cyrillic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_cyrillic
config XORG_FONT_MISC_CYRILLIC
- bool
+ tristate
select XORG_FONTS
prompt "misc cyrillic"
help
diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in
index 85d63bb8b..0076fcb38 100644
--- a/rules/xorg-font-misc-ethiopic.in
+++ b/rules/xorg-font-misc-ethiopic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_other
config XORG_FONT_MISC_ETHIOPIC
- bool
+ tristate
select XORG_FONTS
prompt "misc. Ethiopic"
help
diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in
index 9f86cee2c..a088f2f16 100644
--- a/rules/xorg-font-misc-meltho.in
+++ b/rules/xorg-font-misc-meltho.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_other
config XORG_FONT_MISC_MELTHO
- bool
+ tristate
select XORG_FONTS
prompt "misc. Meltho"
help
diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in
index e7f649d10..fed766461 100644
--- a/rules/xorg-font-screen-cyrillic.in
+++ b/rules/xorg-font-screen-cyrillic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_cyrillic
config XORG_FONT_SCREEN_CYRILLIC
- bool
+ tristate
select XORG_FONTS
prompt "Screen cyrillic"
help
diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in
index 915ef0aad..5ea90d5e1 100644
--- a/rules/xorg-font-speedo.in
+++ b/rules/xorg-font-speedo.in
@@ -2,7 +2,7 @@
menuconfig XORG_FONT_SPEEDO
depends on MENU_XORG_FONTS
- bool
+ tristate
prompt "xorg speedo fonts "
source "generated/multimedia_xorg_font_speedo.in"
diff --git a/rules/xorg-font-ttf-android.in b/rules/xorg-font-ttf-android.in
index f9736bc57..03da37420 100644
--- a/rules/xorg-font-ttf-android.in
+++ b/rules/xorg-font-ttf-android.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_ANDROID
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Android"
diff --git a/rules/xorg-font-ttf-bitstream-vera.in b/rules/xorg-font-ttf-bitstream-vera.in
index 31236962b..42eb04cc8 100644
--- a/rules/xorg-font-ttf-bitstream-vera.in
+++ b/rules/xorg-font-ttf-bitstream-vera.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_BITSTREAM_VERA
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
default y
diff --git a/rules/xorg-font-ttf-caladea.in b/rules/xorg-font-ttf-caladea.in
index f7ef13a4e..aadfe3354 100644
--- a/rules/xorg-font-ttf-caladea.in
+++ b/rules/xorg-font-ttf-caladea.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_CALADEA
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "caladea"
diff --git a/rules/xorg-font-ttf-carlito.in b/rules/xorg-font-ttf-carlito.in
index cbafae3f5..98e7e701c 100644
--- a/rules/xorg-font-ttf-carlito.in
+++ b/rules/xorg-font-ttf-carlito.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_CARLITO
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "carlito"
diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
index ec6891f6f..2cebf9566 100644
--- a/rules/xorg-font-ttf-comic-jens.in
+++ b/rules/xorg-font-ttf-comic-jens.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_COMIC_JENS
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Comic Jens"
diff --git a/rules/xorg-font-ttf-dejavu.in b/rules/xorg-font-ttf-dejavu.in
index f381631a7..050d5ed39 100644
--- a/rules/xorg-font-ttf-dejavu.in
+++ b/rules/xorg-font-ttf-dejavu.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_DEJAVU
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "dejavu"
diff --git a/rules/xorg-font-ttf-hanazono.in b/rules/xorg-font-ttf-hanazono.in
index 309c5df30..e3d88e549 100644
--- a/rules/xorg-font-ttf-hanazono.in
+++ b/rules/xorg-font-ttf-hanazono.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_HANAZONO
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Hanazono"
diff --git a/rules/xorg-font-ttf-liberation.in b/rules/xorg-font-ttf-liberation.in
index 4db75099f..bd836b2d9 100644
--- a/rules/xorg-font-ttf-liberation.in
+++ b/rules/xorg-font-ttf-liberation.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LIBERATION
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "liberation"
diff --git a/rules/xorg-font-ttf-lohit-assamese.in b/rules/xorg-font-ttf-lohit-assamese.in
index 4ab0636a0..ebc2b1534 100644
--- a/rules/xorg-font-ttf-lohit-assamese.in
+++ b/rules/xorg-font-ttf-lohit-assamese.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_ASSAMESE
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Assamese"
diff --git a/rules/xorg-font-ttf-lohit-bengali.in b/rules/xorg-font-ttf-lohit-bengali.in
index e029093a7..6b2644a2b 100644
--- a/rules/xorg-font-ttf-lohit-bengali.in
+++ b/rules/xorg-font-ttf-lohit-bengali.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_BENGALI
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Bengali"
diff --git a/rules/xorg-font-ttf-lohit-devanagari.in b/rules/xorg-font-ttf-lohit-devanagari.in
index 423c91af3..8a03316a2 100644
--- a/rules/xorg-font-ttf-lohit-devanagari.in
+++ b/rules/xorg-font-ttf-lohit-devanagari.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_DEVANAGARI
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Devanagari"
diff --git a/rules/xorg-font-ttf-lohit-gujarati.in b/rules/xorg-font-ttf-lohit-gujarati.in
index 375939315..68019e9d4 100644
--- a/rules/xorg-font-ttf-lohit-gujarati.in
+++ b/rules/xorg-font-ttf-lohit-gujarati.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_GUJARATI
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Gujarati"
diff --git a/rules/xorg-font-ttf-lohit-kannada.in b/rules/xorg-font-ttf-lohit-kannada.in
index dd8859f17..d57019752 100644
--- a/rules/xorg-font-ttf-lohit-kannada.in
+++ b/rules/xorg-font-ttf-lohit-kannada.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_KANNADA
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Kannada"
diff --git a/rules/xorg-font-ttf-lohit-malayalam.in b/rules/xorg-font-ttf-lohit-malayalam.in
index dd686b258..394f0964c 100644
--- a/rules/xorg-font-ttf-lohit-malayalam.in
+++ b/rules/xorg-font-ttf-lohit-malayalam.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_MALAYALAM
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Malayalam"
diff --git a/rules/xorg-font-ttf-lohit-oriya.in b/rules/xorg-font-ttf-lohit-oriya.in
index a5b99dc6a..73fdcd265 100644
--- a/rules/xorg-font-ttf-lohit-oriya.in
+++ b/rules/xorg-font-ttf-lohit-oriya.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_ORIYA
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Oriya"
diff --git a/rules/xorg-font-ttf-lohit-punjabi.in b/rules/xorg-font-ttf-lohit-punjabi.in
index d5ef94265..a03628d6a 100644
--- a/rules/xorg-font-ttf-lohit-punjabi.in
+++ b/rules/xorg-font-ttf-lohit-punjabi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_PUNJABI
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Punjabi"
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.in b/rules/xorg-font-ttf-lohit-tamil-classical.in
index 3b52f988d..73783d645 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.in
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Tamil Classical"
diff --git a/rules/xorg-font-ttf-lohit-tamil.in b/rules/xorg-font-ttf-lohit-tamil.in
index e8ba329f3..cb2cc000c 100644
--- a/rules/xorg-font-ttf-lohit-tamil.in
+++ b/rules/xorg-font-ttf-lohit-tamil.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_TAMIL
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Tamil"
diff --git a/rules/xorg-font-ttf-lohit-telugu.in b/rules/xorg-font-ttf-lohit-telugu.in
index 5c48a3c56..a23125da6 100644
--- a/rules/xorg-font-ttf-lohit-telugu.in
+++ b/rules/xorg-font-ttf-lohit-telugu.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_LOHIT_TELUGU
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Lohit Telugu"
diff --git a/rules/xorg-font-ttf-noto.in b/rules/xorg-font-ttf-noto.in
index e3c04c6cc..fa90f8eeb 100644
--- a/rules/xorg-font-ttf-noto.in
+++ b/rules/xorg-font-ttf-noto.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_NOTO
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "Noto"
diff --git a/rules/xorg-font-ttf-vlgothic.in b/rules/xorg-font-ttf-vlgothic.in
index 23067930f..4499326f7 100644
--- a/rules/xorg-font-ttf-vlgothic.in
+++ b/rules/xorg-font-ttf-vlgothic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_ttf
config XORG_FONT_TTF_VLGOTHIC
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TTF
prompt "VL Gothic"
diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in
index abab0c7a8..32f944385 100644
--- a/rules/xorg-font-ttf.in
+++ b/rules/xorg-font-ttf.in
@@ -3,7 +3,7 @@
menuconfig XORG_FONT_TTF
depends on MENU_XORG_FONTS
select XORG_LIB_XFONT_FREETYPE if XORG_LIB_XFONT
- bool
+ tristate
prompt "xorg true/open type fonts "
source "generated/multimedia_xorg_font_ttf.in"
diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in
index 3ba10059a..4bda59341 100644
--- a/rules/xorg-font-type1.in
+++ b/rules/xorg-font-type1.in
@@ -2,7 +2,7 @@
menuconfig XORG_FONT_TYPE1
depends on MENU_XORG_FONTS
- bool
+ tristate
prompt "xorg scalable fonts "
source "generated/multimedia_xorg_font_type1.in"
diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in
index 2b4c2e6fa..358fef0ff 100644
--- a/rules/xorg-font-winitzki-cyrillic.in
+++ b/rules/xorg-font-winitzki-cyrillic.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_cyrillic
config XORG_FONT_WINITZKI_CYRILLIC
- bool
+ tristate
select XORG_FONTS
prompt "Winitzki cyrillic"
help
diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
index 711fc0394..a9c8743b8 100644
--- a/rules/xorg-font-xfree86-type1.in
+++ b/rules/xorg-font-xfree86-type1.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_type1
config XORG_FONT_XFREE86_TYPE1
- bool
+ tristate
select XORG_FONTS
depends on XORG_FONT_TYPE1
prompt "Xfree86 type1"
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
2018-07-30 14:13 [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate Florian Bäuerle
@ 2018-07-30 15:46 ` Michael Olbrich
2018-07-31 8:54 ` Baeuerle, Florian
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2018-07-30 15:46 UTC (permalink / raw)
To: ptxdist
No, tristate is for collections. And all font files are currently dumped
into one xorg-fonts ipkg. This is realy ugly and does not work with
collections.
It may be possible to create individual ipkgs for each package. But that's
not so simple because we generate index files at the end. I don't know how
this should be handled.
Michael
On Mon, Jul 30, 2018 at 04:13:19PM +0200, Florian Bäuerle wrote:
> ---
> rules/graphics_and_multimedia.in | 6 +++---
> rules/xorg-font-100dpi-trans.in | 8 ++++----
> rules/xorg-font-100dpi.in | 2 +-
> rules/xorg-font-75dpi-trans.in | 8 ++++----
> rules/xorg-font-75dpi.in | 2 +-
> rules/xorg-font-adobe-utopia-type1.in | 2 +-
> rules/xorg-font-alias.in | 2 +-
> rules/xorg-font-arabic-misc.in | 2 +-
> rules/xorg-font-arphic-ukai.in | 2 +-
> rules/xorg-font-arphic-uming.in | 2 +-
> rules/xorg-font-base-trans.in | 4 ++--
> rules/xorg-font-bh-ttf.in | 2 +-
> rules/xorg-font-bitstream-speedo.in | 2 +-
> rules/xorg-font-bitstream-type1.in | 2 +-
> rules/xorg-font-cronyx-cyrillic.in | 2 +-
> rules/xorg-font-ibm-type1.in | 2 +-
> rules/xorg-font-intl.in | 12 ++++++------
> rules/xorg-font-misc-cyrillic.in | 2 +-
> rules/xorg-font-misc-ethiopic.in | 2 +-
> rules/xorg-font-misc-meltho.in | 2 +-
> rules/xorg-font-screen-cyrillic.in | 2 +-
> rules/xorg-font-speedo.in | 2 +-
> rules/xorg-font-ttf-android.in | 2 +-
> rules/xorg-font-ttf-bitstream-vera.in | 2 +-
> rules/xorg-font-ttf-caladea.in | 2 +-
> rules/xorg-font-ttf-carlito.in | 2 +-
> rules/xorg-font-ttf-comic-jens.in | 2 +-
> rules/xorg-font-ttf-dejavu.in | 2 +-
> rules/xorg-font-ttf-hanazono.in | 2 +-
> rules/xorg-font-ttf-liberation.in | 2 +-
> rules/xorg-font-ttf-lohit-assamese.in | 2 +-
> rules/xorg-font-ttf-lohit-bengali.in | 2 +-
> rules/xorg-font-ttf-lohit-devanagari.in | 2 +-
> rules/xorg-font-ttf-lohit-gujarati.in | 2 +-
> rules/xorg-font-ttf-lohit-kannada.in | 2 +-
> rules/xorg-font-ttf-lohit-malayalam.in | 2 +-
> rules/xorg-font-ttf-lohit-oriya.in | 2 +-
> rules/xorg-font-ttf-lohit-punjabi.in | 2 +-
> rules/xorg-font-ttf-lohit-tamil-classical.in | 2 +-
> rules/xorg-font-ttf-lohit-tamil.in | 2 +-
> rules/xorg-font-ttf-lohit-telugu.in | 2 +-
> rules/xorg-font-ttf-noto.in | 2 +-
> rules/xorg-font-ttf-vlgothic.in | 2 +-
> rules/xorg-font-ttf.in | 2 +-
> rules/xorg-font-type1.in | 2 +-
> rules/xorg-font-winitzki-cyrillic.in | 2 +-
> rules/xorg-font-xfree86-type1.in | 2 +-
> 47 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
> index 54e53ad7a..f96a381e3 100644
> --- a/rules/graphics_and_multimedia.in
> +++ b/rules/graphics_and_multimedia.in
> @@ -1,7 +1,7 @@
> ## SECTION=graphics_and_multimedia
>
> menuconfig MENU_XORG_FONTS
> - bool
> + tristate
> prompt "fonts "
> select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER
> default y if XORG_SERVER
> @@ -13,7 +13,7 @@ if MENU_XORG_FONTS
>
> config XORG_FONTS
> depends on MENU_XORG_FONTS
> - bool
> + tristate
> select XORG_FONT_UTIL
> select XORG_FONT_ALIAS
> select HOST_XORG_APP_MKFONTDIR
> @@ -25,7 +25,7 @@ config XORG_FONTS
> config XORG_FONTS_FC_CACHE
> default FONTCONFIG
> select FONTCONFIG_UTILS
> - bool
> + tristate
>
> config XORG_FONTS_QT4_LINKS
> depends on QT4_PLATFORM_EMBEDDED
> diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
> index 07c637681..846e290f3 100644
> --- a/rules/xorg-font-100dpi-trans.in
> +++ b/rules/xorg-font-100dpi-trans.in
> @@ -9,7 +9,7 @@ menu "xorg 100 dpi fonts(transcoded)"
> depends on XORG_FONT_100DPI
>
> config XORG_FONT_ADOBE_100DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_ADOBE_100DPI
> prompt "Adobe 100dpi transcoded"
> help
> @@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_100DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_ADOBE_UTOPIA_100DPI
> prompt "Adobe Utopia 100dpi transcoded"
> help
> @@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_BH_100DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_BH_100DPI
> prompt "BH 100dpi transcoded"
> help
> @@ -39,7 +39,7 @@ config XORG_FONT_BH_100DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
> prompt "BH Lucida Typewriter 100dpi transcoded"
> help
> diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
> index 74d400052..7bfb43e32 100644
> --- a/rules/xorg-font-100dpi.in
> +++ b/rules/xorg-font-100dpi.in
> @@ -2,7 +2,7 @@
>
> menuconfig XORG_FONT_100DPI
> prompt "xorg 100 dpi fonts "
> - bool
> + tristate
> depends on MENU_XORG_FONTS
>
> source "generated/multimedia_xorg_font_100dpi.in"
> diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in
> index ee079eb9e..cf1e2b7a3 100644
> --- a/rules/xorg-font-75dpi-trans.in
> +++ b/rules/xorg-font-75dpi-trans.in
> @@ -9,7 +9,7 @@ menu "xorg 75 dpi fonts (transcoded)"
> depends on XORG_FONT_75DPI
>
> config XORG_FONT_ADOBE_75DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_ADOBE_75DPI
> prompt "Adobe 75dpi transcoded"
> help
> @@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_75DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_ADOBE_UTOPIA_75DPI
> prompt "Adobe Utopia 75dpi transcoded"
> help
> @@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_BH_75DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_BH_75DPI
> prompt "BH 75dpi transcoded"
> help
> @@ -39,7 +39,7 @@ config XORG_FONT_BH_75DPI_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS
> - bool
> + tristate
> depends on XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
> prompt "BH Lucida Typewriter 75dpi transcoded"
> help
> diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
> index c96404eaf..396c88d86 100644
> --- a/rules/xorg-font-75dpi.in
> +++ b/rules/xorg-font-75dpi.in
> @@ -2,7 +2,7 @@
>
> menuconfig XORG_FONT_75DPI
> depends on MENU_XORG_FONTS
> - bool
> + tristate
> prompt "xorg 75 dpi fonts "
>
> source "generated/multimedia_xorg_font_75dpi.in"
> diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
> index 265685f1d..3b5220ee4 100644
> --- a/rules/xorg-font-adobe-utopia-type1.in
> +++ b/rules/xorg-font-adobe-utopia-type1.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_type1
>
> config XORG_FONT_ADOBE_UTOPIA_TYPE1
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TYPE1
> prompt "Adobe Utopia type1"
> diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in
> index 9db36d8dc..8e764e5df 100644
> --- a/rules/xorg-font-alias.in
> +++ b/rules/xorg-font-alias.in
> @@ -1,4 +1,4 @@
> ## SECTION=multimedia_xorg_font_utils
>
> config XORG_FONT_ALIAS
> - bool
> + tristate
> diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in
> index 82302a960..49eaabea9 100644
> --- a/rules/xorg-font-arabic-misc.in
> +++ b/rules/xorg-font-arabic-misc.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_other
>
> config XORG_FONT_ARABIC_MISC
> - bool
> + tristate
> select XORG_FONTS
> prompt "Arabic misc."
> help
> diff --git a/rules/xorg-font-arphic-ukai.in b/rules/xorg-font-arphic-ukai.in
> index eff2703a7..85b1258e0 100644
> --- a/rules/xorg-font-arphic-ukai.in
> +++ b/rules/xorg-font-arphic-ukai.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_other
>
> config XORG_FONT_ARPHIC_UKAI
> - bool
> + tristate
> select XORG_FONTS
> prompt "'AR PL UKai' Chinese font collection Kaiti style"
> help
> diff --git a/rules/xorg-font-arphic-uming.in b/rules/xorg-font-arphic-uming.in
> index a3adec507..923ccd65d 100644
> --- a/rules/xorg-font-arphic-uming.in
> +++ b/rules/xorg-font-arphic-uming.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_other
>
> config XORG_FONT_ARPHIC_UMING
> - bool
> + tristate
> select XORG_FONTS
> prompt "'AR PL UMing' Chinese font collection Mingti style"
> help
> diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in
> index 8094b6fdf..898216fc9 100644
> --- a/rules/xorg-font-base-trans.in
> +++ b/rules/xorg-font-base-trans.in
> @@ -4,7 +4,7 @@ menu "xorg base fonts(transcoded) "
> depends on MENU_XORG_FONTS
>
> config XORG_FONT_MISC_MISC_TRANS
> - bool
> + tristate
> depends on XORG_FONT_MISC_MISC
> prompt "misc misc transcoded"
> help
> @@ -14,7 +14,7 @@ config XORG_FONT_MISC_MISC_TRANS
> encodings: -2, -3, -4, -9, -10, -13 and -14.
>
> config XORG_FONT_SCHUMACHER_MISC_TRANS
> - bool
> + tristate
> depends on XORG_FONT_SCHUMACHER_MISC
> select XORG_FONTS
> prompt "Schumacher misc transcoded"
> diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
> index 8cf397fd0..b0aaa4c66 100644
> --- a/rules/xorg-font-bh-ttf.in
> +++ b/rules/xorg-font-bh-ttf.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_BH_TTF
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> default y
> diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
> index ebd43d8a8..a2fe26de8 100644
> --- a/rules/xorg-font-bitstream-speedo.in
> +++ b/rules/xorg-font-bitstream-speedo.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_speedo
>
> config XORG_FONT_BITSTREAM_SPEEDO
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_SPEEDO
> prompt "Bitstream speedo"
> diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
> index 58a2ff117..3b3c83536 100644
> --- a/rules/xorg-font-bitstream-type1.in
> +++ b/rules/xorg-font-bitstream-type1.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_type1
>
> config XORG_FONT_BITSTREAM_TYPE1
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TYPE1
> default y
> diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in
> index ddda75492..c7cd12b84 100644
> --- a/rules/xorg-font-cronyx-cyrillic.in
> +++ b/rules/xorg-font-cronyx-cyrillic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_cyrillic
>
> config XORG_FONT_CRONYX_CYRILLIC
> - bool
> + tristate
> select XORG_FONTS
> prompt "Cronyx cyrillic"
> help
> diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
> index 9e6fda056..18f108c49 100644
> --- a/rules/xorg-font-ibm-type1.in
> +++ b/rules/xorg-font-ibm-type1.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_type1
>
> config XORG_FONT_IBM_TYPE1
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TYPE1
> prompt "IBM type1"
> diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
> index 1235e38ed..981a954ff 100644
> --- a/rules/xorg-font-intl.in
> +++ b/rules/xorg-font-intl.in
> @@ -4,12 +4,12 @@ menu "international fonts for X "
> depends on MENU_XORG_FONTS
>
> menuconfig XORG_FONT_INTL
> - bool
> + tristate
> prompt "chinese and other asian fonts"
> select XORG_FONTS
>
> config XORG_FONT_INTL_CHIN
> - bool
> + tristate
> prompt "chinese fonts"
> depends on XORG_FONT_INTL
> help
> @@ -18,14 +18,14 @@ config XORG_FONT_INTL_CHIN
> documents written in Chinese and using any of the encodings mentioned above.
>
> config XORG_FONT_INTL_CHIN_BIG
> - bool
> + tristate
> prompt "chinese fonts (big size)"
> depends on XORG_FONT_INTL
> help
> This package contains two GB coded fonts in big size
>
> config XORG_FONT_INTL_JAP
> - bool
> + tristate
> prompt "japanese fonts"
> depends on XORG_FONT_INTL
> help
> @@ -35,7 +35,7 @@ config XORG_FONT_INTL_JAP
> the Japanese language and any of the encodings specified above.
>
> config XORG_FONT_INTL_JAP_BIG
> - bool
> + tristate
> prompt "Japanese fonts (big size)"
> depends on XORG_FONT_INTL
> help
> @@ -43,7 +43,7 @@ config XORG_FONT_INTL_JAP_BIG
>
>
> config XORG_FONT_INTL_ASIAN
> - bool
> + tristate
> prompt "other asian languages"
> depends on XORG_FONT_INTL
> help
> diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in
> index ce2992473..e5846d955 100644
> --- a/rules/xorg-font-misc-cyrillic.in
> +++ b/rules/xorg-font-misc-cyrillic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_cyrillic
>
> config XORG_FONT_MISC_CYRILLIC
> - bool
> + tristate
> select XORG_FONTS
> prompt "misc cyrillic"
> help
> diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in
> index 85d63bb8b..0076fcb38 100644
> --- a/rules/xorg-font-misc-ethiopic.in
> +++ b/rules/xorg-font-misc-ethiopic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_other
>
> config XORG_FONT_MISC_ETHIOPIC
> - bool
> + tristate
> select XORG_FONTS
> prompt "misc. Ethiopic"
> help
> diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in
> index 9f86cee2c..a088f2f16 100644
> --- a/rules/xorg-font-misc-meltho.in
> +++ b/rules/xorg-font-misc-meltho.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_other
>
> config XORG_FONT_MISC_MELTHO
> - bool
> + tristate
> select XORG_FONTS
> prompt "misc. Meltho"
> help
> diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in
> index e7f649d10..fed766461 100644
> --- a/rules/xorg-font-screen-cyrillic.in
> +++ b/rules/xorg-font-screen-cyrillic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_cyrillic
>
> config XORG_FONT_SCREEN_CYRILLIC
> - bool
> + tristate
> select XORG_FONTS
> prompt "Screen cyrillic"
> help
> diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in
> index 915ef0aad..5ea90d5e1 100644
> --- a/rules/xorg-font-speedo.in
> +++ b/rules/xorg-font-speedo.in
> @@ -2,7 +2,7 @@
>
> menuconfig XORG_FONT_SPEEDO
> depends on MENU_XORG_FONTS
> - bool
> + tristate
> prompt "xorg speedo fonts "
>
> source "generated/multimedia_xorg_font_speedo.in"
> diff --git a/rules/xorg-font-ttf-android.in b/rules/xorg-font-ttf-android.in
> index f9736bc57..03da37420 100644
> --- a/rules/xorg-font-ttf-android.in
> +++ b/rules/xorg-font-ttf-android.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_ANDROID
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Android"
> diff --git a/rules/xorg-font-ttf-bitstream-vera.in b/rules/xorg-font-ttf-bitstream-vera.in
> index 31236962b..42eb04cc8 100644
> --- a/rules/xorg-font-ttf-bitstream-vera.in
> +++ b/rules/xorg-font-ttf-bitstream-vera.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_BITSTREAM_VERA
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> default y
> diff --git a/rules/xorg-font-ttf-caladea.in b/rules/xorg-font-ttf-caladea.in
> index f7ef13a4e..aadfe3354 100644
> --- a/rules/xorg-font-ttf-caladea.in
> +++ b/rules/xorg-font-ttf-caladea.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_CALADEA
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "caladea"
> diff --git a/rules/xorg-font-ttf-carlito.in b/rules/xorg-font-ttf-carlito.in
> index cbafae3f5..98e7e701c 100644
> --- a/rules/xorg-font-ttf-carlito.in
> +++ b/rules/xorg-font-ttf-carlito.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_CARLITO
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "carlito"
> diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
> index ec6891f6f..2cebf9566 100644
> --- a/rules/xorg-font-ttf-comic-jens.in
> +++ b/rules/xorg-font-ttf-comic-jens.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_COMIC_JENS
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Comic Jens"
> diff --git a/rules/xorg-font-ttf-dejavu.in b/rules/xorg-font-ttf-dejavu.in
> index f381631a7..050d5ed39 100644
> --- a/rules/xorg-font-ttf-dejavu.in
> +++ b/rules/xorg-font-ttf-dejavu.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_DEJAVU
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "dejavu"
> diff --git a/rules/xorg-font-ttf-hanazono.in b/rules/xorg-font-ttf-hanazono.in
> index 309c5df30..e3d88e549 100644
> --- a/rules/xorg-font-ttf-hanazono.in
> +++ b/rules/xorg-font-ttf-hanazono.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_HANAZONO
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Hanazono"
> diff --git a/rules/xorg-font-ttf-liberation.in b/rules/xorg-font-ttf-liberation.in
> index 4db75099f..bd836b2d9 100644
> --- a/rules/xorg-font-ttf-liberation.in
> +++ b/rules/xorg-font-ttf-liberation.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LIBERATION
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "liberation"
> diff --git a/rules/xorg-font-ttf-lohit-assamese.in b/rules/xorg-font-ttf-lohit-assamese.in
> index 4ab0636a0..ebc2b1534 100644
> --- a/rules/xorg-font-ttf-lohit-assamese.in
> +++ b/rules/xorg-font-ttf-lohit-assamese.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_ASSAMESE
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Assamese"
> diff --git a/rules/xorg-font-ttf-lohit-bengali.in b/rules/xorg-font-ttf-lohit-bengali.in
> index e029093a7..6b2644a2b 100644
> --- a/rules/xorg-font-ttf-lohit-bengali.in
> +++ b/rules/xorg-font-ttf-lohit-bengali.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_BENGALI
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Bengali"
> diff --git a/rules/xorg-font-ttf-lohit-devanagari.in b/rules/xorg-font-ttf-lohit-devanagari.in
> index 423c91af3..8a03316a2 100644
> --- a/rules/xorg-font-ttf-lohit-devanagari.in
> +++ b/rules/xorg-font-ttf-lohit-devanagari.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_DEVANAGARI
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Devanagari"
> diff --git a/rules/xorg-font-ttf-lohit-gujarati.in b/rules/xorg-font-ttf-lohit-gujarati.in
> index 375939315..68019e9d4 100644
> --- a/rules/xorg-font-ttf-lohit-gujarati.in
> +++ b/rules/xorg-font-ttf-lohit-gujarati.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_GUJARATI
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Gujarati"
> diff --git a/rules/xorg-font-ttf-lohit-kannada.in b/rules/xorg-font-ttf-lohit-kannada.in
> index dd8859f17..d57019752 100644
> --- a/rules/xorg-font-ttf-lohit-kannada.in
> +++ b/rules/xorg-font-ttf-lohit-kannada.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_KANNADA
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Kannada"
> diff --git a/rules/xorg-font-ttf-lohit-malayalam.in b/rules/xorg-font-ttf-lohit-malayalam.in
> index dd686b258..394f0964c 100644
> --- a/rules/xorg-font-ttf-lohit-malayalam.in
> +++ b/rules/xorg-font-ttf-lohit-malayalam.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_MALAYALAM
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Malayalam"
> diff --git a/rules/xorg-font-ttf-lohit-oriya.in b/rules/xorg-font-ttf-lohit-oriya.in
> index a5b99dc6a..73fdcd265 100644
> --- a/rules/xorg-font-ttf-lohit-oriya.in
> +++ b/rules/xorg-font-ttf-lohit-oriya.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_ORIYA
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Oriya"
> diff --git a/rules/xorg-font-ttf-lohit-punjabi.in b/rules/xorg-font-ttf-lohit-punjabi.in
> index d5ef94265..a03628d6a 100644
> --- a/rules/xorg-font-ttf-lohit-punjabi.in
> +++ b/rules/xorg-font-ttf-lohit-punjabi.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_PUNJABI
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Punjabi"
> diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.in b/rules/xorg-font-ttf-lohit-tamil-classical.in
> index 3b52f988d..73783d645 100644
> --- a/rules/xorg-font-ttf-lohit-tamil-classical.in
> +++ b/rules/xorg-font-ttf-lohit-tamil-classical.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Tamil Classical"
> diff --git a/rules/xorg-font-ttf-lohit-tamil.in b/rules/xorg-font-ttf-lohit-tamil.in
> index e8ba329f3..cb2cc000c 100644
> --- a/rules/xorg-font-ttf-lohit-tamil.in
> +++ b/rules/xorg-font-ttf-lohit-tamil.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_TAMIL
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Tamil"
> diff --git a/rules/xorg-font-ttf-lohit-telugu.in b/rules/xorg-font-ttf-lohit-telugu.in
> index 5c48a3c56..a23125da6 100644
> --- a/rules/xorg-font-ttf-lohit-telugu.in
> +++ b/rules/xorg-font-ttf-lohit-telugu.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_LOHIT_TELUGU
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Lohit Telugu"
> diff --git a/rules/xorg-font-ttf-noto.in b/rules/xorg-font-ttf-noto.in
> index e3c04c6cc..fa90f8eeb 100644
> --- a/rules/xorg-font-ttf-noto.in
> +++ b/rules/xorg-font-ttf-noto.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_NOTO
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "Noto"
> diff --git a/rules/xorg-font-ttf-vlgothic.in b/rules/xorg-font-ttf-vlgothic.in
> index 23067930f..4499326f7 100644
> --- a/rules/xorg-font-ttf-vlgothic.in
> +++ b/rules/xorg-font-ttf-vlgothic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_ttf
>
> config XORG_FONT_TTF_VLGOTHIC
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TTF
> prompt "VL Gothic"
> diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in
> index abab0c7a8..32f944385 100644
> --- a/rules/xorg-font-ttf.in
> +++ b/rules/xorg-font-ttf.in
> @@ -3,7 +3,7 @@
> menuconfig XORG_FONT_TTF
> depends on MENU_XORG_FONTS
> select XORG_LIB_XFONT_FREETYPE if XORG_LIB_XFONT
> - bool
> + tristate
> prompt "xorg true/open type fonts "
>
> source "generated/multimedia_xorg_font_ttf.in"
> diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in
> index 3ba10059a..4bda59341 100644
> --- a/rules/xorg-font-type1.in
> +++ b/rules/xorg-font-type1.in
> @@ -2,7 +2,7 @@
>
> menuconfig XORG_FONT_TYPE1
> depends on MENU_XORG_FONTS
> - bool
> + tristate
> prompt "xorg scalable fonts "
>
> source "generated/multimedia_xorg_font_type1.in"
> diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in
> index 2b4c2e6fa..358fef0ff 100644
> --- a/rules/xorg-font-winitzki-cyrillic.in
> +++ b/rules/xorg-font-winitzki-cyrillic.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_cyrillic
>
> config XORG_FONT_WINITZKI_CYRILLIC
> - bool
> + tristate
> select XORG_FONTS
> prompt "Winitzki cyrillic"
> help
> diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
> index 711fc0394..a9c8743b8 100644
> --- a/rules/xorg-font-xfree86-type1.in
> +++ b/rules/xorg-font-xfree86-type1.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_type1
>
> config XORG_FONT_XFREE86_TYPE1
> - bool
> + tristate
> select XORG_FONTS
> depends on XORG_FONT_TYPE1
> prompt "Xfree86 type1"
> --
> 2.18.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
2018-07-30 15:46 ` Michael Olbrich
@ 2018-07-31 8:54 ` Baeuerle, Florian
2018-07-31 9:31 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Baeuerle, Florian @ 2018-07-31 8:54 UTC (permalink / raw)
To: ptxdist
Hi Michael,
the approach works for me, at least for completely selecting or deselecting
a font via collection. You have to select MENU_FONTS and XORG_FONT_TTF as
module. I have a package which then selects noto fonts as dependency.
When deselecting this package in a collection, I end up with a rootfs
containing no fonts. When selecting the package, I have the font.
I admittedly did not check all scenarios and corner cases, like (de)selecting
a subset of fonts via collection.
We really need such a feature because we have products with and without
display and the latter ones do not have enough NAND to contain the fonts.
The solution might be ugly but it solves a problem.
If you have other ideas, I'd be willing to discuss and eventually implement
them, because we really want to be able to (de)select fonts via collection.
Best Regards
Florian
Am Montag, den 30.07.2018, 17:46 +0200 schrieb Michael Olbrich:
> No, tristate is for collections. And all font files are currently dumped
> into one xorg-fonts ipkg. This is realy ugly and does not work with
> collections.
> It may be possible to create individual ipkgs for each package. But that's
> not so simple because we generate index files at the end. I don't know how
> this should be handled.
>
> Michael
>
> On Mon, Jul 30, 2018 at 04:13:19PM +0200, Florian Bäuerle wrote:
> > ---
> > rules/graphics_and_multimedia.in | 6 +++---
> > rules/xorg-font-100dpi-trans.in | 8 ++++----
> > rules/xorg-font-100dpi.in | 2 +-
> > rules/xorg-font-75dpi-trans.in | 8 ++++----
> > rules/xorg-font-75dpi.in | 2 +-
> > rules/xorg-font-adobe-utopia-type1.in | 2 +-
> > rules/xorg-font-alias.in | 2 +-
> > rules/xorg-font-arabic-misc.in | 2 +-
> > rules/xorg-font-arphic-ukai.in | 2 +-
> > rules/xorg-font-arphic-uming.in | 2 +-
> > rules/xorg-font-base-trans.in | 4 ++--
> > rules/xorg-font-bh-ttf.in | 2 +-
> > rules/xorg-font-bitstream-speedo.in | 2 +-
> > rules/xorg-font-bitstream-type1.in | 2 +-
> > rules/xorg-font-cronyx-cyrillic.in | 2 +-
> > rules/xorg-font-ibm-type1.in | 2 +-
> > rules/xorg-font-intl.in | 12 ++++++------
> > rules/xorg-font-misc-cyrillic.in | 2 +-
> > rules/xorg-font-misc-ethiopic.in | 2 +-
> > rules/xorg-font-misc-meltho.in | 2 +-
> > rules/xorg-font-screen-cyrillic.in | 2 +-
> > rules/xorg-font-speedo.in | 2 +-
> > rules/xorg-font-ttf-android.in | 2 +-
> > rules/xorg-font-ttf-bitstream-vera.in | 2 +-
> > rules/xorg-font-ttf-caladea.in | 2 +-
> > rules/xorg-font-ttf-carlito.in | 2 +-
> > rules/xorg-font-ttf-comic-jens.in | 2 +-
> > rules/xorg-font-ttf-dejavu.in | 2 +-
> > rules/xorg-font-ttf-hanazono.in | 2 +-
> > rules/xorg-font-ttf-liberation.in | 2 +-
> > rules/xorg-font-ttf-lohit-assamese.in | 2 +-
> > rules/xorg-font-ttf-lohit-bengali.in | 2 +-
> > rules/xorg-font-ttf-lohit-devanagari.in | 2 +-
> > rules/xorg-font-ttf-lohit-gujarati.in | 2 +-
> > rules/xorg-font-ttf-lohit-kannada.in | 2 +-
> > rules/xorg-font-ttf-lohit-malayalam.in | 2 +-
> > rules/xorg-font-ttf-lohit-oriya.in | 2 +-
> > rules/xorg-font-ttf-lohit-punjabi.in | 2 +-
> > rules/xorg-font-ttf-lohit-tamil-classical.in | 2 +-
> > rules/xorg-font-ttf-lohit-tamil.in | 2 +-
> > rules/xorg-font-ttf-lohit-telugu.in | 2 +-
> > rules/xorg-font-ttf-noto.in | 2 +-
> > rules/xorg-font-ttf-vlgothic.in | 2 +-
> > rules/xorg-font-ttf.in | 2 +-
> > rules/xorg-font-type1.in | 2 +-
> > rules/xorg-font-winitzki-cyrillic.in | 2 +-
> > rules/xorg-font-xfree86-type1.in | 2 +-
> > 47 files changed, 61 insertions(+), 61 deletions(-)
> >
> > diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
> > index 54e53ad7a..f96a381e3 100644
> > --- a/rules/graphics_and_multimedia.in
> > +++ b/rules/graphics_and_multimedia.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=graphics_and_multimedia
> >
> > menuconfig MENU_XORG_FONTS
> > - bool
> > + tristate
> > prompt "fonts "
> > select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER
> > default y if XORG_SERVER
> > @@ -13,7 +13,7 @@ if MENU_XORG_FONTS
> >
> > config XORG_FONTS
> > depends on MENU_XORG_FONTS
> > - bool
> > + tristate
> > select XORG_FONT_UTIL
> > select XORG_FONT_ALIAS
> > select HOST_XORG_APP_MKFONTDIR
> > @@ -25,7 +25,7 @@ config XORG_FONTS
> > config XORG_FONTS_FC_CACHE
> > default FONTCONFIG
> > select FONTCONFIG_UTILS
> > - bool
> > + tristate
> >
> > config XORG_FONTS_QT4_LINKS
> > depends on QT4_PLATFORM_EMBEDDED
> > diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
> > index 07c637681..846e290f3 100644
> > --- a/rules/xorg-font-100dpi-trans.in
> > +++ b/rules/xorg-font-100dpi-trans.in
> > @@ -9,7 +9,7 @@ menu "xorg 100 dpi fonts(transcoded)"
> > depends on XORG_FONT_100DPI
> >
> > config XORG_FONT_ADOBE_100DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_ADOBE_100DPI
> > prompt "Adobe 100dpi transcoded"
> > help
> > @@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_100DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_ADOBE_UTOPIA_100DPI
> > prompt "Adobe Utopia 100dpi transcoded"
> > help
> > @@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_BH_100DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_BH_100DPI
> > prompt "BH 100dpi transcoded"
> > help
> > @@ -39,7 +39,7 @@ config XORG_FONT_BH_100DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
> > prompt "BH Lucida Typewriter 100dpi transcoded"
> > help
> > diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
> > index 74d400052..7bfb43e32 100644
> > --- a/rules/xorg-font-100dpi.in
> > +++ b/rules/xorg-font-100dpi.in
> > @@ -2,7 +2,7 @@
> >
> > menuconfig XORG_FONT_100DPI
> > prompt "xorg 100 dpi fonts "
> > - bool
> > + tristate
> > depends on MENU_XORG_FONTS
> >
> > source "generated/multimedia_xorg_font_100dpi.in"
> > diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in
> > index ee079eb9e..cf1e2b7a3 100644
> > --- a/rules/xorg-font-75dpi-trans.in
> > +++ b/rules/xorg-font-75dpi-trans.in
> > @@ -9,7 +9,7 @@ menu "xorg 75 dpi fonts (transcoded)"
> > depends on XORG_FONT_75DPI
> >
> > config XORG_FONT_ADOBE_75DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_ADOBE_75DPI
> > prompt "Adobe 75dpi transcoded"
> > help
> > @@ -21,7 +21,7 @@ config XORG_FONT_ADOBE_75DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_ADOBE_UTOPIA_75DPI
> > prompt "Adobe Utopia 75dpi transcoded"
> > help
> > @@ -31,7 +31,7 @@ config XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_BH_75DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_BH_75DPI
> > prompt "BH 75dpi transcoded"
> > help
> > @@ -39,7 +39,7 @@ config XORG_FONT_BH_75DPI_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
> > prompt "BH Lucida Typewriter 75dpi transcoded"
> > help
> > diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
> > index c96404eaf..396c88d86 100644
> > --- a/rules/xorg-font-75dpi.in
> > +++ b/rules/xorg-font-75dpi.in
> > @@ -2,7 +2,7 @@
> >
> > menuconfig XORG_FONT_75DPI
> > depends on MENU_XORG_FONTS
> > - bool
> > + tristate
> > prompt "xorg 75 dpi fonts "
> >
> > source "generated/multimedia_xorg_font_75dpi.in"
> > diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in
> > index 265685f1d..3b5220ee4 100644
> > --- a/rules/xorg-font-adobe-utopia-type1.in
> > +++ b/rules/xorg-font-adobe-utopia-type1.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_type1
> >
> > config XORG_FONT_ADOBE_UTOPIA_TYPE1
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TYPE1
> > prompt "Adobe Utopia type1"
> > diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in
> > index 9db36d8dc..8e764e5df 100644
> > --- a/rules/xorg-font-alias.in
> > +++ b/rules/xorg-font-alias.in
> > @@ -1,4 +1,4 @@
> > ## SECTION=multimedia_xorg_font_utils
> >
> > config XORG_FONT_ALIAS
> > - bool
> > + tristate
> > diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in
> > index 82302a960..49eaabea9 100644
> > --- a/rules/xorg-font-arabic-misc.in
> > +++ b/rules/xorg-font-arabic-misc.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_other
> >
> > config XORG_FONT_ARABIC_MISC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "Arabic misc."
> > help
> > diff --git a/rules/xorg-font-arphic-ukai.in b/rules/xorg-font-arphic-ukai.in
> > index eff2703a7..85b1258e0 100644
> > --- a/rules/xorg-font-arphic-ukai.in
> > +++ b/rules/xorg-font-arphic-ukai.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_other
> >
> > config XORG_FONT_ARPHIC_UKAI
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "'AR PL UKai' Chinese font collection Kaiti style"
> > help
> > diff --git a/rules/xorg-font-arphic-uming.in b/rules/xorg-font-arphic-uming.in
> > index a3adec507..923ccd65d 100644
> > --- a/rules/xorg-font-arphic-uming.in
> > +++ b/rules/xorg-font-arphic-uming.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_other
> >
> > config XORG_FONT_ARPHIC_UMING
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "'AR PL UMing' Chinese font collection Mingti style"
> > help
> > diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in
> > index 8094b6fdf..898216fc9 100644
> > --- a/rules/xorg-font-base-trans.in
> > +++ b/rules/xorg-font-base-trans.in
> > @@ -4,7 +4,7 @@ menu "xorg base fonts(transcoded) "
> > depends on MENU_XORG_FONTS
> >
> > config XORG_FONT_MISC_MISC_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_MISC_MISC
> > prompt "misc misc transcoded"
> > help
> > @@ -14,7 +14,7 @@ config XORG_FONT_MISC_MISC_TRANS
> > encodings: -2, -3, -4, -9, -10, -13 and -14.
> >
> > config XORG_FONT_SCHUMACHER_MISC_TRANS
> > - bool
> > + tristate
> > depends on XORG_FONT_SCHUMACHER_MISC
> > select XORG_FONTS
> > prompt "Schumacher misc transcoded"
> > diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in
> > index 8cf397fd0..b0aaa4c66 100644
> > --- a/rules/xorg-font-bh-ttf.in
> > +++ b/rules/xorg-font-bh-ttf.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_BH_TTF
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > default y
> > diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in
> > index ebd43d8a8..a2fe26de8 100644
> > --- a/rules/xorg-font-bitstream-speedo.in
> > +++ b/rules/xorg-font-bitstream-speedo.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_speedo
> >
> > config XORG_FONT_BITSTREAM_SPEEDO
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_SPEEDO
> > prompt "Bitstream speedo"
> > diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in
> > index 58a2ff117..3b3c83536 100644
> > --- a/rules/xorg-font-bitstream-type1.in
> > +++ b/rules/xorg-font-bitstream-type1.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_type1
> >
> > config XORG_FONT_BITSTREAM_TYPE1
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TYPE1
> > default y
> > diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in
> > index ddda75492..c7cd12b84 100644
> > --- a/rules/xorg-font-cronyx-cyrillic.in
> > +++ b/rules/xorg-font-cronyx-cyrillic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_cyrillic
> >
> > config XORG_FONT_CRONYX_CYRILLIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "Cronyx cyrillic"
> > help
> > diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in
> > index 9e6fda056..18f108c49 100644
> > --- a/rules/xorg-font-ibm-type1.in
> > +++ b/rules/xorg-font-ibm-type1.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_type1
> >
> > config XORG_FONT_IBM_TYPE1
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TYPE1
> > prompt "IBM type1"
> > diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
> > index 1235e38ed..981a954ff 100644
> > --- a/rules/xorg-font-intl.in
> > +++ b/rules/xorg-font-intl.in
> > @@ -4,12 +4,12 @@ menu "international fonts for X "
> > depends on MENU_XORG_FONTS
> >
> > menuconfig XORG_FONT_INTL
> > - bool
> > + tristate
> > prompt "chinese and other asian fonts"
> > select XORG_FONTS
> >
> > config XORG_FONT_INTL_CHIN
> > - bool
> > + tristate
> > prompt "chinese fonts"
> > depends on XORG_FONT_INTL
> > help
> > @@ -18,14 +18,14 @@ config XORG_FONT_INTL_CHIN
> > documents written in Chinese and using any of the encodings mentioned above.
> >
> > config XORG_FONT_INTL_CHIN_BIG
> > - bool
> > + tristate
> > prompt "chinese fonts (big size)"
> > depends on XORG_FONT_INTL
> > help
> > This package contains two GB coded fonts in big size
> >
> > config XORG_FONT_INTL_JAP
> > - bool
> > + tristate
> > prompt "japanese fonts"
> > depends on XORG_FONT_INTL
> > help
> > @@ -35,7 +35,7 @@ config XORG_FONT_INTL_JAP
> > the Japanese language and any of the encodings specified above.
> >
> > config XORG_FONT_INTL_JAP_BIG
> > - bool
> > + tristate
> > prompt "Japanese fonts (big size)"
> > depends on XORG_FONT_INTL
> > help
> > @@ -43,7 +43,7 @@ config XORG_FONT_INTL_JAP_BIG
> >
> >
> > config XORG_FONT_INTL_ASIAN
> > - bool
> > + tristate
> > prompt "other asian languages"
> > depends on XORG_FONT_INTL
> > help
> > diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in
> > index ce2992473..e5846d955 100644
> > --- a/rules/xorg-font-misc-cyrillic.in
> > +++ b/rules/xorg-font-misc-cyrillic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_cyrillic
> >
> > config XORG_FONT_MISC_CYRILLIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "misc cyrillic"
> > help
> > diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in
> > index 85d63bb8b..0076fcb38 100644
> > --- a/rules/xorg-font-misc-ethiopic.in
> > +++ b/rules/xorg-font-misc-ethiopic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_other
> >
> > config XORG_FONT_MISC_ETHIOPIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "misc. Ethiopic"
> > help
> > diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in
> > index 9f86cee2c..a088f2f16 100644
> > --- a/rules/xorg-font-misc-meltho.in
> > +++ b/rules/xorg-font-misc-meltho.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_other
> >
> > config XORG_FONT_MISC_MELTHO
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "misc. Meltho"
> > help
> > diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in
> > index e7f649d10..fed766461 100644
> > --- a/rules/xorg-font-screen-cyrillic.in
> > +++ b/rules/xorg-font-screen-cyrillic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_cyrillic
> >
> > config XORG_FONT_SCREEN_CYRILLIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "Screen cyrillic"
> > help
> > diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in
> > index 915ef0aad..5ea90d5e1 100644
> > --- a/rules/xorg-font-speedo.in
> > +++ b/rules/xorg-font-speedo.in
> > @@ -2,7 +2,7 @@
> >
> > menuconfig XORG_FONT_SPEEDO
> > depends on MENU_XORG_FONTS
> > - bool
> > + tristate
> > prompt "xorg speedo fonts "
> >
> > source "generated/multimedia_xorg_font_speedo.in"
> > diff --git a/rules/xorg-font-ttf-android.in b/rules/xorg-font-ttf-android.in
> > index f9736bc57..03da37420 100644
> > --- a/rules/xorg-font-ttf-android.in
> > +++ b/rules/xorg-font-ttf-android.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_ANDROID
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Android"
> > diff --git a/rules/xorg-font-ttf-bitstream-vera.in b/rules/xorg-font-ttf-bitstream-vera.in
> > index 31236962b..42eb04cc8 100644
> > --- a/rules/xorg-font-ttf-bitstream-vera.in
> > +++ b/rules/xorg-font-ttf-bitstream-vera.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_BITSTREAM_VERA
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > default y
> > diff --git a/rules/xorg-font-ttf-caladea.in b/rules/xorg-font-ttf-caladea.in
> > index f7ef13a4e..aadfe3354 100644
> > --- a/rules/xorg-font-ttf-caladea.in
> > +++ b/rules/xorg-font-ttf-caladea.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_CALADEA
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "caladea"
> > diff --git a/rules/xorg-font-ttf-carlito.in b/rules/xorg-font-ttf-carlito.in
> > index cbafae3f5..98e7e701c 100644
> > --- a/rules/xorg-font-ttf-carlito.in
> > +++ b/rules/xorg-font-ttf-carlito.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_CARLITO
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "carlito"
> > diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
> > index ec6891f6f..2cebf9566 100644
> > --- a/rules/xorg-font-ttf-comic-jens.in
> > +++ b/rules/xorg-font-ttf-comic-jens.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_COMIC_JENS
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Comic Jens"
> > diff --git a/rules/xorg-font-ttf-dejavu.in b/rules/xorg-font-ttf-dejavu.in
> > index f381631a7..050d5ed39 100644
> > --- a/rules/xorg-font-ttf-dejavu.in
> > +++ b/rules/xorg-font-ttf-dejavu.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_DEJAVU
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "dejavu"
> > diff --git a/rules/xorg-font-ttf-hanazono.in b/rules/xorg-font-ttf-hanazono.in
> > index 309c5df30..e3d88e549 100644
> > --- a/rules/xorg-font-ttf-hanazono.in
> > +++ b/rules/xorg-font-ttf-hanazono.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_HANAZONO
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Hanazono"
> > diff --git a/rules/xorg-font-ttf-liberation.in b/rules/xorg-font-ttf-liberation.in
> > index 4db75099f..bd836b2d9 100644
> > --- a/rules/xorg-font-ttf-liberation.in
> > +++ b/rules/xorg-font-ttf-liberation.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LIBERATION
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "liberation"
> > diff --git a/rules/xorg-font-ttf-lohit-assamese.in b/rules/xorg-font-ttf-lohit-assamese.in
> > index 4ab0636a0..ebc2b1534 100644
> > --- a/rules/xorg-font-ttf-lohit-assamese.in
> > +++ b/rules/xorg-font-ttf-lohit-assamese.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_ASSAMESE
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Assamese"
> > diff --git a/rules/xorg-font-ttf-lohit-bengali.in b/rules/xorg-font-ttf-lohit-bengali.in
> > index e029093a7..6b2644a2b 100644
> > --- a/rules/xorg-font-ttf-lohit-bengali.in
> > +++ b/rules/xorg-font-ttf-lohit-bengali.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_BENGALI
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Bengali"
> > diff --git a/rules/xorg-font-ttf-lohit-devanagari.in b/rules/xorg-font-ttf-lohit-devanagari.in
> > index 423c91af3..8a03316a2 100644
> > --- a/rules/xorg-font-ttf-lohit-devanagari.in
> > +++ b/rules/xorg-font-ttf-lohit-devanagari.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_DEVANAGARI
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Devanagari"
> > diff --git a/rules/xorg-font-ttf-lohit-gujarati.in b/rules/xorg-font-ttf-lohit-gujarati.in
> > index 375939315..68019e9d4 100644
> > --- a/rules/xorg-font-ttf-lohit-gujarati.in
> > +++ b/rules/xorg-font-ttf-lohit-gujarati.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_GUJARATI
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Gujarati"
> > diff --git a/rules/xorg-font-ttf-lohit-kannada.in b/rules/xorg-font-ttf-lohit-kannada.in
> > index dd8859f17..d57019752 100644
> > --- a/rules/xorg-font-ttf-lohit-kannada.in
> > +++ b/rules/xorg-font-ttf-lohit-kannada.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_KANNADA
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Kannada"
> > diff --git a/rules/xorg-font-ttf-lohit-malayalam.in b/rules/xorg-font-ttf-lohit-malayalam.in
> > index dd686b258..394f0964c 100644
> > --- a/rules/xorg-font-ttf-lohit-malayalam.in
> > +++ b/rules/xorg-font-ttf-lohit-malayalam.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_MALAYALAM
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Malayalam"
> > diff --git a/rules/xorg-font-ttf-lohit-oriya.in b/rules/xorg-font-ttf-lohit-oriya.in
> > index a5b99dc6a..73fdcd265 100644
> > --- a/rules/xorg-font-ttf-lohit-oriya.in
> > +++ b/rules/xorg-font-ttf-lohit-oriya.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_ORIYA
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Oriya"
> > diff --git a/rules/xorg-font-ttf-lohit-punjabi.in b/rules/xorg-font-ttf-lohit-punjabi.in
> > index d5ef94265..a03628d6a 100644
> > --- a/rules/xorg-font-ttf-lohit-punjabi.in
> > +++ b/rules/xorg-font-ttf-lohit-punjabi.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_PUNJABI
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Punjabi"
> > diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.in b/rules/xorg-font-ttf-lohit-tamil-classical.in
> > index 3b52f988d..73783d645 100644
> > --- a/rules/xorg-font-ttf-lohit-tamil-classical.in
> > +++ b/rules/xorg-font-ttf-lohit-tamil-classical.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Tamil Classical"
> > diff --git a/rules/xorg-font-ttf-lohit-tamil.in b/rules/xorg-font-ttf-lohit-tamil.in
> > index e8ba329f3..cb2cc000c 100644
> > --- a/rules/xorg-font-ttf-lohit-tamil.in
> > +++ b/rules/xorg-font-ttf-lohit-tamil.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_TAMIL
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Tamil"
> > diff --git a/rules/xorg-font-ttf-lohit-telugu.in b/rules/xorg-font-ttf-lohit-telugu.in
> > index 5c48a3c56..a23125da6 100644
> > --- a/rules/xorg-font-ttf-lohit-telugu.in
> > +++ b/rules/xorg-font-ttf-lohit-telugu.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_LOHIT_TELUGU
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Lohit Telugu"
> > diff --git a/rules/xorg-font-ttf-noto.in b/rules/xorg-font-ttf-noto.in
> > index e3c04c6cc..fa90f8eeb 100644
> > --- a/rules/xorg-font-ttf-noto.in
> > +++ b/rules/xorg-font-ttf-noto.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_NOTO
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "Noto"
> > diff --git a/rules/xorg-font-ttf-vlgothic.in b/rules/xorg-font-ttf-vlgothic.in
> > index 23067930f..4499326f7 100644
> > --- a/rules/xorg-font-ttf-vlgothic.in
> > +++ b/rules/xorg-font-ttf-vlgothic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_ttf
> >
> > config XORG_FONT_TTF_VLGOTHIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TTF
> > prompt "VL Gothic"
> > diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in
> > index abab0c7a8..32f944385 100644
> > --- a/rules/xorg-font-ttf.in
> > +++ b/rules/xorg-font-ttf.in
> > @@ -3,7 +3,7 @@
> > menuconfig XORG_FONT_TTF
> > depends on MENU_XORG_FONTS
> > select XORG_LIB_XFONT_FREETYPE if XORG_LIB_XFONT
> > - bool
> > + tristate
> > prompt "xorg true/open type fonts "
> >
> > source "generated/multimedia_xorg_font_ttf.in"
> > diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in
> > index 3ba10059a..4bda59341 100644
> > --- a/rules/xorg-font-type1.in
> > +++ b/rules/xorg-font-type1.in
> > @@ -2,7 +2,7 @@
> >
> > menuconfig XORG_FONT_TYPE1
> > depends on MENU_XORG_FONTS
> > - bool
> > + tristate
> > prompt "xorg scalable fonts "
> >
> > source "generated/multimedia_xorg_font_type1.in"
> > diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in
> > index 2b4c2e6fa..358fef0ff 100644
> > --- a/rules/xorg-font-winitzki-cyrillic.in
> > +++ b/rules/xorg-font-winitzki-cyrillic.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_cyrillic
> >
> > config XORG_FONT_WINITZKI_CYRILLIC
> > - bool
> > + tristate
> > select XORG_FONTS
> > prompt "Winitzki cyrillic"
> > help
> > diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in
> > index 711fc0394..a9c8743b8 100644
> > --- a/rules/xorg-font-xfree86-type1.in
> > +++ b/rules/xorg-font-xfree86-type1.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_type1
> >
> > config XORG_FONT_XFREE86_TYPE1
> > - bool
> > + tristate
> > select XORG_FONTS
> > depends on XORG_FONT_TYPE1
> > prompt "Xfree86 type1"
> > --
> > 2.18.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
2018-07-31 8:54 ` Baeuerle, Florian
@ 2018-07-31 9:31 ` Michael Olbrich
2018-07-31 9:54 ` Baeuerle, Florian
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2018-07-31 9:31 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, Jul 31, 2018 at 08:54:14AM +0000, Baeuerle, Florian wrote:
> the approach works for me, at least for completely selecting or deselecting
> a font via collection. You have to select MENU_FONTS and XORG_FONT_TTF as
> module. I have a package which then selects noto fonts as dependency.
>
> When deselecting this package in a collection, I end up with a rootfs
> containing no fonts. When selecting the package, I have the font.
>
> I admittedly did not check all scenarios and corner cases, like (de)selecting
> a subset of fonts via collection.
>
> We really need such a feature because we have products with and without
> display and the latter ones do not have enough NAND to contain the fonts.
>
>
> The solution might be ugly but it solves a problem.
>
> If you have other ideas, I'd be willing to discuss and eventually implement
> them, because we really want to be able to (de)select fonts via collection.
If only want to switch from 'some fonts' to 'no fonts', then the goal
should be to leave the individual font packages as 'bool' and only change
MENU_XORG_FONTS/XORG_FONTS to tristate.
However, that's currently not quite that simple because xorg-fonts provides
the dependencies. Hmmm, try this for the font packages:
ifdef PTXCONF_XORG_FONTS
PACKAGES-$(PTXCONF_XORG_FONT_<SOMETHING>) += xorg-font-<something>
endif
Then the packages should be skipped if XORG_FONTS is not selected in the
collection.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
2018-07-31 9:31 ` Michael Olbrich
@ 2018-07-31 9:54 ` Baeuerle, Florian
2018-07-31 13:45 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Baeuerle, Florian @ 2018-07-31 9:54 UTC (permalink / raw)
To: ptxdist
Hi,
Am Dienstag, den 31.07.2018, 11:31 +0200 schrieb Michael Olbrich:
> Hi,
>
> On Tue, Jul 31, 2018 at 08:54:14AM +0000, Baeuerle, Florian wrote:
> > the approach works for me, at least for completely selecting or deselecting
> > a font via collection. You have to select MENU_FONTS and XORG_FONT_TTF as
> > module. I have a package which then selects noto fonts as dependency.
> >
> > When deselecting this package in a collection, I end up with a rootfs
> > containing no fonts. When selecting the package, I have the font.
> >
> > I admittedly did not check all scenarios and corner cases, like (de)selecting
> > a subset of fonts via collection.
> >
> > We really need such a feature because we have products with and without
> > display and the latter ones do not have enough NAND to contain the fonts.
> >
> >
> > The solution might be ugly but it solves a problem.
> >
> > If you have other ideas, I'd be willing to discuss and eventually implement
> > them, because we really want to be able to (de)select fonts via collection.
>
> If only want to switch from 'some fonts' to 'no fonts', then the goal
> should be to leave the individual font packages as 'bool' and only change
> MENU_XORG_FONTS/XORG_FONTS to tristate.
Well, actually we require two different subsets of fonts and no fonts. I just
did not yet make enough progress to test that.
>
> However, that's currently not quite that simple because xorg-fonts provides
> the dependencies. Hmmm, try this for the font packages:
>
> ifdef PTXCONF_XORG_FONTS
> PACKAGES-$(PTXCONF_XORG_FONT_<SOMETHING>) += xorg-font-<something>
> endif
Would you accept such a patch?
I think being able to select sets of fonts via collection would be nicer.
Can you see issues with above patch that would prevent that from working?
I totally see that it would be nicer having distinct packages per font, but
also I have no clue how that could be done properly. Maybe the ipkg should contain
a postinst/postrm hook to manipulate fonts.dir and fonts.scale? But then also the
fc-cache should be invalidated if someone really wants to use opkg on a target
device for updating...
>
> Then the packages should be skipped if XORG_FONTS is not selected in the
> collection.
>
> Michael
>
Best Regards
Florian
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate
2018-07-31 9:54 ` Baeuerle, Florian
@ 2018-07-31 13:45 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2018-07-31 13:45 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, Jul 31, 2018 at 09:54:22AM +0000, Baeuerle, Florian wrote:
> Am Dienstag, den 31.07.2018, 11:31 +0200 schrieb Michael Olbrich:
> > On Tue, Jul 31, 2018 at 08:54:14AM +0000, Baeuerle, Florian wrote:
> > > the approach works for me, at least for completely selecting or deselecting
> > > a font via collection. You have to select MENU_FONTS and XORG_FONT_TTF as
> > > module. I have a package which then selects noto fonts as dependency.
> > >
> > > When deselecting this package in a collection, I end up with a rootfs
> > > containing no fonts. When selecting the package, I have the font.
> > >
> > > I admittedly did not check all scenarios and corner cases, like (de)selecting
> > > a subset of fonts via collection.
> > >
> > > We really need such a feature because we have products with and without
> > > display and the latter ones do not have enough NAND to contain the fonts.
> > >
> > >
> > > The solution might be ugly but it solves a problem.
> > >
> > > If you have other ideas, I'd be willing to discuss and eventually implement
> > > them, because we really want to be able to (de)select fonts via collection.
> >
> > If only want to switch from 'some fonts' to 'no fonts', then the goal
> > should be to leave the individual font packages as 'bool' and only change
> > MENU_XORG_FONTS/XORG_FONTS to tristate.
>
> Well, actually we require two different subsets of fonts and no fonts. I just
> did not yet make enough progress to test that.
Then my proposal will not work for you.
> > However, that's currently not quite that simple because xorg-fonts provides
> > the dependencies. Hmmm, try this for the font packages:
> >
> > ifdef PTXCONF_XORG_FONTS
> > PACKAGES-$(PTXCONF_XORG_FONT_<SOMETHING>) += xorg-font-<something>
> > endif
>
> Would you accept such a patch?
>
> I think being able to select sets of fonts via collection would be nicer.
> Can you see issues with above patch that would prevent that from working?
That won't work properly with the current setup. You may be able to hack
something like your current patch, that may works for you use-case but
that's not acceptable for mainline.
PTXdist has two main use-cases for collections:
1. select a collection and only build this subset
2. use a collection for a specific image and install only a subset of the
package there.
The second case does not work with your patch, because there is only on
xorg-fonts ipkg.
> I totally see that it would be nicer having distinct packages per font, but
> also I have no clue how that could be done properly. Maybe the ipkg should contain
> a postinst/postrm hook to manipulate fonts.dir and fonts.scale? But then also the
> fc-cache should be invalidated if someone really wants to use opkg on a target
> device for updating...
No, but you can install the fonts into separate subdirs,
/usr/share/fonts/X11/<type>/<pkg> instead of /usr/share/fonts/X11/<type>,
and create fonts.dir, fonts.scale and qt4 symlinks for each package
individually.
xorg-fonts will then only contain /etc/rc.once.d/fc-cache.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-31 13:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-30 14:13 [ptxdist] [PATCH] xorg-fonts: make all xorg-font packages tristate Florian Bäuerle
2018-07-30 15:46 ` Michael Olbrich
2018-07-31 8:54 ` Baeuerle, Florian
2018-07-31 9:31 ` Michael Olbrich
2018-07-31 9:54 ` Baeuerle, Florian
2018-07-31 13:45 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox