Re: [ptxdist] [PATCH v3] rules: Add fbterm

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

On Wed, Apr 04, 2012 at 10:42:32AM +0200, Bernhard Walle wrote:
> From: Bernhard Walle <walle@corscience.de>
> 
> This is a nice framebuffer terminal with support for Unicode and nice
> font rendering.
> 
> Signed-off-by: Bernhard Walle <walle@corscience.de>
> ---
> v2->v3:
>  o Check ARCH_X86 in the Makefile and not in kconfig.
> 
> v1->v2:
>  o Remove the space in "GPL v2"
>  o Add FBTERM_GPM and FBTERM_VESA.
> 
>  rules/fbterm.in   |   33 +++++++++++++++++++++++++++++
>  rules/fbterm.make |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 94 insertions(+)
>  create mode 100644 rules/fbterm.in
>  create mode 100644 rules/fbterm.make
> 
> diff --git a/rules/fbterm.in b/rules/fbterm.in
> new file mode 100644
> index 0000000..5a2553a
> --- /dev/null
> +++ b/rules/fbterm.in
> @@ -0,0 +1,33 @@
> +## SECTION=multimedia_framebuffer
> +
> +menuconfig FBTERM
> +	tristate
> +	prompt "fbterm                        "
> +	select FREETYPE
> +	select FONTCONFIG
> +	select GPM    if FBTERM_GPM
> +	select LIBX86 if FBTERM_VESA
> +	help
> +	  Framebuffer terminal. Supports unicode and uses fontconfig and Freetype
> +	  for font rendering. Thus is has support for anti-aliased fonts.
> +
> +if FBTERM
> +
> +config FBTERM_GPM
> +	bool
> +	prompt "Build fbterm with gpm support"
> +	help
> +	  If enabled, fbterm is built with console mouse support. The required
> +	  'gpm' package is automatically selected.
> +
> +config FBTERM_VESA
> +	bool
> +	prompt "Build fbterm with VESA support"
> +	help
> +	  If enabled, fbterm is built with VESA graphics support. The required
> +	  'libx86' package is automatically selected. Only available on x86
> +	  platforms.
> +
> +endif
> +
> +# vim: set ts=8 sw=8 noet ft=kconfig:
> diff --git a/rules/fbterm.make b/rules/fbterm.make
> new file mode 100644
> index 0000000..3171ca6
> --- /dev/null
> +++ b/rules/fbterm.make
> @@ -0,0 +1,61 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Bernhard Walle <walle@corscience.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_ARCH_X86)-$(PTXCONF_FBTERM) += fbterm

This is wrong. Now the whole package is only built on x86

PACKAGES-$(PTXCONF_FBTERM) += fbterm

> +
> +#
> +# Paths and names
> +#
> +FBTERM_VERSION	:= 1.7.0
> +FBTERM_MD5	:= c36bae75a450df0519b4527cccaf7572
> +FBTERM		:= fbterm-$(FBTERM_VERSION)
> +FBTERM_SUFFIX	:= tar.gz
> +FBTERM_URL	:= http://fbterm.googlecode.com/files/$(FBTERM).$(FBTERM_SUFFIX)
> +FBTERM_SOURCE	:= $(SRCDIR)/$(FBTERM).$(FBTERM_SUFFIX)
> +FBTERM_DIR	:= $(BUILDDIR)/$(FBTERM)
> +FBTERM_LICENSE	:= GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +

ifndef PTXCONF_ARCH_X86
undefine PTXCONF_FBTERM_VESA
endif

I think (untested).

Michael

> +#
> +# autoconf
> +#
> +FBTERM_CONF_TOOL	:= autoconf
> +FBTERM_AUTOCONF		:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_FBTERM_GPM)-gpm \
> +	--$(call ptx/endis, PTXCONF_FBTERM_VESA)-vesa
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/fbterm.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, fbterm)
> +	@$(call install_fixup, fbterm,PRIORITY,optional)
> +	@$(call install_fixup, fbterm,SECTION,base)
> +	@$(call install_fixup, fbterm,AUTHOR,"Bernhard Walle <walle@corscience.de>")
> +	@$(call install_fixup, fbterm,DESCRIPTION,missing)
> +
> +	@$(call install_copy, fbterm, 0, 0, 0755, \
> +		-, /usr/bin/fbterm)
> +
> +	@$(call install_finish, fbterm)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.9.6
> 
> 
> -- 
> 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