Re: [ptxdist] [PATCH 3/7] poppler-data: new package: optional encoding data for poppler

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Aug 24, 2017 at 12:39:07AM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
> ---
>  rules/poppler-data.in   | 10 +++++++
>  rules/poppler-data.make | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 89 insertions(+)
>  create mode 100644 rules/poppler-data.in
>  create mode 100644 rules/poppler-data.make
> 
> diff --git a/rules/poppler-data.in b/rules/poppler-data.in
> new file mode 100644
> index 000000000..61796949e
> --- /dev/null
> +++ b/rules/poppler-data.in
> @@ -0,0 +1,10 @@
> +## SECTION=multimedia_gtk
> +
> +config POPPLER_DATA
> +	tristate
> +	prompt "poppler-data"
> +	help
> +	  Encoding data which enables poppler to correctly render CJK and
> +	  Cyrillic languages.
> +
> +# vim: ft=kconfig ts=8 noet tw=80
> diff --git a/rules/poppler-data.make b/rules/poppler-data.make
> new file mode 100644
> index 000000000..2b51a61a9
> --- /dev/null
> +++ b/rules/poppler-data.make
> @@ -0,0 +1,79 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2017 by Roland Hieber <r.hieber@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_POPPLER_DATA) += poppler-data
> +
> +#
> +# Paths and names
> +#
> +POPPLER_DATA_VERSION	:= 0.4.7
> +POPPLER_DATA_MD5	:= 636a8f2b9f6df9e7ced8ec0946961eaf
> +POPPLER_DATA		:= poppler-data-$(POPPLER_DATA_VERSION)
> +POPPLER_DATA_SUFFIX	:= tar.gz
> +POPPLER_DATA_URL	:= https://poppler.freedesktop.org/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
> +POPPLER_DATA_SOURCE	:= $(SRCDIR)/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
> +POPPLER_DATA_DIR	:= $(BUILDDIR)/$(POPPLER_DATA)
> +POPPLER_DATA_LICENSE	:= GPL-2.0 AND MIT AND BSD-3-Clause
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +POPPLER_DATA_CONF_TOOL	:= NO
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/poppler-data.compile:
> +	@$(call targetinfo)
> +	@$(call touch)

What's the default make target? If it's not harmful then just use the
default compile stage.

> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +POPPLER_DATA_INSTALL_OPT := prefix=/usr install
> +
> +$(STATEDIR)/poppler-data.install:
> +	@$(call targetinfo)
> +	@$(call world/install, POPPLER_DATA)
> +	@$(call touch)

I think, this can be removed, right? Just setting the opts should be enough.

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/poppler-data.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, poppler-data)
> +	@$(call install_fixup, poppler-data,PRIORITY,optional)
> +	@$(call install_fixup, poppler-data,SECTION,base)
> +	@$(call install_fixup, poppler-data,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>")
> +	@$(call install_fixup, poppler-data,DESCRIPTION,missing)
> +
> +	@$(call install_tree, poppler-data, 0, 0, -, /usr/share/poppler)
> +
> +	@$(call install_finish, poppler-data)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/poppler-data.clean:
> +#	@$(call targetinfo)
> +#	@$(call clean_pkg, POPPLER_DATA)

remove.

Michael

> +
> +# vim: ft=make ts=8 tw=80
> -- 
> 2.11.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