mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [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

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