* [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts
@ 2018-08-01 18:31 Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
` (21 more replies)
0 siblings, 22 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
index 443f855aa..adad187c5 100644
--- a/rules/xorg-font-ttf-android.make
+++ b/rules/xorg-font-ttf-android.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
-ifdef PTXCONF_XORG_FONT_TTF_ANDROID
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
+XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
$(STATEDIR)/xorg-font-ttf-android.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_ANDROID_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
$(STATEDIR)/xorg-font-ttf-android.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-android)
+ @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_ANDROID_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-android, \
+ ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-android)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 02/23] xorg-font-ttf-bitstream-vera: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
` (20 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-bitstream-vera.make | 49 ++++++++++++++++---------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make
index eeb2f943e..5d89be1d7 100644
--- a/rules/xorg-font-ttf-bitstream-vera.make
+++ b/rules/xorg-font-ttf-bitstream-vera.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,17 +29,8 @@ XORG_FONT_TTF_BITSTREAM_VERA_LICENSE := Bitstream-Vera
XORG_FONT_TTF_BITSTREAM_VERA_LICENSE_FILES := \
file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
-ifdef PTXCONF_XORG_FONT_TTF_BITSTREAM_VERA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-bitstream-vera.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR := $(XORG_FONTDIR)/truetype/bitstream-vera
+XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR := $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR)$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -54,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.compile:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-bitstream-vera)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-bitstream-vera, 0, 0, -, $(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-bitstream-vera, \
+ ../../..$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-bitstream-vera)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 03/23] xorg-font-ttf-caladea: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
` (19 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-caladea.make | 45 +++++++++++++++++++-------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-caladea.make b/rules/xorg-font-ttf-caladea.make
index e0c83a600..48572f3a5 100644
--- a/rules/xorg-font-ttf-caladea.make
+++ b/rules/xorg-font-ttf-caladea.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CALADEA_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CALADEA).$(XORG_FONT_T
XORG_FONT_TTF_CALADEA_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CALADEA)
XORG_FONT_TTF_CALADEA_LICENSE := Apache-2.0
-ifdef PTXCONF_XORG_FONT_TTF_CALADEA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_CALADEA_CONF_TOOL := NO
+XORG_FONT_TTF_CALADEA_FONTDIR := $(XORG_FONTDIR)/truetype/caladea
+XORG_FONT_TTF_CALADEA_FONTPKGDIR := $(XORG_FONT_TTF_CALADEA_PKGDIR)$(XORG_FONT_TTF_CALADEA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,18 @@ $(STATEDIR)/xorg-font-ttf-caladea.compile:
$(STATEDIR)/xorg-font-ttf-caladea.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_CALADEA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_CALADEA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_CALADEA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,15 +64,6 @@ $(STATEDIR)/xorg-font-ttf-caladea.install:
$(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CALADEA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-caladea)
@$(call install_fixup, xorg-font-ttf-caladea,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-caladea,SECTION,base)
@@ -78,6 +75,18 @@ $(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call install_alternative, xorg-font-ttf-caladea, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-caladea-fontconfig.conf)
+ @$(call install_tree, xorg-font-ttf-caladea, 0, 0, -, $(XORG_FONT_TTF_CALADEA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_CALADEA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-caladea, \
+ ../../..$(XORG_FONT_TTF_CALADEA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-caladea)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 04/23] xorg-font-ttf-carlito: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
` (18 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-carlito.make | 45 +++++++++++++++++++-------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make
index e5e4468dd..ff1894cea 100644
--- a/rules/xorg-font-ttf-carlito.make
+++ b/rules/xorg-font-ttf-carlito.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T
XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO)
XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_CARLITO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
+XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito
+XORG_FONT_TTF_CARLITO_FONTPKGDIR := $(XORG_FONT_TTF_CARLITO_PKGDIR)$(XORG_FONT_TTF_CARLITO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -41,6 +35,18 @@ XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
$(STATEDIR)/xorg-font-ttf-carlito.compile:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_CARLITO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_CARLITO_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_CARLITO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,15 +64,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CARLITO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-carlito)
@$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-carlito,SECTION,base)
@@ -78,6 +75,18 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf)
+ @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, $(XORG_FONT_TTF_CARLITO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_CARLITO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-carlito, \
+ ../../..$(XORG_FONT_TTF_CARLITO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-carlito)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 05/23] remove xorg-font-ttf-comic-jens
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (2 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
` (17 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
There is a successor to comic jens (ff uberhand) and the source do not
seem to be available any longer. Simply drop it.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-comic-jens.in | 9 ----
rules/xorg-font-ttf-comic-jens.make | 74 -----------------------------
2 files changed, 83 deletions(-)
delete mode 100644 rules/xorg-font-ttf-comic-jens.in
delete mode 100644 rules/xorg-font-ttf-comic-jens.make
diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
deleted file mode 100644
index ec6891f6f..000000000
--- a/rules/xorg-font-ttf-comic-jens.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_font_ttf
-
-config XORG_FONT_TTF_COMIC_JENS
- bool
- select XORG_FONTS
- depends on XORG_FONT_TTF
- prompt "Comic Jens"
- help
- A free alternative to Comic Sans.
diff --git a/rules/xorg-font-ttf-comic-jens.make b/rules/xorg-font-ttf-comic-jens.make
deleted file mode 100644
index 276fc8bcc..000000000
--- a/rules/xorg-font-ttf-comic-jens.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_FONT_TTF_COMIC_JENS) += xorg-font-ttf-comic-jens
-
-#
-# Paths and names
-#
-XORG_FONT_TTF_COMIC_JENS_VERSION := 2.0
-XORG_FONT_TTF_COMIC_JENS_MD5 := 21ab5b4a9360b58959ad30e757aa2ada
-XORG_FONT_TTF_COMIC_JENS := comic-jens
-XORG_FONT_TTF_COMIC_JENS_SUFFIX := zip
-XORG_FONT_TTF_COMIC_JENS_URL := http://www.kutilek.de/download/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_COMIC_JENS)
-XORG_FONT_TTF_COMIC_JENS_LICENSE := CC-BY-ND-3.0
-XORG_FONT_TTF_COMIC_JENS_LICENSE_FILES := \
- file://Licence.txt;md5=dccc90a479b3a0b508cac38314a04334
-
-ifdef PTXCONF_XORG_FONT_TTF_COMIC_JENS
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_COMIC_JENS_CONF_TOOL := NO
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall:
- @$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_COMIC_JENS_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
- @$(call touch)
-
-# vim: syntax=make
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (3 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
` (16 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-dejavu.make | 35 +++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make
index bfe95bbd4..52aeab362 100644
--- a/rules/xorg-font-ttf-dejavu.make
+++ b/rules/xorg-font-ttf-dejavu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,9 +26,8 @@ XORG_FONT_TTF_DEJAVU_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF
XORG_FONT_TTF_DEJAVU_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU)
XORG_FONT_TTF_DEJAVU_LICENSE := Bitstream-Vera AND public_domain
-ifdef PTXCONF_XORG_FONT_TTF_DEJAVU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall
-endif
+XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu
+XORG_FONT_TTF_DEJAVU_FONTPKGDIR := $(XORG_FONT_TTF_DEJAVU_PKGDIR)$(XORG_FONT_TTF_DEJAVU_FONTDIR)
# ----------------------------------------------------------------------------
# Prepare
@@ -61,6 +61,16 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install:
ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \
done
+ @mkdir -p $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_DEJAVU_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -72,13 +82,6 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
- @find $(XORG_FONT_TTF_DEJAVU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-dejavu)
@$(call install_fixup, xorg-font-ttf-dejavu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-dejavu,SECTION,base)
@@ -88,6 +91,18 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.d)
@$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.avail)
+ @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, $(XORG_FONT_TTF_DEJAVU_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_DEJAVU_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-dejavu, \
+ ../../..$(XORG_FONT_TTF_DEJAVU_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-dejavu)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 07/23] xorg-font-ttf-hanazono: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (4 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
` (15 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-hanazono.make | 47 +++++++++++++++++++++----------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/rules/xorg-font-ttf-hanazono.make b/rules/xorg-font-ttf-hanazono.make
index 3a5a62bb2..87f3a16c9 100644
--- a/rules/xorg-font-ttf-hanazono.make
+++ b/rules/xorg-font-ttf-hanazono.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,15 +27,8 @@ XORG_FONT_TTF_HANAZONO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_HANAZONO)
XORG_FONT_TTF_HANAZONO_STRIP_LEVEL := 0
XORG_FONT_TTF_HANAZONO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_HANAZONO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_HANAZONO_CONF_TOOL := NO
+XORG_FONT_TTF_HANAZONO_FONTDIR := $(XORG_FONTDIR)/truetype/hanazono
+XORG_FONT_TTF_HANAZONO_FONTPKGDIR := $(XORG_FONT_TTF_HANAZONO_PKGDIR)$(XORG_FONT_TTF_HANAZONO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -50,6 +44,18 @@ $(STATEDIR)/xorg-font-ttf-hanazono.compile:
$(STATEDIR)/xorg-font-ttf-hanazono.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_HANAZONO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_HANAZONO_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,14 +65,25 @@ $(STATEDIR)/xorg-font-ttf-hanazono.install:
$(STATEDIR)/xorg-font-ttf-hanazono.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-hanazono)
+ @$(call install_fixup, xorg-font-ttf-hanazono,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-hanazono,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-hanazono,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-hanazono,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_HANAZONO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-hanazono, 0, 0, -, $(XORG_FONT_TTF_HANAZONO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_HANAZONO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-hanazono, \
+ ../../..$(XORG_FONT_TTF_HANAZONO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-hanazono)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 08/23] xorg-font-ttf-liberation: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (5 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
` (14 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-liberation.make | 49 +++++++++++++++++++----------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-liberation.make b/rules/xorg-font-ttf-liberation.make
index 1e60a18bc..69d438f48 100644
--- a/rules/xorg-font-ttf-liberation.make
+++ b/rules/xorg-font-ttf-liberation.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,17 +28,8 @@ XORG_FONT_TTF_LIBERATION_LICENSE := OFL-1.1
XORG_FONT_TTF_LIBERATION_LICENSE_FILES := \
file://LICENSE;md5=f96db970a9a46c5369142b99f530366b
-ifdef PTXCONF_XORG_FONT_TTF_LIBERATION
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-liberation.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_LIBERATION_FONTDIR := $(XORG_FONTDIR)/truetype/liberation
+XORG_FONT_TTF_LIBERATION_FONTPKGDIR := $(XORG_FONT_TTF_LIBERATION_PKGDIR)$(XORG_FONT_TTF_LIBERATION_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -53,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-liberation.compile:
$(STATEDIR)/xorg-font-ttf-liberation.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LIBERATION_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LIBERATION_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -62,14 +66,25 @@ $(STATEDIR)/xorg-font-ttf-liberation.install:
$(STATEDIR)/xorg-font-ttf-liberation.targetinstall:
@$(call targetinfo)
- mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-liberation)
+ @$(call install_fixup, xorg-font-ttf-liberation,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-liberation,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-liberation,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-liberation,DESCRIPTION,missing)
- find $(XORG_FONT_TTF_LIBERATION_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-liberation, 0, 0, -, $(XORG_FONT_TTF_LIBERATION_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LIBERATION_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-liberation, \
+ ../../..$(XORG_FONT_TTF_LIBERATION_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-liberation)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 09/23] xorg-font-ttf-lohit-assamese: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (6 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
` (13 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-assamese.make | 45 +++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-assamese.make b/rules/xorg-font-ttf-lohit-assamese.make
index 4529d7131..2a10391fb 100644
--- a/rules/xorg-font-ttf-lohit-assamese.make
+++ b/rules/xorg-font-ttf-lohit-assamese.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ASSAMESE
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_ASSAMESE_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-assamese
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)$(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.compile:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-assamese)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
$(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf, \
/etc/fonts/conf.d/66-lohit-assamese.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-assamese, \
+ ../../..$(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-assamese)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 10/23] xorg-font-ttf-lohit-bengali: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (7 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
` (12 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-bengali.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-bengali.make b/rules/xorg-font-ttf-lohit-bengali.make
index c580be96e..f0f7fc1ea 100644
--- a/rules/xorg-font-ttf-lohit-bengali.make
+++ b/rules/xorg-font-ttf-lohit-bengali.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_BENGALI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_BENGALI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_BENGALI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_BENGALI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-bengali
+XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)$(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.compile:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-bengali)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
$(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf, \
/etc/fonts/conf.d/66-lohit-bengali.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-bengali, 0, 0, -, $(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-bengali, \
+ ../../..$(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-bengali)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 11/23] xorg-font-ttf-lohit-devanagari: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (8 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
` (11 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-devanagari.make | 45 ++++++++++++++---------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-devanagari.make b/rules/xorg-font-ttf-lohit-devanagari.make
index 7b8643631..6f397aa8c 100644
--- a/rules/xorg-font-ttf-lohit-devanagari.make
+++ b/rules/xorg-font-ttf-lohit-devanagari.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_DEVANAGARI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_DEVANAGARI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-devanagari
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)$(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.compile:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-devanagari)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
$(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf, \
/etc/fonts/conf.d/66-lohit-devanagari.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-devanagari, 0, 0, -, $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-devanagari, \
+ ../../..$(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-devanagari)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 12/23] xorg-font-ttf-lohit-gujarati: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (9 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
` (10 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-gujarati.make | 45 +++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-gujarati.make b/rules/xorg-font-ttf-lohit-gujarati.make
index 88e7195a7..cebb3c268 100644
--- a/rules/xorg-font-ttf-lohit-gujarati.make
+++ b/rules/xorg-font-ttf-lohit-gujarati.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_GUJARATI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_GUJARATI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-gujarati
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)$(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.compile:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-gujarati)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
$(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf, \
/etc/fonts/conf.d/66-lohit-gujarati.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-gujarati, 0, 0, -, $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-gujarati, \
+ ../../..$(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-gujarati)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 13/23] xorg-font-ttf-lohit-kannada: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (10 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
` (9 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-kannada.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-kannada.make b/rules/xorg-font-ttf-lohit-kannada.make
index dca2bf84b..d8f1e54f8 100644
--- a/rules/xorg-font-ttf-lohit-kannada.make
+++ b/rules/xorg-font-ttf-lohit-kannada.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_KANNADA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_KANNADA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_KANNADA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_KANNADA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-kannada
+XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)$(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.compile:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-kannada)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
$(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf, \
/etc/fonts/conf.d/66-lohit-kannada.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, $(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-kannada, \
+ ../../..$(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-kannada)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 14/23] xorg-font-ttf-lohit-malayalam: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (11 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
` (8 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-malayalam.make | 45 ++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-malayalam.make b/rules/xorg-font-ttf-lohit-malayalam.make
index 331cc0939..c3095bd52 100644
--- a/rules/xorg-font-ttf-lohit-malayalam.make
+++ b/rules/xorg-font-ttf-lohit-malayalam.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_MALAYALAM
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_MALAYALAM_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-malayalam
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)$(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.compile:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-malayalam)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
$(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf, \
/etc/fonts/conf.d/67-lohit-malayalam.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-malayalam, 0, 0, -, $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-malayalam, \
+ ../../..$(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-malayalam)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 15/23] xorg-font-ttf-lohit-oriya: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (12 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
` (7 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-oriya.make | 45 +++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-oriya.make b/rules/xorg-font-ttf-lohit-oriya.make
index 308cdd332..0acaf0074 100644
--- a/rules/xorg-font-ttf-lohit-oriya.make
+++ b/rules/xorg-font-ttf-lohit-oriya.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ORIYA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ORIYA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ORIYA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_ORIYA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-oriya
+XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.compile:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-oriya)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
$(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf, \
/etc/fonts/conf.d/66-lohit-oriya.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, $(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-oriya, \
+ ../../..$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-oriya)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 16/23] xorg-font-ttf-lohit-punjabi: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (13 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
` (6 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-punjabi.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make
index 0c18a7afa..e059052c3 100644
--- a/rules/xorg-font-ttf-lohit-punjabi.make
+++ b/rules/xorg-font-ttf-lohit-punjabi.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)$(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-punjabi)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
$(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \
/etc/fonts/conf.d/66-lohit-punjabi.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-punjabi, \
+ ../../..$(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-punjabi)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 17/23] xorg-font-ttf-lohit-tamil-classical: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (14 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
` (5 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
.../xorg-font-ttf-lohit-tamil-classical.make | 45 +++++++++++--------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make
index 548552346..3c12983f9 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.make
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil-classical
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil-classical)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf, \
/etc/fonts/conf.d/66-lohit-tamil-classical.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-tamil-classical, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-tamil-classical)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 18/23] xorg-font-ttf-lohit-tamil: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (15 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
` (4 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-tamil.make | 45 +++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil.make b/rules/xorg-font-ttf-lohit-tamil.make
index 504269886..9f37c1b52 100644
--- a/rules/xorg-font-ttf-lohit-tamil.make
+++ b/rules/xorg-font-ttf-lohit-tamil.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TAMIL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil
+XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)$(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
$(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf, \
/etc/fonts/conf.d/66-lohit-tamil.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-tamil, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-tamil)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 19/23] xorg-font-ttf-lohit-telugu: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (16 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 20/23] xorg-font-ttf-noto: " Florian Bäuerle
` (3 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-telugu.make | 45 ++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-telugu.make b/rules/xorg-font-ttf-lohit-telugu.make
index b4c8f6eb3..8ddabf958 100644
--- a/rules/xorg-font-ttf-lohit-telugu.make
+++ b/rules/xorg-font-ttf-lohit-telugu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TELUGU_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TELUGU_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TELUGU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TELUGU_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-telugu
+XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)$(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.compile:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-telugu)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
$(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf, \
/etc/fonts/conf.d/66-lohit-telugu.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-telugu, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-telugu, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-telugu)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 20/23] xorg-font-ttf-noto: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (17 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
` (2 subsequent siblings)
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 47 ++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 044d4196d..23e8df78a 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_NOTO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_NOTO).$(XORG_FONT_TTF_NOT
XORG_FONT_TTF_NOTO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_NOTO)
XORG_FONT_TTF_NOTO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_NOTO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-noto.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_NOTO_CONF_TOOL := NO
+XORG_FONT_TTF_NOTO_FONTDIR := $(XORG_FONTDIR)/truetype/noto
+XORG_FONT_TTF_NOTO_FONTPKGDIR := $(XORG_FONT_TTF_NOTO_PKGDIR)$(XORG_FONT_TTF_NOTO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,18 @@ $(STATEDIR)/xorg-font-ttf-noto.compile:
$(STATEDIR)/xorg-font-ttf-noto.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_NOTO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_NOTO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,14 +64,25 @@ $(STATEDIR)/xorg-font-ttf-noto.install:
$(STATEDIR)/xorg-font-ttf-noto.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-noto)
+ @$(call install_fixup, xorg-font-ttf-noto,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-noto,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-noto,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-noto,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-noto, 0, 0, -, $(XORG_FONT_TTF_NOTO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_NOTO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-noto, \
+ ../../..$(XORG_FONT_TTF_NOTO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-noto)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 21/23] xorg-font-ttf-vlgothic: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (18 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 20/23] xorg-font-ttf-noto: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 22/23] xorg-font-bh-ttf: " Florian Bäuerle
2018-08-01 18:32 ` [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 2 +-
rules/xorg-font-ttf-vlgothic.make | 47 +++++++++++++++++++++----------
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 23e8df78a..0ffea461b 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index c2ab41bd0..41ac1f713 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \
file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \
file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0
-ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO
+XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic
+XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR := $(XORG_FONT_TTF_VLGOTHIC_PKGDIR)$(XORG_FONT_TTF_VLGOTHIC_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +49,18 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile:
$(STATEDIR)/xorg-font-ttf-vlgothic.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_VLGOTHIC_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -64,14 +70,25 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install:
$(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-vlgothic)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, $(XORG_FONT_TTF_VLGOTHIC_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_VLGOTHIC_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-vlgothic, \
+ ../../..$(XORG_FONT_TTF_VLGOTHIC_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-vlgothic)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 22/23] xorg-font-bh-ttf: isolate from xorg-fonts
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (19 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
@ 2018-08-01 18:31 ` Florian Bäuerle
2018-08-01 18:32 ` [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
21 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:31 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-bh-ttf.make | 55 ++++++++++++++++++++-----------
rules/xorg-font-ttf-vlgothic.make | 2 +-
2 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 59a290094..ed10b5844 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Erwin Rol
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,23 +27,16 @@ XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUF
XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF)
XORG_FONT_BH_TTF_LICENSE := Luxi
-ifdef PTXCONF_XORG_FONT_BH_TTF
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
-endif
+XORG_FONT_BH_TTF_FONTDIR := $(XORG_FONTDIR)/truetype/bh
+XORG_FONT_BH_TTF_FONTPKGDIR := $(XORG_FONT_BH_TTF_PKGDIR)$(XORG_FONT_BH_TTF_FONTDIR)
# ----------------------------------------------------------------------------
-# Prepare
+# Compile
# ----------------------------------------------------------------------------
-XORG_FONT_BH_TTF_PATH := PATH=$(CROSS_PATH)
-XORG_FONT_BH_TTF_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_FONT_BH_TTF_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --with-fontdir=$(XORG_FONTDIR)/truetype
+$(STATEDIR)/xorg-font-bh-ttf.compile:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
@@ -50,6 +44,18 @@ XORG_FONT_BH_TTF_AUTOCONF := \
$(STATEDIR)/xorg-font-bh-ttf.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_BH_TTF_PKGDIR)
+ @mkdir -p $(XORG_FONT_BH_TTF_FONTPKGDIR)
+ @find $(XORG_FONT_BH_TTF_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_BH_TTF_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_BH_TTF_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_BH_TTF_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,14 +65,25 @@ $(STATEDIR)/xorg-font-bh-ttf.install:
$(STATEDIR)/xorg-font-bh-ttf.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-bh-ttf)
+ @$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
+ @$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
- @find $(XORG_FONT_BH_TTF_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-bh-ttf, 0, 0, -, $(XORG_FONT_BH_TTF_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_BH_TTF_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-bh-ttf, \
+ ../../..$(XORG_FONT_BH_TTF_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-bh-ttf)
@$(call touch)
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index 41ac1f713..e463d5c74 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
` (20 preceding siblings ...)
2018-08-01 18:31 ` [ptxdist] [PATCH 22/23] xorg-font-bh-ttf: " Florian Bäuerle
@ 2018-08-01 18:32 ` Florian Bäuerle
2018-08-02 5:25 ` Juergen Borleis
2018-08-02 8:52 ` [ptxdist] [PATCH 23/23] " Baeuerle, Florian
21 siblings, 2 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-01 18:32 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/graphics_and_multimedia.in | 6 +++---
rules/xorg-font-adobe-100dpi.in | 2 +-
rules/xorg-font-adobe-75dpi.in | 2 +-
rules/xorg-font-adobe-utopia-100dpi.in | 2 +-
rules/xorg-font-adobe-utopia-75dpi.in | 2 +-
rules/xorg-font-alias.in | 2 +-
rules/xorg-font-bh-100dpi.in | 2 +-
rules/xorg-font-bh-75dpi.in | 2 +-
rules/xorg-font-bh-lucidatypewriter-100dpi.in | 2 +-
rules/xorg-font-bh-lucidatypewriter-75dpi.in | 2 +-
rules/xorg-font-bh-ttf.in | 2 +-
rules/xorg-font-bitstream-100dpi.in | 2 +-
rules/xorg-font-bitstream-75dpi.in | 2 +-
rules/xorg-font-cursor-misc.in | 2 +-
rules/xorg-font-daewoo-misc.in | 2 +-
rules/xorg-font-dec-misc.in | 2 +-
rules/xorg-font-encodings.in | 2 +-
rules/xorg-font-isas-misc.in | 2 +-
rules/xorg-font-jis-misc.in | 2 +-
rules/xorg-font-micro-misc.in | 2 +-
rules/xorg-font-misc-misc.in | 2 +-
rules/xorg-font-mutt-misc.in | 2 +-
rules/xorg-font-schumacher-misc.in | 2 +-
rules/xorg-font-sony-misc.in | 2 +-
rules/xorg-font-sun-misc.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-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 +-
46 files changed, 48 insertions(+), 48 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-adobe-100dpi.in b/rules/xorg-font-adobe-100dpi.in
index e890885d6..66c0ec5c0 100644
--- a/rules/xorg-font-adobe-100dpi.in
+++ b/rules/xorg-font-adobe-100dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_100dpi
config XORG_FONT_ADOBE_100DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_100DPI
default y
diff --git a/rules/xorg-font-adobe-75dpi.in b/rules/xorg-font-adobe-75dpi.in
index afb9af1f4..46ec8cc16 100644
--- a/rules/xorg-font-adobe-75dpi.in
+++ b/rules/xorg-font-adobe-75dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_75dpi
config XORG_FONT_ADOBE_75DPI
- tristate
+ bool
default y
depends on XORG_FONT_75DPI
select XORG_FONTS
diff --git a/rules/xorg-font-adobe-utopia-100dpi.in b/rules/xorg-font-adobe-utopia-100dpi.in
index 8409fdf9f..ef6a7d3f3 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.in
+++ b/rules/xorg-font-adobe-utopia-100dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_100dpi
config XORG_FONT_ADOBE_UTOPIA_100DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_100DPI
prompt "Adobe Utopia 100dpi"
diff --git a/rules/xorg-font-adobe-utopia-75dpi.in b/rules/xorg-font-adobe-utopia-75dpi.in
index 3d787368c..0ae0aa3fe 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.in
+++ b/rules/xorg-font-adobe-utopia-75dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_75dpi
config XORG_FONT_ADOBE_UTOPIA_75DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_75DPI
prompt "Adobe Utopia 75dpi"
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-bh-100dpi.in b/rules/xorg-font-bh-100dpi.in
index cb2874000..3c41ee883 100644
--- a/rules/xorg-font-bh-100dpi.in
+++ b/rules/xorg-font-bh-100dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_100dpi
config XORG_FONT_BH_100DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_100DPI
prompt "BH 100dpi"
diff --git a/rules/xorg-font-bh-75dpi.in b/rules/xorg-font-bh-75dpi.in
index c20cd3954..fc4c6f874 100644
--- a/rules/xorg-font-bh-75dpi.in
+++ b/rules/xorg-font-bh-75dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_75dpi
config XORG_FONT_BH_75DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_75DPI
prompt "BH 75dpi"
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.in b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
index b0fc101c2..4e77ef2c6 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_100dpi
config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_100DPI
prompt "BH Lucida Typewriter 100dpi"
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.in b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
index b26fe80aa..b836c90e3 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.in
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_75dpi
config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_75DPI
prompt "BH Lucida Typewriter 75dpi"
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-100dpi.in b/rules/xorg-font-bitstream-100dpi.in
index 93f16d0bf..560af4caa 100644
--- a/rules/xorg-font-bitstream-100dpi.in
+++ b/rules/xorg-font-bitstream-100dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_100dpi
config XORG_FONT_BITSTREAM_100DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_100DPI
prompt "Bitstream 100dpi"
diff --git a/rules/xorg-font-bitstream-75dpi.in b/rules/xorg-font-bitstream-75dpi.in
index 5940cdfc0..82aa1a4a4 100644
--- a/rules/xorg-font-bitstream-75dpi.in
+++ b/rules/xorg-font-bitstream-75dpi.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_75dpi
config XORG_FONT_BITSTREAM_75DPI
- tristate
+ bool
select XORG_FONTS
depends on XORG_FONT_75DPI
prompt "Bitstream 75dpi"
diff --git a/rules/xorg-font-cursor-misc.in b/rules/xorg-font-cursor-misc.in
index 8d006330f..b32e1b7c9 100644
--- a/rules/xorg-font-cursor-misc.in
+++ b/rules/xorg-font-cursor-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_CURSOR_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Cursor misc"
help
diff --git a/rules/xorg-font-daewoo-misc.in b/rules/xorg-font-daewoo-misc.in
index 2d9c17aa4..8192bdaf9 100644
--- a/rules/xorg-font-daewoo-misc.in
+++ b/rules/xorg-font-daewoo-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_DAEWOO_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Daewoo misc"
help
diff --git a/rules/xorg-font-dec-misc.in b/rules/xorg-font-dec-misc.in
index 3ad499a09..c01324c51 100644
--- a/rules/xorg-font-dec-misc.in
+++ b/rules/xorg-font-dec-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_DEC_MISC
- tristate
+ bool
select XORG_FONTS
prompt "DEC misc"
help
diff --git a/rules/xorg-font-encodings.in b/rules/xorg-font-encodings.in
index 5bfd31279..c1ac17089 100644
--- a/rules/xorg-font-encodings.in
+++ b/rules/xorg-font-encodings.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_ENCODINGS
- tristate
+ bool
select XORG_FONTS
prompt "encodings"
help
diff --git a/rules/xorg-font-isas-misc.in b/rules/xorg-font-isas-misc.in
index 8ee7df025..578eb13bb 100644
--- a/rules/xorg-font-isas-misc.in
+++ b/rules/xorg-font-isas-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_ISAS_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Isas misc"
help
diff --git a/rules/xorg-font-jis-misc.in b/rules/xorg-font-jis-misc.in
index 59f72497c..13ac19369 100644
--- a/rules/xorg-font-jis-misc.in
+++ b/rules/xorg-font-jis-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_JIS_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Jis misc"
help
diff --git a/rules/xorg-font-micro-misc.in b/rules/xorg-font-micro-misc.in
index 14c935ace..c4a4b8000 100644
--- a/rules/xorg-font-micro-misc.in
+++ b/rules/xorg-font-micro-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_MICRO_MISC
- tristate
+ bool
select XORG_FONTS
prompt "micro misc"
help
diff --git a/rules/xorg-font-misc-misc.in b/rules/xorg-font-misc-misc.in
index bc3939793..456d71adb 100644
--- a/rules/xorg-font-misc-misc.in
+++ b/rules/xorg-font-misc-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_MISC_MISC
- tristate
+ bool
select XORG_FONTS
prompt "misc misc"
help
diff --git a/rules/xorg-font-mutt-misc.in b/rules/xorg-font-mutt-misc.in
index f837ccac4..04d65fdfa 100644
--- a/rules/xorg-font-mutt-misc.in
+++ b/rules/xorg-font-mutt-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_MUTT_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Mutt misc"
help
diff --git a/rules/xorg-font-schumacher-misc.in b/rules/xorg-font-schumacher-misc.in
index f51c09d4f..1ac767ad5 100644
--- a/rules/xorg-font-schumacher-misc.in
+++ b/rules/xorg-font-schumacher-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_SCHUMACHER_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Schumacher misc"
help
diff --git a/rules/xorg-font-sony-misc.in b/rules/xorg-font-sony-misc.in
index 0f0640b53..ebca638bb 100644
--- a/rules/xorg-font-sony-misc.in
+++ b/rules/xorg-font-sony-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_SONY_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Sony misc"
help
diff --git a/rules/xorg-font-sun-misc.in b/rules/xorg-font-sun-misc.in
index 7c3356878..1b535f848 100644
--- a/rules/xorg-font-sun-misc.in
+++ b/rules/xorg-font-sun-misc.in
@@ -1,7 +1,7 @@
## SECTION=multimedia_xorg_font_base
config XORG_FONT_SUN_MISC
- tristate
+ bool
select XORG_FONTS
prompt "Sun misc"
help
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-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"
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-01 18:32 ` [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
@ 2018-08-02 5:25 ` Juergen Borleis
2018-08-02 7:29 ` Baeuerle, Florian
2018-08-02 8:52 ` [ptxdist] [PATCH 23/23] " Baeuerle, Florian
1 sibling, 1 reply; 109+ messages in thread
From: Juergen Borleis @ 2018-08-02 5:25 UTC (permalink / raw)
To: ptxdist; +Cc: Florian Bäuerle
Hi Florian,
On Wednesday 01 August 2018 20:32:00 Florian Bäuerle wrote:
> [...]
>
> 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
These changes conform to the subject.
> config XORG_FONTS_QT4_LINKS
> depends on QT4_PLATFORM_EMBEDDED
> diff --git a/rules/xorg-font-adobe-100dpi.in
> b/rules/xorg-font-adobe-100dpi.in index e890885d6..66c0ec5c0 100644
> --- a/rules/xorg-font-adobe-100dpi.in
> +++ b/rules/xorg-font-adobe-100dpi.in
> @@ -1,7 +1,7 @@
> ## SECTION=multimedia_xorg_font_100dpi
>
> config XORG_FONT_ADOBE_100DPI
> - tristate
> + bool
This change doesn't conform to the subject.
BTW: Can you drop a few more words in the commit logs why you do this
change? What is the intention?
Cheers,
Jürgen
--
Pengutronix e.K. | Juergen Borleis |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-02 5:25 ` Juergen Borleis
@ 2018-08-02 7:29 ` Baeuerle, Florian
2018-08-03 7:13 ` Uwe Kleine-König
0 siblings, 1 reply; 109+ messages in thread
From: Baeuerle, Florian @ 2018-08-02 7:29 UTC (permalink / raw)
To: ptxdist, jbe
Hi Juergen,
Am Donnerstag, den 02.08.2018, 07:25 +0200 schrieb Juergen Borleis:
> Hi Florian,
>
> On Wednesday 01 August 2018 20:32:00 Florian Bäuerle wrote:
> > [...]
> >
> > 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
>
> These changes conform to the subject.
>
> > config XORG_FONTS_QT4_LINKS
> > depends on QT4_PLATFORM_EMBEDDED
> > diff --git a/rules/xorg-font-adobe-100dpi.in
> > b/rules/xorg-font-adobe-100dpi.in index e890885d6..66c0ec5c0 100644
> > --- a/rules/xorg-font-adobe-100dpi.in
> > +++ b/rules/xorg-font-adobe-100dpi.in
> > @@ -1,7 +1,7 @@
> > ## SECTION=multimedia_xorg_font_100dpi
> >
> > config XORG_FONT_ADOBE_100DPI
> > - tristate
> > + bool
>
> This change doesn't conform to the subject.
Oh sorry, I must confess that i edited the in-files with sed. I will carefully
review the changes again. Thanks!
>
> BTW: Can you drop a few more words in the commit logs why you do this
> change? What is the intention?
>
Once more sorry about that, I'm relatively new to git send-email and the workflow
with mailing lists. I learned about --compose just after I sent those patches.
So basically the intention is to get the ability to (de)select ttf fonts via collection.
Michael pointed out some problems with my first attempt to doing so [1].
Most font-packages copy their fonts during targetinstall into xorg-fonts PKGDIR.
xorg-fonts then does some post-processing (mkfontdir and mkfontscale).
With these patches, all available ttf fonts are packaged individually instead.
> Cheers,
> Jürgen
>
Best Regards,
Florian
1: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13129.html
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-01 18:32 ` [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-08-02 5:25 ` Juergen Borleis
@ 2018-08-02 8:52 ` Baeuerle, Florian
2018-08-02 12:10 ` Baeuerle, Florian
1 sibling, 1 reply; 109+ messages in thread
From: Baeuerle, Florian @ 2018-08-02 8:52 UTC (permalink / raw)
To: ptxdist
Am Mittwoch, den 01.08.2018, 20:32 +0200 schrieb Florian Bäuerle:
> [...]
>
> 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
not so sure, this selects XORG_FONT_ALIAS and FONTCONFIG_UTILS which may not
be required if a collection does not select any fonts...
> 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
same here
> select XORG_FONT_UTIL
XORG_FONT_UTIL btw. seems broken to me. No package is being produced and no trace
of the package can be found on the target rootfs.
> 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
> [...]
> +++ 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
unnecessary
> prompt "xorg true/open type fonts "
>
> source "generated/multimedia_xorg_font_ttf.in"
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-02 8:52 ` [ptxdist] [PATCH 23/23] " Baeuerle, Florian
@ 2018-08-02 12:10 ` Baeuerle, Florian
0 siblings, 0 replies; 109+ messages in thread
From: Baeuerle, Florian @ 2018-08-02 12:10 UTC (permalink / raw)
To: ptxdist
Am Donnerstag, den 02.08.2018, 08:52 +0000 schrieb Baeuerle, Florian:
> Am Mittwoch, den 01.08.2018, 20:32 +0200 schrieb Florian Bäuerle:
> > [...]
> >
> > 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
>
> not so sure, this selects XORG_FONT_ALIAS and FONTCONFIG_UTILS which may not
> be required if a collection does not select any fonts...
I mean if it were bool, the above would apply.
>
> > 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
>
> same here
>
> > select XORG_FONT_UTIL
>
> XORG_FONT_UTIL btw. seems broken to me. No package is being produced and no trace
> of the package can be found on the target rootfs.
>
> > 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
> > [...]
> > +++ 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
>
> unnecessary
>
> > prompt "xorg true/open type fonts "
> >
> > source "generated/multimedia_xorg_font_ttf.in"
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-02 7:29 ` Baeuerle, Florian
@ 2018-08-03 7:13 ` Uwe Kleine-König
2018-08-07 12:39 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
2018-08-07 12:40 ` Florian Bäuerle
0 siblings, 2 replies; 109+ messages in thread
From: Uwe Kleine-König @ 2018-08-03 7:13 UTC (permalink / raw)
To: ptxdist
On Thu, Aug 02, 2018 at 07:29:56AM +0000, Baeuerle, Florian wrote:
> > BTW: Can you drop a few more words in the commit logs why you do this
> > change? What is the intention?
> >
>
> Once more sorry about that, I'm relatively new to git send-email and the workflow
> with mailing lists. I learned about --compose just after I sent those patches.
Jürgen asked about the text you provide at commit time. You can add it
using --annotate, but the easier path is to use git rebase or git commit
--amend to add the text to your working copy.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-08-03 7:13 ` Uwe Kleine-König
@ 2018-08-07 12:39 ` Florian Bäuerle
2018-08-07 12:45 ` Baeuerle, Florian
2018-08-07 12:40 ` Florian Bäuerle
1 sibling, 1 reply; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:39 UTC (permalink / raw)
To: ptxdist
As all ttfs font packages, xorg-font-ttf-android used to install fonts
into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
to xorg-fonts.targetinstall. This was a nice trick to spare the
generation of fonts.{dir,scale} in every font package, but it breaks the
collection feature for ttf-fonts.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
index 443f855aa..adad187c5 100644
--- a/rules/xorg-font-ttf-android.make
+++ b/rules/xorg-font-ttf-android.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
-ifdef PTXCONF_XORG_FONT_TTF_ANDROID
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
+XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
$(STATEDIR)/xorg-font-ttf-android.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_ANDROID_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
$(STATEDIR)/xorg-font-ttf-android.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-android)
+ @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_ANDROID_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-android, \
+ ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-android)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-08-03 7:13 ` Uwe Kleine-König
2018-08-07 12:39 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
` (22 more replies)
1 sibling, 23 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
As all ttfs font packages, xorg-font-ttf-android used to install fonts
into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
to xorg-fonts.targetinstall. This was a nice trick to spare the
generation of fonts.{dir,scale} in every font package, but it breaks the
collection feature for ttf-fonts.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
index 443f855aa..adad187c5 100644
--- a/rules/xorg-font-ttf-android.make
+++ b/rules/xorg-font-ttf-android.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
-ifdef PTXCONF_XORG_FONT_TTF_ANDROID
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
+XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
$(STATEDIR)/xorg-font-ttf-android.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_ANDROID_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
$(STATEDIR)/xorg-font-ttf-android.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-android)
+ @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_ANDROID_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-android, \
+ ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-android)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 02/23] xorg-font-ttf-bitstream-vera: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
` (21 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-bitstream-vera.make | 49 ++++++++++++++++---------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make
index eeb2f943e..5d89be1d7 100644
--- a/rules/xorg-font-ttf-bitstream-vera.make
+++ b/rules/xorg-font-ttf-bitstream-vera.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,17 +29,8 @@ XORG_FONT_TTF_BITSTREAM_VERA_LICENSE := Bitstream-Vera
XORG_FONT_TTF_BITSTREAM_VERA_LICENSE_FILES := \
file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
-ifdef PTXCONF_XORG_FONT_TTF_BITSTREAM_VERA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-bitstream-vera.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR := $(XORG_FONTDIR)/truetype/bitstream-vera
+XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR := $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR)$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -54,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.compile:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-bitstream-vera)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-bitstream-vera, 0, 0, -, $(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-bitstream-vera, \
+ ../../..$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-bitstream-vera)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 03/23] xorg-font-ttf-caladea: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
` (20 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-caladea.make | 45 +++++++++++++++++++-------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-caladea.make b/rules/xorg-font-ttf-caladea.make
index e0c83a600..48572f3a5 100644
--- a/rules/xorg-font-ttf-caladea.make
+++ b/rules/xorg-font-ttf-caladea.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CALADEA_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CALADEA).$(XORG_FONT_T
XORG_FONT_TTF_CALADEA_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CALADEA)
XORG_FONT_TTF_CALADEA_LICENSE := Apache-2.0
-ifdef PTXCONF_XORG_FONT_TTF_CALADEA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_CALADEA_CONF_TOOL := NO
+XORG_FONT_TTF_CALADEA_FONTDIR := $(XORG_FONTDIR)/truetype/caladea
+XORG_FONT_TTF_CALADEA_FONTPKGDIR := $(XORG_FONT_TTF_CALADEA_PKGDIR)$(XORG_FONT_TTF_CALADEA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,18 @@ $(STATEDIR)/xorg-font-ttf-caladea.compile:
$(STATEDIR)/xorg-font-ttf-caladea.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_CALADEA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_CALADEA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_CALADEA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_CALADEA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,15 +64,6 @@ $(STATEDIR)/xorg-font-ttf-caladea.install:
$(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CALADEA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-caladea)
@$(call install_fixup, xorg-font-ttf-caladea,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-caladea,SECTION,base)
@@ -78,6 +75,18 @@ $(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call install_alternative, xorg-font-ttf-caladea, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-caladea-fontconfig.conf)
+ @$(call install_tree, xorg-font-ttf-caladea, 0, 0, -, $(XORG_FONT_TTF_CALADEA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_CALADEA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-caladea, \
+ ../../..$(XORG_FONT_TTF_CALADEA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-caladea)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 04/23] xorg-font-ttf-carlito: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
` (19 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-carlito.make | 45 +++++++++++++++++++-------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make
index e5e4468dd..ff1894cea 100644
--- a/rules/xorg-font-ttf-carlito.make
+++ b/rules/xorg-font-ttf-carlito.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T
XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO)
XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_CARLITO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
+XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito
+XORG_FONT_TTF_CARLITO_FONTPKGDIR := $(XORG_FONT_TTF_CARLITO_PKGDIR)$(XORG_FONT_TTF_CARLITO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -41,6 +35,18 @@ XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
$(STATEDIR)/xorg-font-ttf-carlito.compile:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_CARLITO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_CARLITO_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_CARLITO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_CARLITO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,15 +64,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CARLITO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-carlito)
@$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-carlito,SECTION,base)
@@ -78,6 +75,18 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf)
+ @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, $(XORG_FONT_TTF_CARLITO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_CARLITO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-carlito, \
+ ../../..$(XORG_FONT_TTF_CARLITO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-carlito)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 05/23] remove xorg-font-ttf-comic-jens
2018-08-07 12:40 ` Florian Bäuerle
` (2 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
` (18 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
There is a successor to comic jens (ff uberhand) and the source do not
seem to be available any longer. Simply drop it.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-comic-jens.in | 9 ----
rules/xorg-font-ttf-comic-jens.make | 74 -----------------------------
2 files changed, 83 deletions(-)
delete mode 100644 rules/xorg-font-ttf-comic-jens.in
delete mode 100644 rules/xorg-font-ttf-comic-jens.make
diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
deleted file mode 100644
index ec6891f6f..000000000
--- a/rules/xorg-font-ttf-comic-jens.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_font_ttf
-
-config XORG_FONT_TTF_COMIC_JENS
- bool
- select XORG_FONTS
- depends on XORG_FONT_TTF
- prompt "Comic Jens"
- help
- A free alternative to Comic Sans.
diff --git a/rules/xorg-font-ttf-comic-jens.make b/rules/xorg-font-ttf-comic-jens.make
deleted file mode 100644
index 276fc8bcc..000000000
--- a/rules/xorg-font-ttf-comic-jens.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_FONT_TTF_COMIC_JENS) += xorg-font-ttf-comic-jens
-
-#
-# Paths and names
-#
-XORG_FONT_TTF_COMIC_JENS_VERSION := 2.0
-XORG_FONT_TTF_COMIC_JENS_MD5 := 21ab5b4a9360b58959ad30e757aa2ada
-XORG_FONT_TTF_COMIC_JENS := comic-jens
-XORG_FONT_TTF_COMIC_JENS_SUFFIX := zip
-XORG_FONT_TTF_COMIC_JENS_URL := http://www.kutilek.de/download/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_COMIC_JENS)
-XORG_FONT_TTF_COMIC_JENS_LICENSE := CC-BY-ND-3.0
-XORG_FONT_TTF_COMIC_JENS_LICENSE_FILES := \
- file://Licence.txt;md5=dccc90a479b3a0b508cac38314a04334
-
-ifdef PTXCONF_XORG_FONT_TTF_COMIC_JENS
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_COMIC_JENS_CONF_TOOL := NO
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall:
- @$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_COMIC_JENS_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
- @$(call touch)
-
-# vim: syntax=make
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (3 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
` (17 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-dejavu.make | 35 +++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make
index bfe95bbd4..52aeab362 100644
--- a/rules/xorg-font-ttf-dejavu.make
+++ b/rules/xorg-font-ttf-dejavu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,9 +26,8 @@ XORG_FONT_TTF_DEJAVU_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF
XORG_FONT_TTF_DEJAVU_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU)
XORG_FONT_TTF_DEJAVU_LICENSE := Bitstream-Vera AND public_domain
-ifdef PTXCONF_XORG_FONT_TTF_DEJAVU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall
-endif
+XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu
+XORG_FONT_TTF_DEJAVU_FONTPKGDIR := $(XORG_FONT_TTF_DEJAVU_PKGDIR)$(XORG_FONT_TTF_DEJAVU_FONTDIR)
# ----------------------------------------------------------------------------
# Prepare
@@ -61,6 +61,16 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install:
ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \
done
+ @mkdir -p $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_DEJAVU_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -72,13 +82,6 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
- @find $(XORG_FONT_TTF_DEJAVU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-dejavu)
@$(call install_fixup, xorg-font-ttf-dejavu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-dejavu,SECTION,base)
@@ -88,6 +91,18 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.d)
@$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.avail)
+ @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, $(XORG_FONT_TTF_DEJAVU_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_DEJAVU_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-dejavu, \
+ ../../..$(XORG_FONT_TTF_DEJAVU_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-dejavu)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 07/23] xorg-font-ttf-hanazono: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (4 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
` (16 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-hanazono.make | 47 +++++++++++++++++++++----------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/rules/xorg-font-ttf-hanazono.make b/rules/xorg-font-ttf-hanazono.make
index 3a5a62bb2..87f3a16c9 100644
--- a/rules/xorg-font-ttf-hanazono.make
+++ b/rules/xorg-font-ttf-hanazono.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,15 +27,8 @@ XORG_FONT_TTF_HANAZONO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_HANAZONO)
XORG_FONT_TTF_HANAZONO_STRIP_LEVEL := 0
XORG_FONT_TTF_HANAZONO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_HANAZONO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_HANAZONO_CONF_TOOL := NO
+XORG_FONT_TTF_HANAZONO_FONTDIR := $(XORG_FONTDIR)/truetype/hanazono
+XORG_FONT_TTF_HANAZONO_FONTPKGDIR := $(XORG_FONT_TTF_HANAZONO_PKGDIR)$(XORG_FONT_TTF_HANAZONO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -50,6 +44,18 @@ $(STATEDIR)/xorg-font-ttf-hanazono.compile:
$(STATEDIR)/xorg-font-ttf-hanazono.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_HANAZONO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_HANAZONO_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_HANAZONO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,14 +65,25 @@ $(STATEDIR)/xorg-font-ttf-hanazono.install:
$(STATEDIR)/xorg-font-ttf-hanazono.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-hanazono)
+ @$(call install_fixup, xorg-font-ttf-hanazono,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-hanazono,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-hanazono,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-hanazono,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_HANAZONO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-hanazono, 0, 0, -, $(XORG_FONT_TTF_HANAZONO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_HANAZONO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-hanazono, \
+ ../../..$(XORG_FONT_TTF_HANAZONO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-hanazono)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 08/23] xorg-font-ttf-liberation: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (5 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
` (15 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-liberation.make | 49 +++++++++++++++++++----------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-liberation.make b/rules/xorg-font-ttf-liberation.make
index 1e60a18bc..69d438f48 100644
--- a/rules/xorg-font-ttf-liberation.make
+++ b/rules/xorg-font-ttf-liberation.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,17 +28,8 @@ XORG_FONT_TTF_LIBERATION_LICENSE := OFL-1.1
XORG_FONT_TTF_LIBERATION_LICENSE_FILES := \
file://LICENSE;md5=f96db970a9a46c5369142b99f530366b
-ifdef PTXCONF_XORG_FONT_TTF_LIBERATION
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-liberation.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_LIBERATION_FONTDIR := $(XORG_FONTDIR)/truetype/liberation
+XORG_FONT_TTF_LIBERATION_FONTPKGDIR := $(XORG_FONT_TTF_LIBERATION_PKGDIR)$(XORG_FONT_TTF_LIBERATION_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -53,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-liberation.compile:
$(STATEDIR)/xorg-font-ttf-liberation.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LIBERATION_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LIBERATION_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -62,14 +66,25 @@ $(STATEDIR)/xorg-font-ttf-liberation.install:
$(STATEDIR)/xorg-font-ttf-liberation.targetinstall:
@$(call targetinfo)
- mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-liberation)
+ @$(call install_fixup, xorg-font-ttf-liberation,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-liberation,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-liberation,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-liberation,DESCRIPTION,missing)
- find $(XORG_FONT_TTF_LIBERATION_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-liberation, 0, 0, -, $(XORG_FONT_TTF_LIBERATION_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LIBERATION_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-liberation, \
+ ../../..$(XORG_FONT_TTF_LIBERATION_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-liberation)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 09/23] xorg-font-ttf-lohit-assamese: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (6 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
` (14 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-assamese.make | 45 +++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-assamese.make b/rules/xorg-font-ttf-lohit-assamese.make
index 4529d7131..2a10391fb 100644
--- a/rules/xorg-font-ttf-lohit-assamese.make
+++ b/rules/xorg-font-ttf-lohit-assamese.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ASSAMESE
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_ASSAMESE_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-assamese
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)$(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.compile:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-assamese)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
$(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf, \
/etc/fonts/conf.d/66-lohit-assamese.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, $(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-assamese, \
+ ../../..$(XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-assamese)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 10/23] xorg-font-ttf-lohit-bengali: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (7 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
` (13 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-bengali.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-bengali.make b/rules/xorg-font-ttf-lohit-bengali.make
index c580be96e..f0f7fc1ea 100644
--- a/rules/xorg-font-ttf-lohit-bengali.make
+++ b/rules/xorg-font-ttf-lohit-bengali.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_BENGALI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_BENGALI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_BENGALI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_BENGALI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-bengali
+XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)$(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.compile:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_BENGALI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-bengali)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
$(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf, \
/etc/fonts/conf.d/66-lohit-bengali.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-bengali, 0, 0, -, $(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-bengali, \
+ ../../..$(XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-bengali)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 11/23] xorg-font-ttf-lohit-devanagari: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (8 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
` (12 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-devanagari.make | 45 ++++++++++++++---------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-devanagari.make b/rules/xorg-font-ttf-lohit-devanagari.make
index 7b8643631..6f397aa8c 100644
--- a/rules/xorg-font-ttf-lohit-devanagari.make
+++ b/rules/xorg-font-ttf-lohit-devanagari.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_DEVANAGARI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_DEVANAGARI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-devanagari
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)$(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.compile:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-devanagari)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
$(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf, \
/etc/fonts/conf.d/66-lohit-devanagari.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-devanagari, 0, 0, -, $(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-devanagari, \
+ ../../..$(XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-devanagari)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 12/23] xorg-font-ttf-lohit-gujarati: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (9 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
` (11 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-gujarati.make | 45 +++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-gujarati.make b/rules/xorg-font-ttf-lohit-gujarati.make
index 88e7195a7..cebb3c268 100644
--- a/rules/xorg-font-ttf-lohit-gujarati.make
+++ b/rules/xorg-font-ttf-lohit-gujarati.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_GUJARATI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_GUJARATI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-gujarati
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)$(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.compile:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-gujarati)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
$(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf, \
/etc/fonts/conf.d/66-lohit-gujarati.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-gujarati, 0, 0, -, $(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-gujarati, \
+ ../../..$(XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-gujarati)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 13/23] xorg-font-ttf-lohit-kannada: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (10 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
@ 2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
` (10 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-kannada.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-kannada.make b/rules/xorg-font-ttf-lohit-kannada.make
index dca2bf84b..d8f1e54f8 100644
--- a/rules/xorg-font-ttf-lohit-kannada.make
+++ b/rules/xorg-font-ttf-lohit-kannada.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_KANNADA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_KANNADA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_KANNADA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_KANNADA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-kannada
+XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)$(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.compile:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_KANNADA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-kannada)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
$(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf, \
/etc/fonts/conf.d/66-lohit-kannada.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, $(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-kannada, \
+ ../../..$(XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-kannada)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 14/23] xorg-font-ttf-lohit-malayalam: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (11 preceding siblings ...)
2018-08-07 12:40 ` [ptxdist] [PATCH v2 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
` (9 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-malayalam.make | 45 ++++++++++++++----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-malayalam.make b/rules/xorg-font-ttf-lohit-malayalam.make
index 331cc0939..c3095bd52 100644
--- a/rules/xorg-font-ttf-lohit-malayalam.make
+++ b/rules/xorg-font-ttf-lohit-malayalam.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_MALAYALAM
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_MALAYALAM_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-malayalam
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)$(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.compile:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-malayalam)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
$(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf, \
/etc/fonts/conf.d/67-lohit-malayalam.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-malayalam, 0, 0, -, $(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-malayalam, \
+ ../../..$(XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-malayalam)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 15/23] xorg-font-ttf-lohit-oriya: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (12 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
` (8 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-oriya.make | 45 +++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-oriya.make b/rules/xorg-font-ttf-lohit-oriya.make
index 308cdd332..0acaf0074 100644
--- a/rules/xorg-font-ttf-lohit-oriya.make
+++ b/rules/xorg-font-ttf-lohit-oriya.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ORIYA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ORIYA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ORIYA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_ORIYA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-oriya
+XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.compile:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-oriya)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
$(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf, \
/etc/fonts/conf.d/66-lohit-oriya.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, $(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-oriya, \
+ ../../..$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-oriya)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 16/23] xorg-font-ttf-lohit-punjabi: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (13 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
` (7 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-punjabi.make | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make
index 0c18a7afa..e059052c3 100644
--- a/rules/xorg-font-ttf-lohit-punjabi.make
+++ b/rules/xorg-font-ttf-lohit-punjabi.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)$(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-punjabi)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
$(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \
/etc/fonts/conf.d/66-lohit-punjabi.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, $(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-punjabi, \
+ ../../..$(XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-punjabi)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 17/23] xorg-font-ttf-lohit-tamil-classical: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (14 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
` (6 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
.../xorg-font-ttf-lohit-tamil-classical.make | 45 +++++++++++--------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make
index 548552346..3c12983f9 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.make
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil-classical
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil-classical)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf, \
/etc/fonts/conf.d/66-lohit-tamil-classical.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-tamil-classical, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-tamil-classical)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 18/23] xorg-font-ttf-lohit-tamil: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (15 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
` (5 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-tamil.make | 45 +++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil.make b/rules/xorg-font-ttf-lohit-tamil.make
index 504269886..9f37c1b52 100644
--- a/rules/xorg-font-ttf-lohit-tamil.make
+++ b/rules/xorg-font-ttf-lohit-tamil.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TAMIL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil
+XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)$(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TAMIL_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
$(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf, \
/etc/fonts/conf.d/66-lohit-tamil.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-tamil, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-tamil)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 19/23] xorg-font-ttf-lohit-telugu: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (16 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 20/23] xorg-font-ttf-noto: " Florian Bäuerle
` (4 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-telugu.make | 45 ++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-telugu.make b/rules/xorg-font-ttf-lohit-telugu.make
index b4c8f6eb3..8ddabf958 100644
--- a/rules/xorg-font-ttf-lohit-telugu.make
+++ b/rules/xorg-font-ttf-lohit-telugu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TELUGU_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TELUGU_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TELUGU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TELUGU_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-telugu
+XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)$(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.compile:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_LOHIT_TELUGU_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-telugu)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
$(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf, \
/etc/fonts/conf.d/66-lohit-telugu.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-telugu, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-lohit-telugu, \
+ ../../..$(XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
+ done
+endif
+
@$(call install_finish, xorg-font-ttf-lohit-telugu)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 20/23] xorg-font-ttf-noto: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (17 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
` (3 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 47 ++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 044d4196d..23e8df78a 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_NOTO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_NOTO).$(XORG_FONT_TTF_NOT
XORG_FONT_TTF_NOTO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_NOTO)
XORG_FONT_TTF_NOTO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_NOTO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-noto.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_NOTO_CONF_TOOL := NO
+XORG_FONT_TTF_NOTO_FONTDIR := $(XORG_FONTDIR)/truetype/noto
+XORG_FONT_TTF_NOTO_FONTPKGDIR := $(XORG_FONT_TTF_NOTO_PKGDIR)$(XORG_FONT_TTF_NOTO_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,18 @@ $(STATEDIR)/xorg-font-ttf-noto.compile:
$(STATEDIR)/xorg-font-ttf-noto.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_NOTO_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_NOTO_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_NOTO_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,14 +64,25 @@ $(STATEDIR)/xorg-font-ttf-noto.install:
$(STATEDIR)/xorg-font-ttf-noto.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-noto)
+ @$(call install_fixup, xorg-font-ttf-noto,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-noto,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-noto,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-noto,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-noto, 0, 0, -, $(XORG_FONT_TTF_NOTO_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_NOTO_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-noto, \
+ ../../..$(XORG_FONT_TTF_NOTO_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-noto)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 21/23] xorg-font-ttf-vlgothic: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (18 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 20/23] xorg-font-ttf-noto: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 22/23] xorg-font-bh-ttf: " Florian Bäuerle
` (2 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 2 +-
rules/xorg-font-ttf-vlgothic.make | 47 +++++++++++++++++++++----------
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 23e8df78a..0ffea461b 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index c2ab41bd0..41ac1f713 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \
file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \
file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0
-ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO
+XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic
+XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR := $(XORG_FONT_TTF_VLGOTHIC_PKGDIR)$(XORG_FONT_TTF_VLGOTHIC_FONTDIR)
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +49,18 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile:
$(STATEDIR)/xorg-font-ttf-vlgothic.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_TTF_VLGOTHIC_PKGDIR)
+ @mkdir -p $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+ @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -64,14 +70,25 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install:
$(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-ttf-vlgothic)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing)
- @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, $(XORG_FONT_TTF_VLGOTHIC_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_TTF_VLGOTHIC_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-ttf-vlgothic, \
+ ../../..$(XORG_FONT_TTF_VLGOTHIC_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-ttf-vlgothic)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 22/23] xorg-font-bh-ttf: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (19 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-09-04 9:34 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Michael Olbrich
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-bh-ttf.make | 55 ++++++++++++++++++++-----------
rules/xorg-font-ttf-vlgothic.make | 2 +-
2 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 59a290094..ed10b5844 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Erwin Rol
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,23 +27,16 @@ XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUF
XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF)
XORG_FONT_BH_TTF_LICENSE := Luxi
-ifdef PTXCONF_XORG_FONT_BH_TTF
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
-endif
+XORG_FONT_BH_TTF_FONTDIR := $(XORG_FONTDIR)/truetype/bh
+XORG_FONT_BH_TTF_FONTPKGDIR := $(XORG_FONT_BH_TTF_PKGDIR)$(XORG_FONT_BH_TTF_FONTDIR)
# ----------------------------------------------------------------------------
-# Prepare
+# Compile
# ----------------------------------------------------------------------------
-XORG_FONT_BH_TTF_PATH := PATH=$(CROSS_PATH)
-XORG_FONT_BH_TTF_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_FONT_BH_TTF_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --with-fontdir=$(XORG_FONTDIR)/truetype
+$(STATEDIR)/xorg-font-bh-ttf.compile:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
@@ -50,6 +44,18 @@ XORG_FONT_BH_TTF_AUTOCONF := \
$(STATEDIR)/xorg-font-bh-ttf.install:
@$(call targetinfo)
+
+ @rm -rf $(XORG_FONT_BH_TTF_PKGDIR)
+ @mkdir -p $(XORG_FONT_BH_TTF_FONTPKGDIR)
+ @find $(XORG_FONT_BH_TTF_DIR) \
+ -name "*.ttf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONT_BH_TTF_FONTPKGDIR); \
+ done
+ @mkfontscale $(XORG_FONT_BH_TTF_FONTPKGDIR)
+ @mkfontdir $(XORG_FONT_BH_TTF_FONTPKGDIR)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,14 +65,25 @@ $(STATEDIR)/xorg-font-bh-ttf.install:
$(STATEDIR)/xorg-font-bh-ttf.targetinstall:
@$(call targetinfo)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
+ @$(call install_init, xorg-font-bh-ttf)
+ @$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
+ @$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
- @find $(XORG_FONT_BH_TTF_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
+ @$(call install_tree, xorg-font-bh-ttf, 0, 0, -, $(XORG_FONT_BH_TTF_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+ @cd $(XORG_FONT_BH_TTF_PKGDIR) && \
+ find . -type f -name "*.ttf" | while read file; do \
+ name=$$(basename $$file); \
+ $(call install_link, xorg-font-bh-ttf, \
+ ../../..$(XORG_FONT_BH_TTF_FONTDIR)/$$name, \
+ /usr/lib/fonts/$$name); \
done
+endif
+
+ @$(call install_finish, xorg-font-bh-ttf)
@$(call touch)
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index 41ac1f713..e463d5c74 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v2 23/23] xorg-fonts: make all xorg-font-ttf packages tristate
2018-08-07 12:40 ` Florian Bäuerle
` (20 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 22/23] xorg-font-bh-ttf: " Florian Bäuerle
@ 2018-08-07 12:41 ` Florian Bäuerle
2018-09-04 9:34 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Michael Olbrich
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-08-07 12:41 UTC (permalink / raw)
To: ptxdist
Make all ttf-font-packages tristate, so they can be (de)selected via
collection.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/graphics_and_multimedia.in | 2 +-
rules/xorg-font-bh-ttf.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-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 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index 54e53ad7a..25fb44a79 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -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-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-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-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"
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-08-07 12:39 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
@ 2018-08-07 12:45 ` Baeuerle, Florian
0 siblings, 0 replies; 109+ messages in thread
From: Baeuerle, Florian @ 2018-08-07 12:45 UTC (permalink / raw)
To: ptxdist
sorry for the noise, git send-email had slight problems with my smtp server…
Am Dienstag, den 07.08.2018, 14:39 +0200 schrieb Florian Bäuerle:
> As all ttfs font packages, xorg-font-ttf-android used to install fonts
> into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
> to xorg-fonts.targetinstall. This was a nice trick to spare the
> generation of fonts.{dir,scale} in every font package, but it breaks the
> collection feature for ttf-fonts.
>
> Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
> ---
> rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
> 1 file changed, 32 insertions(+), 18 deletions(-)
>
> diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
> index 443f855aa..adad187c5 100644
> --- a/rules/xorg-font-ttf-android.make
> +++ b/rules/xorg-font-ttf-android.make
> @@ -1,6 +1,7 @@
> # -*-makefile-*-
> #
> # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
> +# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
> #
> # See CREDITS for details about who has contributed to this project.
> #
> @@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
> XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
> file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
>
> -ifdef PTXCONF_XORG_FONT_TTF_ANDROID
> -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
> -endif
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
> +XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
> +XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
>
> # ----------------------------------------------------------------------------
> # Compile
> @@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
>
> $(STATEDIR)/xorg-font-ttf-android.install:
> @$(call targetinfo)
> +
> + @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
> + @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @find $(XORG_FONT_TTF_ANDROID_DIR) \
> + -name "*.ttf" \
> + | \
> + while read file; do \
> + install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
> + done
> + @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> +
> @$(call touch)
>
> # ----------------------------------------------------------------------------
> @@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
> $(STATEDIR)/xorg-font-ttf-android.targetinstall:
> @$(call targetinfo)
>
> - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
> + @$(call install_init, xorg-font-ttf-android)
> + @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
> + @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
> + @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
> + @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
>
> - @find $(XORG_FONT_TTF_ANDROID_DIR) \
> - -name "*.ttf" \
> - | \
> - while read file; do \
> - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
> + @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
> +
> +ifdef PTXCONF_XORG_FONTS_QT4_LINKS
> + @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
> + find . -type f -name "*.ttf" | while read file; do \
> + name=$$(basename $$file); \
> + $(call install_link, xorg-font-ttf-android, \
> + ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
> + /usr/lib/fonts/$$name); \
> done
> +endif
> +
> + @$(call install_finish, xorg-font-ttf-android)
>
> @$(call touch)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-08-07 12:40 ` Florian Bäuerle
` (21 preceding siblings ...)
2018-08-07 12:41 ` [ptxdist] [PATCH v2 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
@ 2018-09-04 9:34 ` Michael Olbrich
2018-09-04 10:47 ` Baeuerle, Florian
22 siblings, 1 reply; 109+ messages in thread
From: Michael Olbrich @ 2018-09-04 9:34 UTC (permalink / raw)
To: ptxdist
On Tue, Aug 07, 2018 at 02:40:47PM +0200, Florian Bäuerle wrote:
> As all ttfs font packages, xorg-font-ttf-android used to install fonts
> into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
> to xorg-fonts.targetinstall. This was a nice trick to spare the
> generation of fonts.{dir,scale} in every font package, but it breaks the
> collection feature for ttf-fonts.
>
> Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
> ---
> rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
> 1 file changed, 32 insertions(+), 18 deletions(-)
>
> diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
> index 443f855aa..adad187c5 100644
> --- a/rules/xorg-font-ttf-android.make
> +++ b/rules/xorg-font-ttf-android.make
> @@ -1,6 +1,7 @@
> # -*-makefile-*-
> #
> # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
> +# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
> #
> # See CREDITS for details about who has contributed to this project.
> #
> @@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
> XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
> file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
>
> -ifdef PTXCONF_XORG_FONT_TTF_ANDROID
> -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
> -endif
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
Don't remove this.
> +XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
ok
> +XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
remove
>
> # ----------------------------------------------------------------------------
> # Compile
> @@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
>
> $(STATEDIR)/xorg-font-ttf-android.install:
> @$(call targetinfo)
> +
> + @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
> + @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @find $(XORG_FONT_TTF_ANDROID_DIR) \
> + -name "*.ttf" \
> + | \
> + while read file; do \
> + install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
> + done
> + @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
This adds a lot of boiler plate for all packages. I'd like to see this here:
@$(call world/install-fonts, XORG_FONT_TTF_ANDROID, *.ttf)
And in rules/post/ptxd_make_world_fonts.make
define world/install-fonts
rm -rf $($(1)_PKGDIR)
...
@mkfontdir $($(1)_PKGDIR)/$($(1)_FONTDIR)
endef
> +
> @$(call touch)
>
> # ----------------------------------------------------------------------------
> @@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
> $(STATEDIR)/xorg-font-ttf-android.targetinstall:
> @$(call targetinfo)
>
> - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
> + @$(call install_init, xorg-font-ttf-android)
> + @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
> + @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
> + @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
> + @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
>
> - @find $(XORG_FONT_TTF_ANDROID_DIR) \
> - -name "*.ttf" \
> - | \
> - while read file; do \
> - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
> + @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
> +
> +ifdef PTXCONF_XORG_FONTS_QT4_LINKS
> + @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
> + find . -type f -name "*.ttf" | while read file; do \
> + name=$$(basename $$file); \
> + $(call install_link, xorg-font-ttf-android, \
> + ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
> + /usr/lib/fonts/$$name); \
> done
> +endif
Create the symlinks in _PKGDIR in world/install-fonts and use '/' in
install_tree above. You'll need to us a shell 'if' instead of 'ifdef' in
world/install-fonts:
if [ "$(PTXCONF_XORG_FONTS_QT4_LINKS)" = "y" ]; then \
...
The current code and your copies in all the different rules ignore some
errors. I want to clean this up at some point and that will be easier if I
only have to modify one or two copies and not all font rules.
These comments apply to all other patches as well.
Michael
> +
> + @$(call install_finish, xorg-font-ttf-android)
>
> @$(call touch)
>
> --
> 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] 109+ messages in thread
* Re: [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-09-04 9:34 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Michael Olbrich
@ 2018-09-04 10:47 ` Baeuerle, Florian
2018-09-04 13:08 ` Michael Olbrich
0 siblings, 1 reply; 109+ messages in thread
From: Baeuerle, Florian @ 2018-09-04 10:47 UTC (permalink / raw)
To: ptxdist
Hi Michael,
Am Dienstag, den 04.09.2018, 11:34 +0200 schrieb Michael Olbrich:
> On Tue, Aug 07, 2018 at 02:40:47PM +0200, Florian Bäuerle wrote:
> > As all ttfs font packages, xorg-font-ttf-android used to install fonts
> > into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
> > to xorg-fonts.targetinstall. This was a nice trick to spare the
> > generation of fonts.{dir,scale} in every font package, but it breaks the
> > collection feature for ttf-fonts.
> >
> > Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
> > ---
> > rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
> > 1 file changed, 32 insertions(+), 18 deletions(-)
> >
> > diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
> > index 443f855aa..adad187c5 100644
> > --- a/rules/xorg-font-ttf-android.make
> > +++ b/rules/xorg-font-ttf-android.make
> > @@ -1,6 +1,7 @@
> > # -*-makefile-*-
> > #
> > # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
> > +# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
> > #
> > # See CREDITS for details about who has contributed to this project.
> > #
> > @@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
> > XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
> > file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
> >
> > -ifdef PTXCONF_XORG_FONT_TTF_ANDROID
> > -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
> > -endif
> > -
> > -# ----------------------------------------------------------------------------
> > -# Prepare
> > -# ----------------------------------------------------------------------------
> > -
> > -#
> > -# autoconf
> > -#
> > -XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
>
> Don't remove this.
>
> > +XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
>
> ok
>
> > +XORG_FONT_TTF_ANDROID_FONTPKGDIR := $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
>
> remove
>
> >
> > # ----------------------------------------------------------------------------
> > # Compile
> > @@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
> >
> > $(STATEDIR)/xorg-font-ttf-android.install:
> > @$(call targetinfo)
> > +
> > + @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
> > + @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> > + @find $(XORG_FONT_TTF_ANDROID_DIR) \
> > + -name "*.ttf" \
> > + | \
> > + while read file; do \
> > + install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
> > + done
> > + @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> > + @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
>
> This adds a lot of boiler plate for all packages. I'd like to see this here:
>
> @$(call world/install-fonts, XORG_FONT_TTF_ANDROID, *.ttf)
I would have also preferred that, *but* if you look at xorg-font-ttf-noto, the
original package author did not want to just install every font present in the
archive. I did not question that decision and instead concluded, that such a
macro cannot easily do the job for every font package.
So should I
a) reconsider the original author's decision
or
b) add the boilerplate to the noto package and use the macro everywhere else
I know the current approach sucks, so much that I edited all the makefiles with
sed.
>
> And in rules/post/ptxd_make_world_fonts.make
>
> define world/install-fonts
> rm -rf $($(1)_PKGDIR)
> ...
> @mkfontdir $($(1)_PKGDIR)/$($(1)_FONTDIR)
> endef
>
>
>
> > +
> > @$(call touch)
> >
> > # ----------------------------------------------------------------------------
> > @@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
> > $(STATEDIR)/xorg-font-ttf-android.targetinstall:
> > @$(call targetinfo)
> >
> > - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
> > + @$(call install_init, xorg-font-ttf-android)
> > + @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
> > + @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
> > + @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
> > + @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
> >
> > - @find $(XORG_FONT_TTF_ANDROID_DIR) \
> > - -name "*.ttf" \
> > - | \
> > - while read file; do \
> > - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
> > + @$(call install_tree, xorg-font-ttf-android, 0, 0, -, $(XORG_FONT_TTF_ANDROID_FONTDIR))
> > +
> > +ifdef PTXCONF_XORG_FONTS_QT4_LINKS
> > + @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
> > + find . -type f -name "*.ttf" | while read file; do \
> > + name=$$(basename $$file); \
> > + $(call install_link, xorg-font-ttf-android, \
> > + ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
> > + /usr/lib/fonts/$$name); \
> > done
> > +endif
>
> Create the symlinks in _PKGDIR in world/install-fonts and use '/' in
> install_tree above. You'll need to us a shell 'if' instead of 'ifdef' in
> world/install-fonts:
>
> if [ "$(PTXCONF_XORG_FONTS_QT4_LINKS)" = "y" ]; then \
> ...
>
>
> The current code and your copies in all the different rules ignore some
> errors. I want to clean this up at some point and that will be easier if I
> only have to modify one or two copies and not all font rules.
>
> These comments apply to all other patches as well.
>
Thanks for the review!
- Florian
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
2018-09-04 10:47 ` Baeuerle, Florian
@ 2018-09-04 13:08 ` Michael Olbrich
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
0 siblings, 1 reply; 109+ messages in thread
From: Michael Olbrich @ 2018-09-04 13:08 UTC (permalink / raw)
To: ptxdist
On Tue, Sep 04, 2018 at 10:47:56AM +0000, Baeuerle, Florian wrote:
> Am Dienstag, den 04.09.2018, 11:34 +0200 schrieb Michael Olbrich:
> > >
> > > # ----------------------------------------------------------------------------
> > > # Compile
> > > @@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
> > >
> > > $(STATEDIR)/xorg-font-ttf-android.install:
> > > @$(call targetinfo)
> > > +
> > > + @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
> > > + @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> > > + @find $(XORG_FONT_TTF_ANDROID_DIR) \
> > > + -name "*.ttf" \
> > > + | \
> > > + while read file; do \
> > > + install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
> > > + done
> > > + @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> > > + @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> >
> > This adds a lot of boiler plate for all packages. I'd like to see this here:
> >
> > @$(call world/install-fonts, XORG_FONT_TTF_ANDROID, *.ttf)
>
> I would have also preferred that, *but* if you look at xorg-font-ttf-noto, the
> original package author did not want to just install every font present in the
> archive. I did not question that decision and instead concluded, that such a
> macro cannot easily do the job for every font package.
>
> So should I
>
> a) reconsider the original author's decision
Do this. I'm the original author :-). It's just one extra font anyways.
My plan is to extend the make much like install_glob. I don't want to ask
you to do that, because that will be a lot more complex.
For the packages that you have converted, the simple version will be
enough.
Michael
> or
> b) add the boilerplate to the noto package and use the macro everywhere else
>
> I know the current approach sucks, so much that I edited all the makefiles with
> sed.
--
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] 109+ messages in thread
* [ptxdist] [PATCH v3 01/25] Introduce world/install-font
2018-09-04 13:08 ` Michael Olbrich
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
` (23 more replies)
0 siblings, 24 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
Add a new install function that abstracts away the repetitive task of
installing fonts into PKGDIR.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/post/ptxd_make_world_fonts.make | 30 +++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 rules/post/ptxd_make_world_fonts.make
diff --git a/rules/post/ptxd_make_world_fonts.make b/rules/post/ptxd_make_world_fonts.make
new file mode 100644
index 000000000..1713ebbe0
--- /dev/null
+++ b/rules/post/ptxd_make_world_fonts.make
@@ -0,0 +1,30 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 Florian Bäuerle <florian.baeuerle@allegion.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+world/install-fonts = \
+ DIR=$($(strip $(1)_DIR)); \
+ PKGDIR=$($(strip $(1)_PKGDIR)); \
+ PKGFONTDIR=$${PKGDIR}$($(strip $(1)_FONTDIR)); \
+ FILTER=$(strip $(2)); \
+ rm -rf $($(1)_PKGDIR); \
+ mkdir -p $${PKGFONTDIR}; \
+ find $${DIR} -name "$${FILTER}" | \
+ while read file; do \
+ install -m 644 $${file} $${PKGFONTDIR}; \
+ if [ "$(PTXCONF_XORG_FONTS_QT4_LINKS)" = "y" ]; then \
+ name=$$(basename $${file}); \
+ mkdir -p $${PKGDIR}/usr/lib/fonts; \
+ ln -s ../../..$${PKGFONTDIR}/$${name} $${PKGDIR}/usr/lib/fonts/$${name}; \
+ fi; \
+ done; \
+ mkfontdir $${PKGFONTDIR}; \
+ mkfontscale $${PKGFONTDIR}
+
+# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from /
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:11 ` Baeuerle, Florian
` (2 more replies)
2018-09-13 18:05 ` [ptxdist] [PATCH v3 03/25] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
` (22 subsequent siblings)
23 siblings, 3 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
ptxt_install_find strips the last slash from a destination path. The
result is an empty path if installing to the root directory.
---
scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 5e69cefdc..51c24ce5e 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -648,7 +648,8 @@ export -f ptxd_install_generic
ptxd_install_find() {
local src="${1%/}"
- local dst="${2%/}"
+ local dst=${2:1}
+ dst=${2:0:1}${dst%/}
local usr="${3#-}"
local grp="${4#-}"
local strip="${5}"
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 03/25] xorg-font-ttf-android: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 04/25] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
` (21 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
As all ttf font packages, xorg-font-ttf-android used to install fonts
into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
to xorg-fonts.targetinstall. This was a nice trick to spare the
generation of fonts.{dir,scale} in every font package, but it breaks the
collection feature for ttf-fonts.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-android.make | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
index 443f855aa..9f308cb03 100644
--- a/rules/xorg-font-ttf-android.make
+++ b/rules/xorg-font-ttf-android.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
-ifdef PTXCONF_XORG_FONT_TTF_ANDROID
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +46,7 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
$(STATEDIR)/xorg-font-ttf-android.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_ANDROID,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,16 +55,15 @@ $(STATEDIR)/xorg-font-ttf-android.install:
$(STATEDIR)/xorg-font-ttf-android.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-android)
+ @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_ANDROID_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-android, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-android)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 04/25] xorg-font-ttf-bitstream-vera: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 03/25] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 05/25] xorg-font-ttf-caladea: " Florian Bäuerle
` (20 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-bitstream-vera.make | 30 +++++++++----------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make
index eeb2f943e..6681acf63 100644
--- a/rules/xorg-font-ttf-bitstream-vera.make
+++ b/rules/xorg-font-ttf-bitstream-vera.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,17 +29,8 @@ XORG_FONT_TTF_BITSTREAM_VERA_LICENSE := Bitstream-Vera
XORG_FONT_TTF_BITSTREAM_VERA_LICENSE_FILES := \
file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
-ifdef PTXCONF_XORG_FONT_TTF_BITSTREAM_VERA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-bitstream-vera.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_BITSTREAM_VERA_CONF_TOOL := NO
+XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR := $(XORG_FONTDIR)/truetype/bitstream-vera
# ----------------------------------------------------------------------------
# Compile
@@ -54,6 +46,7 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.compile:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_BITSTREAM_VERA,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -62,16 +55,15 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-bitstream-vera)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-bitstream-vera, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-bitstream-vera)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 05/25] xorg-font-ttf-caladea: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (2 preceding siblings ...)
2018-09-13 18:05 ` [ptxdist] [PATCH v3 04/25] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 06/25] xorg-font-ttf-carlito: " Florian Bäuerle
` (19 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-caladea.make | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-caladea.make b/rules/xorg-font-ttf-caladea.make
index e0c83a600..cb2fb869b 100644
--- a/rules/xorg-font-ttf-caladea.make
+++ b/rules/xorg-font-ttf-caladea.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CALADEA_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CALADEA).$(XORG_FONT_T
XORG_FONT_TTF_CALADEA_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CALADEA)
XORG_FONT_TTF_CALADEA_LICENSE := Apache-2.0
-ifdef PTXCONF_XORG_FONT_TTF_CALADEA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_CALADEA_CONF_TOOL := NO
+XORG_FONT_TTF_CALADEA_FONTDIR := $(XORG_FONTDIR)/truetype/caladea
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-caladea.compile:
$(STATEDIR)/xorg-font-ttf-caladea.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_CALADEA,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-caladea.install:
$(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CALADEA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-caladea)
@$(call install_fixup, xorg-font-ttf-caladea,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-caladea,SECTION,base)
@@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call install_alternative, xorg-font-ttf-caladea, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-caladea-fontconfig.conf)
- @$(call install_finish, xorg-font-ttf-caladea)
+ @$(call install_tree, xorg-font-ttf-caladea, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-caladea)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 06/25] xorg-font-ttf-carlito: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (3 preceding siblings ...)
2018-09-13 18:05 ` [ptxdist] [PATCH v3 05/25] xorg-font-ttf-caladea: " Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 07/25] remove xorg-font-ttf-comic-jens Florian Bäuerle
` (18 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-carlito.make | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make
index e5e4468dd..83b339144 100644
--- a/rules/xorg-font-ttf-carlito.make
+++ b/rules/xorg-font-ttf-carlito.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T
XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO)
XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_CARLITO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
+XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-carlito.compile:
$(STATEDIR)/xorg-font-ttf-carlito.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_CARLITO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CARLITO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-carlito)
@$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-carlito,SECTION,base)
@@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf)
- @$(call install_finish, xorg-font-ttf-carlito)
+ @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, $(XORG_FONT_TTF_CARLITO_FONTDIR))
+ @$(call install_finish, xorg-font-ttf-carlito)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 07/25] remove xorg-font-ttf-comic-jens
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (4 preceding siblings ...)
2018-09-13 18:05 ` [ptxdist] [PATCH v3 06/25] xorg-font-ttf-carlito: " Florian Bäuerle
@ 2018-09-13 18:05 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 08/25] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
` (17 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:05 UTC (permalink / raw)
To: ptxdist
There is a successor to comic jens (ff uberhand) and the source do not
seem to be available any longer. Simply drop it.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-comic-jens.in | 9 ----
rules/xorg-font-ttf-comic-jens.make | 74 -----------------------------
2 files changed, 83 deletions(-)
delete mode 100644 rules/xorg-font-ttf-comic-jens.in
delete mode 100644 rules/xorg-font-ttf-comic-jens.make
diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
deleted file mode 100644
index ec6891f6f..000000000
--- a/rules/xorg-font-ttf-comic-jens.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_font_ttf
-
-config XORG_FONT_TTF_COMIC_JENS
- bool
- select XORG_FONTS
- depends on XORG_FONT_TTF
- prompt "Comic Jens"
- help
- A free alternative to Comic Sans.
diff --git a/rules/xorg-font-ttf-comic-jens.make b/rules/xorg-font-ttf-comic-jens.make
deleted file mode 100644
index 276fc8bcc..000000000
--- a/rules/xorg-font-ttf-comic-jens.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_FONT_TTF_COMIC_JENS) += xorg-font-ttf-comic-jens
-
-#
-# Paths and names
-#
-XORG_FONT_TTF_COMIC_JENS_VERSION := 2.0
-XORG_FONT_TTF_COMIC_JENS_MD5 := 21ab5b4a9360b58959ad30e757aa2ada
-XORG_FONT_TTF_COMIC_JENS := comic-jens
-XORG_FONT_TTF_COMIC_JENS_SUFFIX := zip
-XORG_FONT_TTF_COMIC_JENS_URL := http://www.kutilek.de/download/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_COMIC_JENS)
-XORG_FONT_TTF_COMIC_JENS_LICENSE := CC-BY-ND-3.0
-XORG_FONT_TTF_COMIC_JENS_LICENSE_FILES := \
- file://Licence.txt;md5=dccc90a479b3a0b508cac38314a04334
-
-ifdef PTXCONF_XORG_FONT_TTF_COMIC_JENS
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_COMIC_JENS_CONF_TOOL := NO
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall:
- @$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_COMIC_JENS_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
- @$(call touch)
-
-# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 08/25] xorg-font-ttf-dejavu: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (5 preceding siblings ...)
2018-09-13 18:05 ` [ptxdist] [PATCH v3 07/25] remove xorg-font-ttf-comic-jens Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 09/25] xorg-font-ttf-hanazono: " Florian Bäuerle
` (16 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-dejavu.make | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make
index bfe95bbd4..71e787275 100644
--- a/rules/xorg-font-ttf-dejavu.make
+++ b/rules/xorg-font-ttf-dejavu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,9 +26,8 @@ XORG_FONT_TTF_DEJAVU_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF
XORG_FONT_TTF_DEJAVU_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU)
XORG_FONT_TTF_DEJAVU_LICENSE := Bitstream-Vera AND public_domain
-ifdef PTXCONF_XORG_FONT_TTF_DEJAVU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall
-endif
+XORG_FONT_TTF_DEJAVU_CONF_TOOL := NO
+XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu
# ----------------------------------------------------------------------------
# Prepare
@@ -52,15 +52,17 @@ $(STATEDIR)/xorg-font-ttf-dejavu.compile:
$(STATEDIR)/xorg-font-ttf-dejavu.install:
@$(call targetinfo)
- @rm -rf $(XORG_FONT_TTF_DEJAVU_PKGDIR)
@mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail
@mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d
@for file in $(XORG_FONT_TTF_DEJAVU_DIR)/fontconfig/*.conf; do \
+ name=$$(basename $${file}); \
install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail; \
- ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \
+ ln -s ../conf.avail/$${name} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$${name}; \
done
+ @$(call world/install-fonts,XORG_FONT_TTF_DEJAVU,*.ttf)
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -69,27 +71,15 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install:
$(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_DEJAVU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-dejavu)
@$(call install_fixup, xorg-font-ttf-dejavu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-dejavu,SECTION,base)
@$(call install_fixup, xorg-font-ttf-dejavu,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-dejavu,DESCRIPTION,missing)
- @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.d)
- @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.avail)
+ @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-dejavu)
-
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 09/25] xorg-font-ttf-hanazono: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (6 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 08/25] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 10/25] xorg-font-ttf-liberation: " Florian Bäuerle
` (15 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-hanazono.make | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-hanazono.make b/rules/xorg-font-ttf-hanazono.make
index 3a5a62bb2..6f9f9d922 100644
--- a/rules/xorg-font-ttf-hanazono.make
+++ b/rules/xorg-font-ttf-hanazono.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,15 +27,8 @@ XORG_FONT_TTF_HANAZONO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_HANAZONO)
XORG_FONT_TTF_HANAZONO_STRIP_LEVEL := 0
XORG_FONT_TTF_HANAZONO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_HANAZONO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_HANAZONO_CONF_TOOL := NO
+XORG_FONT_TTF_HANAZONO_FONTDIR := $(XORG_FONTDIR)/truetype/hanazono
# ----------------------------------------------------------------------------
# Compile
@@ -50,6 +44,7 @@ $(STATEDIR)/xorg-font-ttf-hanazono.compile:
$(STATEDIR)/xorg-font-ttf-hanazono.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_HANAZONO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-ttf-hanazono.install:
$(STATEDIR)/xorg-font-ttf-hanazono.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-hanazono)
+ @$(call install_fixup, xorg-font-ttf-hanazono,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-hanazono,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-hanazono,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-hanazono,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_HANAZONO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-hanazono, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-hanazono)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 10/25] xorg-font-ttf-liberation: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (7 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 09/25] xorg-font-ttf-hanazono: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 11/25] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
` (14 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-liberation.make | 30 +++++++++++------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-liberation.make b/rules/xorg-font-ttf-liberation.make
index 1e60a18bc..1484d6e6b 100644
--- a/rules/xorg-font-ttf-liberation.make
+++ b/rules/xorg-font-ttf-liberation.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,17 +28,8 @@ XORG_FONT_TTF_LIBERATION_LICENSE := OFL-1.1
XORG_FONT_TTF_LIBERATION_LICENSE_FILES := \
file://LICENSE;md5=f96db970a9a46c5369142b99f530366b
-ifdef PTXCONF_XORG_FONT_TTF_LIBERATION
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-liberation.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_LIBERATION_CONF_TOOL := NO
+XORG_FONT_TTF_LIBERATION_FONTDIR := $(XORG_FONTDIR)/truetype/liberation
# ----------------------------------------------------------------------------
# Compile
@@ -53,6 +45,7 @@ $(STATEDIR)/xorg-font-ttf-liberation.compile:
$(STATEDIR)/xorg-font-ttf-liberation.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LIBERATION,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -61,16 +54,15 @@ $(STATEDIR)/xorg-font-ttf-liberation.install:
$(STATEDIR)/xorg-font-ttf-liberation.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-liberation)
+ @$(call install_fixup, xorg-font-ttf-liberation,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-liberation,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-liberation,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-liberation,DESCRIPTION,missing)
- mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- find $(XORG_FONT_TTF_LIBERATION_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-liberation, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-liberation)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 11/25] xorg-font-ttf-lohit-assamese: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (8 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 10/25] xorg-font-ttf-liberation: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 12/25] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
` (13 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-assamese.make | 28 +++++++------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-assamese.make b/rules/xorg-font-ttf-lohit-assamese.make
index 4529d7131..06d7ca964 100644
--- a/rules/xorg-font-ttf-lohit-assamese.make
+++ b/rules/xorg-font-ttf-lohit-assamese.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ASSAMESE
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_ASSAMESE_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-assamese
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.compile:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_ASSAMESE,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf \
+ $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-assamese)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-assamese,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-assamese, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf, \
- /etc/fonts/conf.d/66-lohit-assamese.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-assamese)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 12/25] xorg-font-ttf-lohit-bengali: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (9 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 11/25] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 13/25] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
` (12 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-bengali.make | 28 +++++++-------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-bengali.make b/rules/xorg-font-ttf-lohit-bengali.make
index c580be96e..b1d8e8151 100644
--- a/rules/xorg-font-ttf-lohit-bengali.make
+++ b/rules/xorg-font-ttf-lohit-bengali.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_BENGALI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_BENGALI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_BENGALI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_BENGALI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-bengali
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.compile:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_BENGALI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf \
+ $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-bengali)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-bengali,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-bengali, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf, \
- /etc/fonts/conf.d/66-lohit-bengali.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-bengali, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-bengali)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 13/25] xorg-font-ttf-lohit-devanagari: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (10 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 12/25] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 14/25] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
` (11 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-devanagari.make | 28 ++++++-----------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-devanagari.make b/rules/xorg-font-ttf-lohit-devanagari.make
index 7b8643631..f158d65e2 100644
--- a/rules/xorg-font-ttf-lohit-devanagari.make
+++ b/rules/xorg-font-ttf-lohit-devanagari.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_DEVANAGARI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_DEVANAGARI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-devanagari
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.compile:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_DEVANAGARI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf \
+ $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-devanagari)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-devanagari, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf, \
- /etc/fonts/conf.d/66-lohit-devanagari.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-devanagari, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-devanagari)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 14/25] xorg-font-ttf-lohit-gujarati: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (11 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 13/25] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 15/25] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
` (10 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-gujarati.make | 28 +++++++------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-gujarati.make b/rules/xorg-font-ttf-lohit-gujarati.make
index 88e7195a7..acef4e666 100644
--- a/rules/xorg-font-ttf-lohit-gujarati.make
+++ b/rules/xorg-font-ttf-lohit-gujarati.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_GUJARATI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_GUJARATI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-gujarati
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.compile:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_GUJARATI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf \
+ $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-gujarati)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-gujarati, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf, \
- /etc/fonts/conf.d/66-lohit-gujarati.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-gujarati, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-gujarati)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 15/25] xorg-font-ttf-lohit-kannada: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (12 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 14/25] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 16/25] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
` (9 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-kannada.make | 28 +++++++-------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-kannada.make b/rules/xorg-font-ttf-lohit-kannada.make
index dca2bf84b..38a02b52d 100644
--- a/rules/xorg-font-ttf-lohit-kannada.make
+++ b/rules/xorg-font-ttf-lohit-kannada.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_KANNADA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_KANNADA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_KANNADA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_KANNADA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-kannada
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.compile:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_KANNADA,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf \
+ $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-kannada)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-kannada,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-kannada, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf, \
- /etc/fonts/conf.d/66-lohit-kannada.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-kannada)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 16/25] xorg-font-ttf-lohit-malayalam: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (13 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 15/25] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 17/25] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
` (8 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-malayalam.make | 28 ++++++------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-malayalam.make b/rules/xorg-font-ttf-lohit-malayalam.make
index 331cc0939..39f21a274 100644
--- a/rules/xorg-font-ttf-lohit-malayalam.make
+++ b/rules/xorg-font-ttf-lohit-malayalam.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_MALAYALAM
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_MALAYALAM_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-malayalam
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.compile:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_MALAYALAM,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf \
+ $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-malayalam)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-malayalam, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf, \
- /etc/fonts/conf.d/67-lohit-malayalam.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-malayalam, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-malayalam)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 17/25] xorg-font-ttf-lohit-oriya: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (14 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 16/25] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 18/25] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
` (7 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-oriya.make | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-oriya.make b/rules/xorg-font-ttf-lohit-oriya.make
index 308cdd332..560cabf63 100644
--- a/rules/xorg-font-ttf-lohit-oriya.make
+++ b/rules/xorg-font-ttf-lohit-oriya.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ORIYA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ORIYA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ORIYA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_ORIYA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-oriya
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.compile:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_ORIYA,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf \
+ $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-oriya)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-oriya,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-oriya, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf, \
- /etc/fonts/conf.d/66-lohit-oriya.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-oriya)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 18/25] xorg-font-ttf-lohit-punjabi: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (15 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 17/25] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 19/25] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
` (6 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-punjabi.make | 28 +++++++-------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make
index 0c18a7afa..291bc7132 100644
--- a/rules/xorg-font-ttf-lohit-punjabi.make
+++ b/rules/xorg-font-ttf-lohit-punjabi.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_PUNJABI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf \
+ $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-punjabi)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-punjabi, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \
- /etc/fonts/conf.d/66-lohit-punjabi.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-punjabi)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 19/25] xorg-font-ttf-lohit-tamil-classical: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (16 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 18/25] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 20/25] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
` (5 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
.../xorg-font-ttf-lohit-tamil-classical.make | 28 +++++--------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make
index 548552346..bd427531a 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.make
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil-classical
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf \
+ $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil-classical)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-tamil-classical, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf, \
- /etc/fonts/conf.d/66-lohit-tamil-classical.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-tamil-classical)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 20/25] xorg-font-ttf-lohit-tamil: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (17 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 19/25] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 21/25] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
` (4 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-tamil.make | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil.make b/rules/xorg-font-ttf-lohit-tamil.make
index 504269886..291d8a2ea 100644
--- a/rules/xorg-font-ttf-lohit-tamil.make
+++ b/rules/xorg-font-ttf-lohit-tamil.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TAMIL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf \
+ $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-tamil,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-tamil, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf, \
- /etc/fonts/conf.d/66-lohit-tamil.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-tamil)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 21/25] xorg-font-ttf-lohit-telugu: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (18 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 20/25] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 22/25] xorg-font-ttf-noto: " Florian Bäuerle
` (3 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-telugu.make | 28 +++++++--------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-telugu.make b/rules/xorg-font-ttf-lohit-telugu.make
index b4c8f6eb3..24fbd53c5 100644
--- a/rules/xorg-font-ttf-lohit-telugu.make
+++ b/rules/xorg-font-ttf-lohit-telugu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TELUGU_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TELUGU_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TELUGU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TELUGU_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-telugu
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.compile:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TELUGU,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf \
+ $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-telugu)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-telugu,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-telugu, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf, \
- /etc/fonts/conf.d/66-lohit-telugu.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-telugu, 0, 0, -, /)
@$(call install_finish, xorg-font-ttf-lohit-telugu)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 22/25] xorg-font-ttf-noto: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (19 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 21/25] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 23/25] xorg-font-ttf-vlgothic: " Florian Bäuerle
` (2 subsequent siblings)
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 044d4196d..4e762109a 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_NOTO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_NOTO).$(XORG_FONT_TTF_NOT
XORG_FONT_TTF_NOTO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_NOTO)
XORG_FONT_TTF_NOTO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_NOTO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-noto.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_NOTO_CONF_TOOL := NO
+XORG_FONT_TTF_NOTO_FONTDIR := $(XORG_FONTDIR)/truetype/noto
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-noto.compile:
$(STATEDIR)/xorg-font-ttf-noto.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_NOTO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,15 @@ $(STATEDIR)/xorg-font-ttf-noto.install:
$(STATEDIR)/xorg-font-ttf-noto.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-noto)
+ @$(call install_fixup, xorg-font-ttf-noto,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-noto,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-noto,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-noto,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-noto, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-noto)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 23/25] xorg-font-ttf-vlgothic: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (20 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 22/25] xorg-font-ttf-noto: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 24/25] xorg-font-bh-ttf: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 25/25] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 2 +-
rules/xorg-font-ttf-vlgothic.make | 26 ++++++++++----------------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 4e762109a..e47363b71 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index c2ab41bd0..dacdc6fc0 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \
file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \
file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0
-ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO
+XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +49,7 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile:
$(STATEDIR)/xorg-font-ttf-vlgothic.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_VLGOTHIC,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,16 +58,15 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install:
$(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-vlgothic)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, /)
+ @$(call install_finish, xorg-font-ttf-vlgothic)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 24/25] xorg-font-bh-ttf: separate from xorg-fonts
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (21 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 23/25] xorg-font-ttf-vlgothic: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 25/25] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-bh-ttf.make | 36 +++++++++++++------------------
rules/xorg-font-ttf-vlgothic.make | 2 +-
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 59a290094..ccf8922ba 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Erwin Rol
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,23 +27,16 @@ XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUF
XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF)
XORG_FONT_BH_TTF_LICENSE := Luxi
-ifdef PTXCONF_XORG_FONT_BH_TTF
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
-endif
+XORG_FONT_BH_TTF_CONF_TOOL := NO
+XORG_FONT_BH_TTF_FONTDIR := $(XORG_FONTDIR)/truetype/bh
# ----------------------------------------------------------------------------
-# Prepare
+# Compile
# ----------------------------------------------------------------------------
-XORG_FONT_BH_TTF_PATH := PATH=$(CROSS_PATH)
-XORG_FONT_BH_TTF_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_FONT_BH_TTF_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --with-fontdir=$(XORG_FONTDIR)/truetype
+$(STATEDIR)/xorg-font-bh-ttf.compile:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
@@ -50,6 +44,7 @@ XORG_FONT_BH_TTF_AUTOCONF := \
$(STATEDIR)/xorg-font-bh-ttf.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_BH_TTF,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-bh-ttf.install:
$(STATEDIR)/xorg-font-bh-ttf.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-bh-ttf)
+ @$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
+ @$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_BH_TTF_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-bh-ttf, 0, 0, -, /)
+ @$(call install_finish, xorg-font-bh-ttf)
@$(call touch)
# vim: syntax=make
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index dacdc6fc0..42ebb9167 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v3 25/25] xorg-fonts: make all xorg-font-ttf packages tristate
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
` (22 preceding siblings ...)
2018-09-13 18:06 ` [ptxdist] [PATCH v3 24/25] xorg-font-bh-ttf: " Florian Bäuerle
@ 2018-09-13 18:06 ` Florian Bäuerle
23 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-13 18:06 UTC (permalink / raw)
To: ptxdist
Make all ttf-font-packages tristate, so they can be (de)selected via
collection.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/graphics_and_multimedia.in | 2 +-
rules/xorg-font-bh-ttf.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-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 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index 54e53ad7a..25fb44a79 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -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-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-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-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"
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from /
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
@ 2018-09-13 18:11 ` Baeuerle, Florian
2018-09-13 18:20 ` Baeuerle, Florian
2018-09-17 8:40 ` Michael Olbrich
2 siblings, 0 replies; 109+ messages in thread
From: Baeuerle, Florian @ 2018-09-13 18:11 UTC (permalink / raw)
To: ptxdist
Am Donnerstag, den 13.09.2018, 20:05 +0200 schrieb Florian Bäuerle:
> ptxt_install_find strips the last slash from a destination path. The
> result is an empty path if installing to the root directory.
> ---
> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh
> b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index 5e69cefdc..51c24ce5e 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -648,7 +648,8 @@ export -f ptxd_install_generic
>
> ptxd_install_find() {
> local src="${1%/}"
> - local dst="${2%/}"
> + local dst=${2:1}
> + dst=${2:0:1}${dst%/}
I needed that, otherwise
$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, /)
does not work, because the slash is just stripped, leaving no dst path at all.
It looks a bit awkward, but bash does not support nested expansion, so that was
the best I could come up with.
> local usr="${3#-}"
> local grp="${4#-}"
> local strip="${5}"
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from /
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
2018-09-13 18:11 ` Baeuerle, Florian
@ 2018-09-13 18:20 ` Baeuerle, Florian
2018-09-17 8:40 ` Michael Olbrich
2 siblings, 0 replies; 109+ messages in thread
From: Baeuerle, Florian @ 2018-09-13 18:20 UTC (permalink / raw)
To: ptxdist
Oh and of course I forgot the Signed-Off-By, will add that in v4.
Am Donnerstag, den 13.09.2018, 20:05 +0200 schrieb Florian Bäuerle:
> ptxt_install_find strips the last slash from a destination path. The
> result is an empty path if installing to the root directory.
> ---
> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh
> b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index 5e69cefdc..51c24ce5e 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -648,7 +648,8 @@ export -f ptxd_install_generic
>
> ptxd_install_find() {
> local src="${1%/}"
> - local dst="${2%/}"
> + local dst=${2:1}
> + dst=${2:0:1}${dst%/}
> local usr="${3#-}"
> local grp="${4#-}"
> local strip="${5}"
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* Re: [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from /
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
2018-09-13 18:11 ` Baeuerle, Florian
2018-09-13 18:20 ` Baeuerle, Florian
@ 2018-09-17 8:40 ` Michael Olbrich
2018-09-17 10:08 ` Baeuerle, Florian
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
2 siblings, 2 replies; 109+ messages in thread
From: Michael Olbrich @ 2018-09-17 8:40 UTC (permalink / raw)
To: ptxdist
On Thu, Sep 13, 2018 at 08:05:54PM +0200, Florian Bäuerle wrote:
> ptxt_install_find strips the last slash from a destination path. The
> result is an empty path if installing to the root directory.
> ---
> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index 5e69cefdc..51c24ce5e 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -648,7 +648,8 @@ export -f ptxd_install_generic
>
> ptxd_install_find() {
> local src="${1%/}"
> - local dst="${2%/}"
> + local dst=${2:1}
> + dst=${2:0:1}${dst%/}
local dst="${2%/}"
dst=${dst:-/}
I think, this is more obvious.
I'd also prefer a more limited path for install_tree. '/usr' I think, and
the existing stuff for /etc for those packages that have it. But only do
this if it doesn't take too long, or if you need to change all the patches
anyways (I've not looked at those yet, so I don't know if they are ok now).
Michael
> local usr="${3#-}"
> local grp="${4#-}"
> local strip="${5}"
> --
> 2.19.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] 109+ messages in thread
* Re: [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from /
2018-09-17 8:40 ` Michael Olbrich
@ 2018-09-17 10:08 ` Baeuerle, Florian
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
1 sibling, 0 replies; 109+ messages in thread
From: Baeuerle, Florian @ 2018-09-17 10:08 UTC (permalink / raw)
To: ptxdist
Hi Michael,
Am Montag, den 17.09.2018, 10:40 +0200 schrieb Michael Olbrich:
> On Thu, Sep 13, 2018 at 08:05:54PM +0200, Florian Bäuerle wrote:
> > ptxt_install_find strips the last slash from a destination path. The
> > result is an empty path if installing to the root directory.
> > ---
> > scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh
> > b/scripts/lib/ptxd_make_xpkg_pkg.sh
> > index 5e69cefdc..51c24ce5e 100644
> > --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> > +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> > @@ -648,7 +648,8 @@ export -f ptxd_install_generic
> >
> > ptxd_install_find() {
> > local src="${1%/}"
> > - local dst="${2%/}"
> > + local dst=${2:1}
> > + dst=${2:0:1}${dst%/}
>
> local dst="${2%/}"
> dst=${dst:-/}
>
> I think, this is more obvious.
Yes it is.
>
> I'd also prefer a more limited path for install_tree. '/usr' I think, and
> the existing stuff for /etc for those packages that have it. But only do
> this if it doesn't take too long, or if you need to change all the patches
> anyways (I've not looked at those yet, so I don't know if they are ok now).
No problem at all, it won't take too long.
Should I then rip out this patch from the series and send it individually?
>
> Michael
>
> > local usr="${3#-}"
> > local grp="${4#-}"
> > local strip="${5}"
> > --
> > 2.19.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 01/24] Introduce world/install-font
2018-09-17 8:40 ` Michael Olbrich
2018-09-17 10:08 ` Baeuerle, Florian
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 02/24] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
` (22 more replies)
1 sibling, 23 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Add a new install function that abstracts away the repetitive task of
installing fonts into PKGDIR.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/post/ptxd_make_world_fonts.make | 30 +++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 rules/post/ptxd_make_world_fonts.make
diff --git a/rules/post/ptxd_make_world_fonts.make b/rules/post/ptxd_make_world_fonts.make
new file mode 100644
index 000000000..1713ebbe0
--- /dev/null
+++ b/rules/post/ptxd_make_world_fonts.make
@@ -0,0 +1,30 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 Florian Bäuerle <florian.baeuerle@allegion.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+world/install-fonts = \
+ DIR=$($(strip $(1)_DIR)); \
+ PKGDIR=$($(strip $(1)_PKGDIR)); \
+ PKGFONTDIR=$${PKGDIR}$($(strip $(1)_FONTDIR)); \
+ FILTER=$(strip $(2)); \
+ rm -rf $($(1)_PKGDIR); \
+ mkdir -p $${PKGFONTDIR}; \
+ find $${DIR} -name "$${FILTER}" | \
+ while read file; do \
+ install -m 644 $${file} $${PKGFONTDIR}; \
+ if [ "$(PTXCONF_XORG_FONTS_QT4_LINKS)" = "y" ]; then \
+ name=$$(basename $${file}); \
+ mkdir -p $${PKGDIR}/usr/lib/fonts; \
+ ln -s ../../..$${PKGFONTDIR}/$${name} $${PKGDIR}/usr/lib/fonts/$${name}; \
+ fi; \
+ done; \
+ mkfontdir $${PKGFONTDIR}; \
+ mkfontscale $${PKGFONTDIR}
+
+# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 02/24] xorg-font-ttf-android: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 03/24] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
` (21 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
As all ttf font packages, xorg-font-ttf-android used to install fonts
into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
to xorg-fonts.targetinstall. This was a nice trick to spare the
generation of fonts.{dir,scale} in every font package, but it breaks the
collection feature for ttf-fonts.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-android.make | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make
index 443f855aa..ea95a4625 100644
--- a/rules/xorg-font-ttf-android.make
+++ b/rules/xorg-font-ttf-android.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
-ifdef PTXCONF_XORG_FONT_TTF_ANDROID
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
+XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +46,7 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
$(STATEDIR)/xorg-font-ttf-android.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_ANDROID,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,16 +55,15 @@ $(STATEDIR)/xorg-font-ttf-android.install:
$(STATEDIR)/xorg-font-ttf-android.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-android)
+ @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_ANDROID_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-android, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-android)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 03/24] xorg-font-ttf-bitstream-vera: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 02/24] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 04/24] xorg-font-ttf-caladea: " Florian Bäuerle
` (20 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-bitstream-vera.make | 30 +++++++++----------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make
index eeb2f943e..bd228eccc 100644
--- a/rules/xorg-font-ttf-bitstream-vera.make
+++ b/rules/xorg-font-ttf-bitstream-vera.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -28,17 +29,8 @@ XORG_FONT_TTF_BITSTREAM_VERA_LICENSE := Bitstream-Vera
XORG_FONT_TTF_BITSTREAM_VERA_LICENSE_FILES := \
file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
-ifdef PTXCONF_XORG_FONT_TTF_BITSTREAM_VERA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-bitstream-vera.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_BITSTREAM_VERA_CONF_TOOL := NO
+XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR := $(XORG_FONTDIR)/truetype/bitstream-vera
# ----------------------------------------------------------------------------
# Compile
@@ -54,6 +46,7 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.compile:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_BITSTREAM_VERA,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -62,16 +55,15 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.install:
$(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-bitstream-vera)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-bitstream-vera,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-bitstream-vera, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-bitstream-vera)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 04/24] xorg-font-ttf-caladea: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 02/24] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 03/24] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 05/24] xorg-font-ttf-carlito: " Florian Bäuerle
` (19 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-caladea.make | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-caladea.make b/rules/xorg-font-ttf-caladea.make
index e0c83a600..1f76f7697 100644
--- a/rules/xorg-font-ttf-caladea.make
+++ b/rules/xorg-font-ttf-caladea.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CALADEA_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CALADEA).$(XORG_FONT_T
XORG_FONT_TTF_CALADEA_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CALADEA)
XORG_FONT_TTF_CALADEA_LICENSE := Apache-2.0
-ifdef PTXCONF_XORG_FONT_TTF_CALADEA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_CALADEA_CONF_TOOL := NO
+XORG_FONT_TTF_CALADEA_FONTDIR := $(XORG_FONTDIR)/truetype/caladea
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-caladea.compile:
$(STATEDIR)/xorg-font-ttf-caladea.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_CALADEA,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-caladea.install:
$(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CALADEA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-caladea)
@$(call install_fixup, xorg-font-ttf-caladea,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-caladea,SECTION,base)
@@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-caladea.targetinstall:
@$(call install_alternative, xorg-font-ttf-caladea, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-caladea-fontconfig.conf)
- @$(call install_finish, xorg-font-ttf-caladea)
+ @$(call install_tree, xorg-font-ttf-caladea, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-caladea)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 05/24] xorg-font-ttf-carlito: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (2 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 04/24] xorg-font-ttf-caladea: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 06/24] remove xorg-font-ttf-comic-jens Florian Bäuerle
` (18 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-carlito.make | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make
index e5e4468dd..615a9b735 100644
--- a/rules/xorg-font-ttf-carlito.make
+++ b/rules/xorg-font-ttf-carlito.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T
XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO)
XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_CARLITO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
+XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-carlito.compile:
$(STATEDIR)/xorg-font-ttf-carlito.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_CARLITO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CARLITO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-carlito)
@$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-carlito,SECTION,base)
@@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf)
- @$(call install_finish, xorg-font-ttf-carlito)
+ @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-carlito)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 06/24] remove xorg-font-ttf-comic-jens
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (3 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 05/24] xorg-font-ttf-carlito: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 07/24] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
` (17 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
There is a successor to comic jens (ff uberhand) and the source do not
seem to be available any longer. Simply drop it.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-comic-jens.in | 9 ----
rules/xorg-font-ttf-comic-jens.make | 74 -----------------------------
2 files changed, 83 deletions(-)
delete mode 100644 rules/xorg-font-ttf-comic-jens.in
delete mode 100644 rules/xorg-font-ttf-comic-jens.make
diff --git a/rules/xorg-font-ttf-comic-jens.in b/rules/xorg-font-ttf-comic-jens.in
deleted file mode 100644
index ec6891f6f..000000000
--- a/rules/xorg-font-ttf-comic-jens.in
+++ /dev/null
@@ -1,9 +0,0 @@
-## SECTION=multimedia_xorg_font_ttf
-
-config XORG_FONT_TTF_COMIC_JENS
- bool
- select XORG_FONTS
- depends on XORG_FONT_TTF
- prompt "Comic Jens"
- help
- A free alternative to Comic Sans.
diff --git a/rules/xorg-font-ttf-comic-jens.make b/rules/xorg-font-ttf-comic-jens.make
deleted file mode 100644
index 276fc8bcc..000000000
--- a/rules/xorg-font-ttf-comic-jens.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_XORG_FONT_TTF_COMIC_JENS) += xorg-font-ttf-comic-jens
-
-#
-# Paths and names
-#
-XORG_FONT_TTF_COMIC_JENS_VERSION := 2.0
-XORG_FONT_TTF_COMIC_JENS_MD5 := 21ab5b4a9360b58959ad30e757aa2ada
-XORG_FONT_TTF_COMIC_JENS := comic-jens
-XORG_FONT_TTF_COMIC_JENS_SUFFIX := zip
-XORG_FONT_TTF_COMIC_JENS_URL := http://www.kutilek.de/download/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_COMIC_JENS).$(XORG_FONT_TTF_COMIC_JENS_SUFFIX)
-XORG_FONT_TTF_COMIC_JENS_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_COMIC_JENS)
-XORG_FONT_TTF_COMIC_JENS_LICENSE := CC-BY-ND-3.0
-XORG_FONT_TTF_COMIC_JENS_LICENSE_FILES := \
- file://Licence.txt;md5=dccc90a479b3a0b508cac38314a04334
-
-ifdef PTXCONF_XORG_FONT_TTF_COMIC_JENS
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_COMIC_JENS_CONF_TOOL := NO
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-comic-jens.targetinstall:
- @$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_COMIC_JENS_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
- @$(call touch)
-
-# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 07/24] xorg-font-ttf-dejavu: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (4 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 06/24] remove xorg-font-ttf-comic-jens Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 08/24] xorg-font-ttf-hanazono: " Florian Bäuerle
` (16 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-dejavu.make | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make
index bfe95bbd4..0bdd0c4c1 100644
--- a/rules/xorg-font-ttf-dejavu.make
+++ b/rules/xorg-font-ttf-dejavu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,9 +26,8 @@ XORG_FONT_TTF_DEJAVU_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF
XORG_FONT_TTF_DEJAVU_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU)
XORG_FONT_TTF_DEJAVU_LICENSE := Bitstream-Vera AND public_domain
-ifdef PTXCONF_XORG_FONT_TTF_DEJAVU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall
-endif
+XORG_FONT_TTF_DEJAVU_CONF_TOOL := NO
+XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu
# ----------------------------------------------------------------------------
# Prepare
@@ -52,13 +52,14 @@ $(STATEDIR)/xorg-font-ttf-dejavu.compile:
$(STATEDIR)/xorg-font-ttf-dejavu.install:
@$(call targetinfo)
- @rm -rf $(XORG_FONT_TTF_DEJAVU_PKGDIR)
+ @$(call world/install-fonts,XORG_FONT_TTF_DEJAVU,*.ttf)
@mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail
@mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d
@for file in $(XORG_FONT_TTF_DEJAVU_DIR)/fontconfig/*.conf; do \
+ name=$$(basename $${file}); \
install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail; \
- ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \
+ ln -s ../conf.avail/$${name} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$${name}; \
done
@$(call touch)
@@ -69,27 +70,16 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install:
$(STATEDIR)/xorg-font-ttf-dejavu.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_DEJAVU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-dejavu)
@$(call install_fixup, xorg-font-ttf-dejavu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-dejavu,SECTION,base)
@$(call install_fixup, xorg-font-ttf-dejavu,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-dejavu,DESCRIPTION,missing)
- @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.d)
- @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.avail)
+ @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-dejavu)
-
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 08/24] xorg-font-ttf-hanazono: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (5 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 07/24] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 09/24] xorg-font-ttf-liberation: " Florian Bäuerle
` (15 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-hanazono.make | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-hanazono.make b/rules/xorg-font-ttf-hanazono.make
index 3a5a62bb2..71518020d 100644
--- a/rules/xorg-font-ttf-hanazono.make
+++ b/rules/xorg-font-ttf-hanazono.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,15 +27,8 @@ XORG_FONT_TTF_HANAZONO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_HANAZONO)
XORG_FONT_TTF_HANAZONO_STRIP_LEVEL := 0
XORG_FONT_TTF_HANAZONO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_HANAZONO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_HANAZONO_CONF_TOOL := NO
+XORG_FONT_TTF_HANAZONO_FONTDIR := $(XORG_FONTDIR)/truetype/hanazono
# ----------------------------------------------------------------------------
# Compile
@@ -50,6 +44,7 @@ $(STATEDIR)/xorg-font-ttf-hanazono.compile:
$(STATEDIR)/xorg-font-ttf-hanazono.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_HANAZONO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-ttf-hanazono.install:
$(STATEDIR)/xorg-font-ttf-hanazono.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-hanazono)
+ @$(call install_fixup, xorg-font-ttf-hanazono,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-hanazono,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-hanazono,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-hanazono,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_HANAZONO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-hanazono, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-hanazono)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 09/24] xorg-font-ttf-liberation: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (6 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 08/24] xorg-font-ttf-hanazono: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 10/24] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
` (14 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-liberation.make | 30 +++++++++++------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-liberation.make b/rules/xorg-font-ttf-liberation.make
index 1e60a18bc..cddd84320 100644
--- a/rules/xorg-font-ttf-liberation.make
+++ b/rules/xorg-font-ttf-liberation.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Philipp Zabel <p.zabel@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,17 +28,8 @@ XORG_FONT_TTF_LIBERATION_LICENSE := OFL-1.1
XORG_FONT_TTF_LIBERATION_LICENSE_FILES := \
file://LICENSE;md5=f96db970a9a46c5369142b99f530366b
-ifdef PTXCONF_XORG_FONT_TTF_LIBERATION
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/xorg-font-ttf-liberation.prepare:
- @$(call targetinfo)
- @$(call touch)
+XORG_FONT_TTF_LIBERATION_CONF_TOOL := NO
+XORG_FONT_TTF_LIBERATION_FONTDIR := $(XORG_FONTDIR)/truetype/liberation
# ----------------------------------------------------------------------------
# Compile
@@ -53,6 +45,7 @@ $(STATEDIR)/xorg-font-ttf-liberation.compile:
$(STATEDIR)/xorg-font-ttf-liberation.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LIBERATION,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -61,16 +54,15 @@ $(STATEDIR)/xorg-font-ttf-liberation.install:
$(STATEDIR)/xorg-font-ttf-liberation.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-liberation)
+ @$(call install_fixup, xorg-font-ttf-liberation,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-liberation,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-liberation,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-liberation,DESCRIPTION,missing)
- mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- find $(XORG_FONT_TTF_LIBERATION_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-liberation, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-liberation)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 10/24] xorg-font-ttf-lohit-assamese: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (7 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 09/24] xorg-font-ttf-liberation: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 11/24] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
` (13 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-assamese.make | 29 +++++++------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-assamese.make b/rules/xorg-font-ttf-lohit-assamese.make
index 4529d7131..66f203c4b 100644
--- a/rules/xorg-font-ttf-lohit-assamese.make
+++ b/rules/xorg-font-ttf-lohit-assamese.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ASSAMESE_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ASSAMESE
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_ASSAMESE_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ASSAMESE_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-assamese
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.compile:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_ASSAMESE,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf \
+ $(XORG_FONT_TTF_LOHIT_ASSAMESE_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-assamese.install:
$(STATEDIR)/xorg-font-ttf-lohit-assamese.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-assamese)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-assamese,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-assamese,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-assamese, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_ASSAMESE_DIR)/66-lohit-assamese.conf, \
- /etc/fonts/conf.d/66-lohit-assamese.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-assamese, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-assamese)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 11/24] xorg-font-ttf-lohit-bengali: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (8 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 10/24] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 12/24] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
` (12 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-bengali.make | 29 +++++++-------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-bengali.make b/rules/xorg-font-ttf-lohit-bengali.make
index c580be96e..264c796eb 100644
--- a/rules/xorg-font-ttf-lohit-bengali.make
+++ b/rules/xorg-font-ttf-lohit-bengali.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_BENGALI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_BENGALI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_BENGALI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_BENGALI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_BENGALI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-bengali
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.compile:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_BENGALI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf \
+ $(XORG_FONT_TTF_LOHIT_BENGALI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-bengali.install:
$(STATEDIR)/xorg-font-ttf-lohit-bengali.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_BENGALI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-bengali)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-bengali,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-bengali,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-bengali, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_BENGALI_DIR)/66-lohit-bengali.conf, \
- /etc/fonts/conf.d/66-lohit-bengali.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-bengali, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-bengali, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-bengali)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 12/24] xorg-font-ttf-lohit-devanagari: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (9 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 11/24] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 13/24] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
` (11 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-devanagari.make | 29 +++++++----------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-devanagari.make b/rules/xorg-font-ttf-lohit-devanagari.make
index 7b8643631..9d449ebc9 100644
--- a/rules/xorg-font-ttf-lohit-devanagari.make
+++ b/rules/xorg-font-ttf-lohit-devanagari.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_DEVANAGARI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_DEVANAGARI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_DEVANAGARI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_DEVANAGARI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-devanagari
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.compile:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_DEVANAGARI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf \
+ $(XORG_FONT_TTF_LOHIT_DEVANAGARI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-devanagari.install:
$(STATEDIR)/xorg-font-ttf-lohit-devanagari.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-devanagari)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-devanagari,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-devanagari, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_DEVANAGARI_DIR)/66-lohit-devanagari.conf, \
- /etc/fonts/conf.d/66-lohit-devanagari.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-devanagari, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-devanagari, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-devanagari)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 13/24] xorg-font-ttf-lohit-gujarati: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (10 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 12/24] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 14/24] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
` (10 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-gujarati.make | 29 +++++++------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-gujarati.make b/rules/xorg-font-ttf-lohit-gujarati.make
index 88e7195a7..eeea9a915 100644
--- a/rules/xorg-font-ttf-lohit-gujarati.make
+++ b/rules/xorg-font-ttf-lohit-gujarati.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_GUJARATI_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_GUJARATI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_GUJARATI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_GUJARATI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-gujarati
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.compile:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_GUJARATI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf \
+ $(XORG_FONT_TTF_LOHIT_GUJARATI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-gujarati.install:
$(STATEDIR)/xorg-font-ttf-lohit-gujarati.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-gujarati)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-gujarati,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-gujarati, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_GUJARATI_DIR)/66-lohit-gujarati.conf, \
- /etc/fonts/conf.d/66-lohit-gujarati.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-gujarati, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-gujarati, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-gujarati)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 14/24] xorg-font-ttf-lohit-kannada: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (11 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 13/24] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 15/24] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
` (9 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-kannada.make | 29 +++++++-------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-kannada.make b/rules/xorg-font-ttf-lohit-kannada.make
index dca2bf84b..b6346dc06 100644
--- a/rules/xorg-font-ttf-lohit-kannada.make
+++ b/rules/xorg-font-ttf-lohit-kannada.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_KANNADA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_KANNADA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_KANNADA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_KANNADA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-kannada
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.compile:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_KANNADA,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf \
+ $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-kannada)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-kannada,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-kannada, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf, \
- /etc/fonts/conf.d/66-lohit-kannada.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-kannada)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 15/24] xorg-font-ttf-lohit-malayalam: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (12 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 14/24] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 16/24] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
` (8 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-malayalam.make | 29 +++++++-----------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-malayalam.make b/rules/xorg-font-ttf-lohit-malayalam.make
index 331cc0939..35b385258 100644
--- a/rules/xorg-font-ttf-lohit-malayalam.make
+++ b/rules/xorg-font-ttf-lohit-malayalam.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_MALAYALAM_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_MALAYALAM
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_MALAYALAM_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_MALAYALAM_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-malayalam
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.compile:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_MALAYALAM,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf \
+ $(XORG_FONT_TTF_LOHIT_MALAYALAM_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-malayalam.install:
$(STATEDIR)/xorg-font-ttf-lohit-malayalam.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-malayalam)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-malayalam,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-malayalam, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_MALAYALAM_DIR)/67-lohit-malayalam.conf, \
- /etc/fonts/conf.d/67-lohit-malayalam.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-malayalam, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-malayalam, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-malayalam)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 16/24] xorg-font-ttf-lohit-oriya: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (13 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 15/24] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 17/24] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
` (7 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-oriya.make | 29 ++++++++--------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-oriya.make b/rules/xorg-font-ttf-lohit-oriya.make
index 308cdd332..6367f2aa0 100644
--- a/rules/xorg-font-ttf-lohit-oriya.make
+++ b/rules/xorg-font-ttf-lohit-oriya.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ORIYA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_ORIYA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ORIYA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_ORIYA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-oriya
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.compile:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_ORIYA,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf \
+ $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.install:
$(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-oriya)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-oriya,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-oriya,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-oriya, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf, \
- /etc/fonts/conf.d/66-lohit-oriya.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-oriya)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 17/24] xorg-font-ttf-lohit-punjabi: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (14 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 16/24] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 18/24] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
` (6 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-punjabi.make | 29 +++++++-------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make
index 0c18a7afa..bad702555 100644
--- a/rules/xorg-font-ttf-lohit-punjabi.make
+++ b/rules/xorg-font-ttf-lohit-punjabi.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_PUNJABI,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf \
+ $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install:
$(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-punjabi)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-punjabi,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-punjabi, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \
- /etc/fonts/conf.d/66-lohit-punjabi.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-punjabi)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 18/24] xorg-font-ttf-lohit-tamil-classical: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (15 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 17/24] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 19/24] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
` (5 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
.../xorg-font-ttf-lohit-tamil-classical.make | 29 +++++--------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make
index 548552346..1f6499f46 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.make
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil-classical
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf \
+ $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil-classical)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-tamil-classical, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf, \
- /etc/fonts/conf.d/66-lohit-tamil-classical.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-tamil-classical)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 19/24] xorg-font-ttf-lohit-tamil: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (16 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 18/24] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 20/24] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
` (4 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-tamil.make | 29 ++++++++--------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-tamil.make b/rules/xorg-font-ttf-lohit-tamil.make
index 504269886..86f29d5d0 100644
--- a/rules/xorg-font-ttf-lohit-tamil.make
+++ b/rules/xorg-font-ttf-lohit-tamil.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TAMIL_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TAMIL_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-tamil
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.compile:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf \
+ $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
$(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-tamil)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-tamil,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-tamil,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-tamil, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf, \
- /etc/fonts/conf.d/66-lohit-tamil.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-tamil)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 20/24] xorg-font-ttf-lohit-telugu: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (17 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 19/24] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 21/24] xorg-font-ttf-noto: " Florian Bäuerle
` (3 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-lohit-telugu.make | 29 ++++++++-------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-telugu.make b/rules/xorg-font-ttf-lohit-telugu.make
index b4c8f6eb3..565088496 100644
--- a/rules/xorg-font-ttf-lohit-telugu.make
+++ b/rules/xorg-font-ttf-lohit-telugu.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TELUGU_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_TELUGU_LICENSE_FILES := \
file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TELUGU
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_TELUGU_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_TELUGU_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-telugu
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.compile:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TELUGU,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf \
+ $(XORG_FONT_TTF_LOHIT_TELUGU_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-telugu.install:
$(STATEDIR)/xorg-font-ttf-lohit-telugu.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_TELUGU_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-telugu)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-telugu,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-telugu,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-telugu, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_TELUGU_DIR)/66-lohit-telugu.conf, \
- /etc/fonts/conf.d/66-lohit-telugu.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-telugu, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-telugu, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-telugu)
@$(call touch)
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 21/24] xorg-font-ttf-noto: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (18 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 20/24] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 22/24] xorg-font-ttf-vlgothic: " Florian Bäuerle
` (2 subsequent siblings)
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index 044d4196d..ecd348ba4 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_NOTO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_NOTO).$(XORG_FONT_TTF_NOT
XORG_FONT_TTF_NOTO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_NOTO)
XORG_FONT_TTF_NOTO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_NOTO
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-noto.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_NOTO_CONF_TOOL := NO
+XORG_FONT_TTF_NOTO_FONTDIR := $(XORG_FONTDIR)/truetype/noto
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-noto.compile:
$(STATEDIR)/xorg-font-ttf-noto.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_NOTO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,15 @@ $(STATEDIR)/xorg-font-ttf-noto.install:
$(STATEDIR)/xorg-font-ttf-noto.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-noto)
+ @$(call install_fixup, xorg-font-ttf-noto,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-noto,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-noto,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-noto,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-noto, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-noto)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 22/24] xorg-font-ttf-vlgothic: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (19 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 21/24] xorg-font-ttf-noto: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 23/24] xorg-font-bh-ttf: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 24/24] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-ttf-noto.make | 2 +-
rules/xorg-font-ttf-vlgothic.make | 26 ++++++++++----------------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make
index ecd348ba4..ff64e72ba 100644
--- a/rules/xorg-font-ttf-noto.make
+++ b/rules/xorg-font-ttf-noto.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index c2ab41bd0..e1010ba31 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \
file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \
file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0
-ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO
+XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic
# ----------------------------------------------------------------------------
# Compile
@@ -55,6 +49,7 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile:
$(STATEDIR)/xorg-font-ttf-vlgothic.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_VLGOTHIC,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -63,16 +58,15 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install:
$(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-ttf-vlgothic)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base)
+ @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-vlgothic)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 23/24] xorg-font-bh-ttf: separate from xorg-fonts
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (20 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 22/24] xorg-font-ttf-vlgothic: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 24/24] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/xorg-font-bh-ttf.make | 36 +++++++++++++------------------
rules/xorg-font-ttf-vlgothic.make | 2 +-
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 59a290094..b935bfa07 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Erwin Rol
# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -26,23 +27,16 @@ XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUF
XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF)
XORG_FONT_BH_TTF_LICENSE := Luxi
-ifdef PTXCONF_XORG_FONT_BH_TTF
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
-endif
+XORG_FONT_BH_TTF_CONF_TOOL := NO
+XORG_FONT_BH_TTF_FONTDIR := $(XORG_FONTDIR)/truetype/bh
# ----------------------------------------------------------------------------
-# Prepare
+# Compile
# ----------------------------------------------------------------------------
-XORG_FONT_BH_TTF_PATH := PATH=$(CROSS_PATH)
-XORG_FONT_BH_TTF_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-XORG_FONT_BH_TTF_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --with-fontdir=$(XORG_FONTDIR)/truetype
+$(STATEDIR)/xorg-font-bh-ttf.compile:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
@@ -50,6 +44,7 @@ XORG_FONT_BH_TTF_AUTOCONF := \
$(STATEDIR)/xorg-font-bh-ttf.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_BH_TTF,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-bh-ttf.install:
$(STATEDIR)/xorg-font-bh-ttf.targetinstall:
@$(call targetinfo)
+ @$(call install_init, xorg-font-bh-ttf)
+ @$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
+ @$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
+ @$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>")
+ @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_BH_TTF_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
+ @$(call install_tree, xorg-font-bh-ttf, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-bh-ttf)
@$(call touch)
# vim: syntax=make
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index e1010ba31..22ec1ddc4 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
-# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
+# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
* [ptxdist] [PATCH v4 24/24] xorg-fonts: make all xorg-font-ttf packages tristate
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
` (21 preceding siblings ...)
2018-09-18 14:14 ` [ptxdist] [PATCH v4 23/24] xorg-font-bh-ttf: " Florian Bäuerle
@ 2018-09-18 14:14 ` Florian Bäuerle
22 siblings, 0 replies; 109+ messages in thread
From: Florian Bäuerle @ 2018-09-18 14:14 UTC (permalink / raw)
To: ptxdist
Make all ttf-font-packages tristate, so they can be (de)selected via
collection.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
rules/graphics_and_multimedia.in | 2 +-
rules/xorg-font-bh-ttf.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-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 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index 54e53ad7a..25fb44a79 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -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-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-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-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"
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 109+ messages in thread
end of thread, other threads:[~2018-09-18 14:16 UTC | newest]
Thread overview: 109+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-01 18:31 [ptxdist] [PATCH 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 20/23] xorg-font-ttf-noto: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
2018-08-01 18:31 ` [ptxdist] [PATCH 22/23] xorg-font-bh-ttf: " Florian Bäuerle
2018-08-01 18:32 ` [ptxdist] [PATCH 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-08-02 5:25 ` Juergen Borleis
2018-08-02 7:29 ` Baeuerle, Florian
2018-08-03 7:13 ` Uwe Kleine-König
2018-08-07 12:39 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Florian Bäuerle
2018-08-07 12:45 ` Baeuerle, Florian
2018-08-07 12:40 ` Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 02/23] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 03/23] xorg-font-ttf-caladea: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 04/23] xorg-font-ttf-carlito: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 05/23] remove xorg-font-ttf-comic-jens Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 06/23] xorg-font-ttf-dejavu: isolate from xorg-fonts Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 07/23] xorg-font-ttf-hanazono: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 08/23] xorg-font-ttf-liberation: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 09/23] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 10/23] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 11/23] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 12/23] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
2018-08-07 12:40 ` [ptxdist] [PATCH v2 13/23] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 14/23] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 15/23] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 16/23] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 17/23] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 18/23] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 19/23] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 20/23] xorg-font-ttf-noto: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 21/23] xorg-font-ttf-vlgothic: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 22/23] xorg-font-bh-ttf: " Florian Bäuerle
2018-08-07 12:41 ` [ptxdist] [PATCH v2 23/23] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-09-04 9:34 ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts Michael Olbrich
2018-09-04 10:47 ` Baeuerle, Florian
2018-09-04 13:08 ` Michael Olbrich
2018-09-13 18:05 ` [ptxdist] [PATCH v3 01/25] Introduce world/install-font Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 02/25] ptxd_install_find: allow installing from / Florian Bäuerle
2018-09-13 18:11 ` Baeuerle, Florian
2018-09-13 18:20 ` Baeuerle, Florian
2018-09-17 8:40 ` Michael Olbrich
2018-09-17 10:08 ` Baeuerle, Florian
2018-09-18 14:14 ` [ptxdist] [PATCH v4 01/24] Introduce world/install-font Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 02/24] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 03/24] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 04/24] xorg-font-ttf-caladea: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 05/24] xorg-font-ttf-carlito: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 06/24] remove xorg-font-ttf-comic-jens Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 07/24] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 08/24] xorg-font-ttf-hanazono: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 09/24] xorg-font-ttf-liberation: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 10/24] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 11/24] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 12/24] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 13/24] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 14/24] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 15/24] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 16/24] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 17/24] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 18/24] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 19/24] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 20/24] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 21/24] xorg-font-ttf-noto: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 22/24] xorg-font-ttf-vlgothic: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 23/24] xorg-font-bh-ttf: " Florian Bäuerle
2018-09-18 14:14 ` [ptxdist] [PATCH v4 24/24] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 03/25] xorg-font-ttf-android: separate from xorg-fonts Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 04/25] xorg-font-ttf-bitstream-vera: " Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 05/25] xorg-font-ttf-caladea: " Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 06/25] xorg-font-ttf-carlito: " Florian Bäuerle
2018-09-13 18:05 ` [ptxdist] [PATCH v3 07/25] remove xorg-font-ttf-comic-jens Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 08/25] xorg-font-ttf-dejavu: separate from xorg-fonts Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 09/25] xorg-font-ttf-hanazono: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 10/25] xorg-font-ttf-liberation: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 11/25] xorg-font-ttf-lohit-assamese: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 12/25] xorg-font-ttf-lohit-bengali: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 13/25] xorg-font-ttf-lohit-devanagari: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 14/25] xorg-font-ttf-lohit-gujarati: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 15/25] xorg-font-ttf-lohit-kannada: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 16/25] xorg-font-ttf-lohit-malayalam: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 17/25] xorg-font-ttf-lohit-oriya: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 18/25] xorg-font-ttf-lohit-punjabi: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 19/25] xorg-font-ttf-lohit-tamil-classical: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 20/25] xorg-font-ttf-lohit-tamil: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 21/25] xorg-font-ttf-lohit-telugu: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 22/25] xorg-font-ttf-noto: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 23/25] xorg-font-ttf-vlgothic: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 24/25] xorg-font-bh-ttf: " Florian Bäuerle
2018-09-13 18:06 ` [ptxdist] [PATCH v3 25/25] xorg-fonts: make all xorg-font-ttf packages tristate Florian Bäuerle
2018-08-02 8:52 ` [ptxdist] [PATCH 23/23] " Baeuerle, Florian
2018-08-02 12:10 ` Baeuerle, Florian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox