Thanks, applied as 8362750287403c3bb1c31602931792edcb2256f4. Michael
[sent from post-receive hook] On Fri, 06 Jan 2023 17:01:02 +0100, Philipp Zabel <[email protected]> wrote: > Split out vulkan-headers, which has proper CMake support now. > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/vulkan-loader.in b/rules/vulkan-loader.in > index 646045f5f1d7..c3ad8f5a468a 100644 > --- a/rules/vulkan-loader.in > +++ b/rules/vulkan-loader.in > @@ -5,6 +5,7 @@ menuconfig VULKAN_LOADER > prompt "vulkan-loader " > select HOST_CMAKE > select HOST_QEMU > + select VULKAN_HEADERS > select LIBXCB if VULKAN_LOADER_XCB > select WAYLAND if VULKAN_LOADER_WAYLAND > help > diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make > index 9d537da6b7b9..74346807f079 100644 > --- a/rules/vulkan-loader.make > +++ b/rules/vulkan-loader.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader > # > # Paths and names > # > -VULKAN_LOADER_VERSION := 1.3.231.1 > -VULKAN_LOADER_MD5 := 1b7da12f3339204c48eafef259aad635 > +VULKAN_LOADER_VERSION := 1.3.236.0 > +VULKAN_LOADER_MD5 := ed9d0fd06898e508adb4e2bdff2c88a5 > VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION) > VULKAN_LOADER_SUFFIX := tar.gz > VULKAN_LOADER_URL := > https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX) > @@ -24,28 +24,6 @@ VULKAN_LOADER_DIR := $(BUILDDIR)/$(VULKAN_LOADER) > VULKAN_LOADER_LICENSE := Apache-2.0 > VULKAN_LOADER_LICENSE_FILES := > file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac > > -VULKAN_HEADERS_VERSION := 1.3.231.1 > -VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b > -VULKAN_HEADERS_SUFFIX := tar.gz > -VULKAN_HEADERS_URL := > https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) > -VULKAN_HEADERS_SOURCE := > $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) > -$(VULKAN_HEADERS_SOURCE) := VULKAN_HEADERS > -VULKAN_HEADERS_DIR := $(VULKAN_LOADER_DIR)/vulkan-headers > - > -VULKAN_LOADER_SOURCES := $(VULKAN_LOADER_SOURCE) > $(VULKAN_HEADERS_SOURCE) > - > -# > ---------------------------------------------------------------------------- > -# Extract > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/vulkan-loader.extract: > - @$(call targetinfo) > - @$(call clean, $(VULKAN_LOADER_DIR)) > - @$(call extract, VULKAN_LOADER) > - @$(call extract, VULKAN_HEADERS) > - @$(call patchin, VULKAN_LOADER) > - @$(call touch) > - > # > ---------------------------------------------------------------------------- > # Prepare > # > ---------------------------------------------------------------------------- > @@ -54,31 +32,18 @@ VULKAN_LOADER_CONF_TOOL := cmake > VULKAN_LOADER_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > + -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross > \ > -DBUILD_TESTS=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_LOADER_WAYLAND) \ > -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > - -DENABLE_WERROR=ON \ > + -DENABLE_WERROR=OFF \ > -DFALLBACK_CONFIG_DIRS=/etc/xdg \ > -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ > -DSYSCONFDIR= \ > - -DUSE_CCACHE=OFF \ > - -DUSE_GAS=OFF \ > - -DVulkanHeaders_INCLUDE_DIR=$(VULKAN_HEADERS_DIR)/include \ > - -DVulkanRegistry_DIR=$(VULKAN_HEADERS_DIR)/registry > - > -# > ---------------------------------------------------------------------------- > -# Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/vulkan-loader.install: > - @$(call targetinfo) > - @$(call world/install, VULKAN_LOADER) > - @cp -rp $(VULKAN_HEADERS_DIR)/include $(VULKAN_LOADER_PKGDIR)/usr > - @cp -rp $(VULKAN_HEADERS_DIR)/registry > $(VULKAN_LOADER_PKGDIR)/usr/share/vulkan > - @$(call touch) > + -DUSE_GAS=OFF > > # > ---------------------------------------------------------------------------- > # Target-Install
