From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 19 Dec 2022 12:53:10 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1p7Ehj-001WwT-4z for lore@lore.pengutronix.de; Mon, 19 Dec 2022 12:53:10 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1p7Ehg-0005Ne-RQ; Mon, 19 Dec 2022 12:53:08 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1p7EhT-0004l0-OX; Mon, 19 Dec 2022 12:52:55 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Mon, 19 Dec 2022 12:52:30 +0100 Message-Id: <20221219115232.2949240-6-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221219115232.2949240-1-p.zabel@pengutronix.de> References: <20221219115232.2949240-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 6/8] vulkan-loader: version bump 1.3.231.1 -> 1.3.236.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Split out vulkan-headers, which has proper CMake support now. Signed-off-by: Philipp Zabel --- 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