Re: [ptxdist] [PATCH 5/6] waffle: new package

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

On Thu, Jan 28, 2016 at 06:27:07PM +0100, Lucas Stach wrote:
> Waffle is a cross-platform C library that allows one to defer
> selection of an OpenGL API and window system until runtime.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/waffle.in   | 33 ++++++++++++++++++++++++++++++
>  rules/waffle.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+)
>  create mode 100644 rules/waffle.in
>  create mode 100644 rules/waffle.make
> 
> diff --git a/rules/waffle.in b/rules/waffle.in
> new file mode 100644
> index 000000000000..8ee10a17a716
> --- /dev/null
> +++ b/rules/waffle.in
> @@ -0,0 +1,33 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig WAFFLE
> +	tristate
> +	prompt "waffle"
> +	help
> +	  Waffle is a cross-platform C library that allows one to defer
> +	  selection of an OpenGL API and window system until runtime.
> +
> +if WAFFLE
> +
> +config WAFFLE_GLX
> +	bool
> +	prompt "GLX support"
> +	depends on LIBXCB && MESALIB_OPENGL

This does not work.

	select LIBXCB		if WAFFLE_GLX
	select MESALIB_OPENGL	if WAFFLE_GLX

Must be added to the top-level option instead. Otherwise the necessary
dependencies will be missing.

> +
> +config WAFFLE_WAYLAND
> +	bool
> +	prompt "Wayland support"
> +	depends on WAYLAND && MESALIB_EGL
> +
> +config WAFFLE_X11_EGL
> +	bool
> +	prompt "X11 EGL support"
> +	depends on LIBXCB && MESALIB_EGL
> +
> +config WAFFLE_GBM
> +	bool
> +	prompt "GBM support"
> +	depends on MESALIB_GBM && MESALIB_EGL && UDEV_LIBUDEV
> +
> +endif

The same for the other options.

> +
> diff --git a/rules/waffle.make b/rules/waffle.make
> new file mode 100644
> index 000000000000..f5f2b52b2721
> --- /dev/null
> +++ b/rules/waffle.make
> @@ -0,0 +1,60 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 by Lucas Stach <l.stach@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_WAFFLE) += waffle
> +
> +#
> +# Paths and names
> +#
> +WAFFLE_VERSION	:= 1.5.2
> +WAFFLE_MD5	:= c669c91bf2f7e13a5d781c3dbb30fd8c
> +WAFFLE		:= waffle-$(WAFFLE_VERSION)
> +WAFFLE_SUFFIX	:= tar.xz
> +WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
> +WAFFLE_SOURCE	:= $(SRCDIR)/$(WAFFLE).$(WAFFLE_SUFFIX)
> +WAFFLE_DIR	:= $(BUILDDIR)/$(WAFFLE)
> +WAFFLE_LICENSE	:= BSD

Use the correct SPDX identifier
BSD-2-Clause / BSD-3-Clause / BSD-4-Clause

Michael

> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +WAFFLE_CONF_TOOL	:= cmake
> +WAFFLE_CONF_OPT	:= \
> +	$(CROSS_CMAKE_USR) \
> +	-Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
> +	-Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
> +	-Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
> +	-Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
> +
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/waffle.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, waffle)
> +	@$(call install_fixup, waffle,PRIORITY,optional)
> +	@$(call install_fixup, waffle,SECTION,base)
> +	@$(call install_fixup, waffle,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
> +	@$(call install_fixup, waffle,DESCRIPTION,missing)
> +
> +	@$(call install_lib, waffle, 0, 0, 0644, libwaffle-1)
> +
> +	@$(call install_finish, waffle)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.7.0.rc3
> 
> 
> _______________________________________________
> 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