mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts
Date: Tue, 4 Sep 2018 11:34:25 +0200	[thread overview]
Message-ID: <20180904093425.xed4ycescfc7vq7z@pengutronix.de> (raw)
In-Reply-To: <20180807124109.4964-1-florian.baeuerle@allegion.com>

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

  parent reply	other threads:[~2018-09-04  9:34 UTC|newest]

Thread overview: 109+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-01 18:31 [ptxdist] [PATCH " 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           ` Michael Olbrich [this message]
2018-09-04 10:47             ` [ptxdist] [PATCH v2 01/23] xorg-font-ttf-android: isolate from xorg-fonts 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180904093425.xed4ycescfc7vq7z@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox