Re: [ptxdist] [PATCH v2] vulkan-tools: new package

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

On Fri, Jun 19, 2020 at 02:50:21PM +0200, Michael Olbrich wrote:
> On Fri, Jun 19, 2020 at 12:31:01PM +0200, Philipp Zabel wrote:
> > This package contains the vulkaninfo tool and the vkcube(pp) examples.
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> > Changes since v1:
> >  - added missing build dependency on XORG_LIB_X11
> > ---
> >  rules/vulkan-tools.in   | 30 +++++++++++++++++
> >  rules/vulkan-tools.make | 71 +++++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 101 insertions(+)
> >  create mode 100644 rules/vulkan-tools.in
> >  create mode 100644 rules/vulkan-tools.make
> > 
> > diff --git a/rules/vulkan-tools.in b/rules/vulkan-tools.in
> > new file mode 100644
> > index 000000000000..dcd935f53199
> > --- /dev/null
> > +++ b/rules/vulkan-tools.in
> > @@ -0,0 +1,30 @@
> > +## SECTION=multimedia_libs
> > +
> > +config VULKAN_TOOLS
> > +	tristate
> > +	prompt "vulkan-tools"
> > +	select HOST_CMAKE
> > +	select VULKAN_LOADER
> > +	select LIBXCB		if VULKAN_TOOLS_XCB
> > +	select XORG_LIB_X11	if VULKAN_TOOLS_XCB
> > +	select WAYLAND		if VULKAN_TOOLS_WAYLAND
> > +	help
> > +	  Vulkan Utilities and Tools
> > +
> > +if VULKAN_TOOLS
> > +
> > +config VULKAN_TOOLS_CUBE
> > +	bool
> > +	prompt "install vkcube"
> > +	help
> > +	  Install vkcube and vkcubepp examples.
> > +
> > +config VULKAN_TOOLS_XCB
> > +        bool
> > +        default y if VULKAN_LOADER_XCB
> > +
> > +config VULKAN_TOOLS_WAYLAND
> > +        bool
> > +        default y if VULKAN_LOADER_WAYLAND
> > +
> > +endif
> > diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
> > new file mode 100644
> > index 000000000000..927f7078d730
> > --- /dev/null
> > +++ b/rules/vulkan-tools.make
> > @@ -0,0 +1,71 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools
> > +
> > +#
> > +# Paths and names
> > +#
> > +VULKAN_TOOLS_VERSION	:= 1.2.141.0
> > +VULKAN_TOOLS_MD5	:= d74d6536dfa19a972149a5e41830249c
> > +VULKAN_TOOLS		:= vulkan-tools-$(VULKAN_TOOLS_VERSION)
> > +VULKAN_TOOLS_SUFFIX	:= tar.gz
> > +VULKAN_TOOLS_URL	:= https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
> > +VULKAN_TOOLS_SOURCE	:= $(SRCDIR)/$(VULKAN_TOOLS).$(VULKAN_TOOLS_SUFFIX)
> > +VULKAN_TOOLS_DIR	:= $(BUILDDIR)/$(VULKAN_TOOLS)
> > +VULKAN_TOOLS_LICENSE	:= Apache-2.0
> > +VULKAN_TOOLS_LICENSE_FILES := file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57
> > +
> > +# ----------------------------------------------------------------------------
> > +# Prepare
> > +# ----------------------------------------------------------------------------
> > +
> > +VULKAN_TOOLS_CONF_TOOL	:= cmake
> > +VULKAN_TOOLS_CONF_OPT	:= \
> > +	$(CROSS_CMAKE_USR) \
> > +	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
> > +	-DBUILD_CUBE=$(call ptx/onoff, PTXCONF_VULKAN_CUBE) \
> 
> PTXCONF_VULKAN_CUBE -> PTXCONF_VULKAN_TOOLS_CUBE
> 
> I'll do a fixup myself.

Now prepare fails with:

CMake Error at cube/CMakeLists.txt:208 (install):
  install TARGETS given target "vkcube" which does not exist.


CMake Error at cube/CMakeLists.txt:253 (install):
  install TARGETS given target "vkcubepp" which does not exist.

Michael

> > +	-DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, WAYLAND, \
> > +			$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, DISPLAY)) \
> > +	-DBUILD_VULKANINFO=ON \
> > +	-DBUILD_ICD=OFF \
> > +	-DINSTALL_ICD=OFF \
> > +	-DUSE_CCACHE=OFF \
> > +	-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \
> > +	-DBUILD_WSI_XLIB_SUPPORT=OFF \
> > +	-DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_WAYLAND) \
> > +	-DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/vulkan-tools.targetinstall:
> > +	@$(call targetinfo)
> > +
> > +	@$(call install_init, vulkan-tools)
> > +	@$(call install_fixup, vulkan-tools, PRIORITY, optional)
> > +	@$(call install_fixup, vulkan-tools, SECTION, base)
> > +	@$(call install_fixup, vulkan-tools, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
> > +	@$(call install_fixup, vulkan-tools, DESCRIPTION, Vulkan Utilities and Tools)
> > +
> > +ifdef VULKAN_TOOLS_CUBE
> > +	@$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcube)
> > +	@$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcubepp)
> > +endif
> > +
> > +	@$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vulkaninfo)
> > +
> > +	@$(call install_finish, vulkan-tools)
> > +
> > +	@$(call touch)
> > +
> > +# vim: syntax=make
> > -- 
> > 2.20.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de