From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 6/8] vulkan-loader: version bump 1.3.231.1 -> 1.3.236.0
Date: Mon, 19 Dec 2022 12:52:30 +0100 [thread overview]
Message-ID: <20221219115232.2949240-6-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20221219115232.2949240-1-p.zabel@pengutronix.de>
Split out vulkan-headers, which has proper CMake support now.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/vulkan-loader.in | 1 +
rules/vulkan-loader.make | 45 +++++-----------------------------------
2 files changed, 6 insertions(+), 40 deletions(-)
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
--
2.30.2
next prev parent reply other threads:[~2022-12-19 11:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 11:52 [ptxdist] [PATCH 1/8] glslang: " Philipp Zabel
2022-12-19 11:52 ` [ptxdist] [PATCH 2/8] shaderc: version bump v2022.3 -> v2022.4 Philipp Zabel
2023-01-06 16:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-12-19 11:52 ` [ptxdist] [PATCH 3/8] spirv-headers: version bump 1.3.231.1 -> 1.3.236.0 Philipp Zabel
2023-01-06 16:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-12-19 11:52 ` [ptxdist] [PATCH 4/8] spirv-tools: " Philipp Zabel
2023-01-06 16:01 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-12-19 11:52 ` [ptxdist] [PATCH 5/8] vulkan-headers: new package Philipp Zabel
2023-01-06 16:01 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-12-19 11:52 ` Philipp Zabel [this message]
2023-01-06 16:01 ` [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.231.1 -> 1.3.236.0 Michael Olbrich
2022-12-19 11:52 ` [ptxdist] [PATCH 7/8] vulkan-tools: " Philipp Zabel
2023-01-06 16:01 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-12-19 11:52 ` [ptxdist] [PATCH 8/8] vulkan-validationlayers: " Philipp Zabel
2023-01-06 16:01 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-01-06 16:00 ` [ptxdist] [APPLIED] glslang: " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221219115232.2949240-6-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox