Vulkan tools: use upstream pkg

libretro · Mar 29, 2024 · bc4936f · bc4936f
1 parent 89fe7e9
commit bc4936f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="97cbe660c066eb5b00a2f33b501f7cd0baaf8996b997fcba185ce298c8835fed"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain vulkan-loader glslang:host"
+PKG_DEPENDS_TARGET="toolchain volk vulkan-loader glslang:host Python3:host"
 PKG_LONGDESC="This project provides Khronos official Vulkan Tools and Utilities."
 
 configure_package() {
@@ -24,24 +24,27 @@ pre_configure_target() {
   PKG_CMAKE_OPTS_TARGET="-DVULKAN_HEADERS_INSTALL_DIR=${SYSROOT_PREFIX}/usr \
                          -DBUILD_VULKANINFO=ON \
                          -DBUILD_ICD=OFF \
-                         -DINSTALL_ICD=OFF \
                          -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
+                         -DPython3_EXECUTABLE=${TOOLCHAIN}/bin/python3 \
                          -Wno-dev"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DCOMPILE_CUBE_SHADERS=ON \
                              -DBUILD_WSI_XCB_SUPPORT=ON \
                              -DBUILD_WSI_XLIB_SUPPORT=ON \
                              -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
                              -DCUBE_WSI_SELECTION=XCB"
   elif [ "${DISPLAYSERVER}" = "wl" ]; then
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DCOMPILE_CUBE_SHADERS=ON \
                              -DBUILD_WSI_XCB_SUPPORT=OFF \
                              -DBUILD_WSI_XLIB_SUPPORT=OFF \
                              -DBUILD_WSI_WAYLAND_SUPPORT=ON
                              -DCUBE_WSI_SELECTION=WAYLAND"
   else
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
+                             -DCOMPILE_CUBE_SHADERS=ON \
                              -DBUILD_WSI_XCB_SUPPORT=OFF \
                              -DBUILD_WSI_XLIB_SUPPORT=OFF \
                              -DBUILD_WSI_WAYLAND_SUPPORT=OFF \

diff --git a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
@@ -11,16 +11,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 422b7d2cc..d123c9dc5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,6 +41,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- option(BUILD_CUBE "Build cube" ON)
- option(BUILD_VULKANINFO "Build vulkaninfo" ON)
- option(BUILD_ICD "Build icd" ON)
+@@ -47,6 +47,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+         add_link_options(-fsanitize=address)
+     endif()
+ endif()
 +option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
 +option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
 +option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
 +option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
 +set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DIRECTFB, DISPLAY)")
-+
- # Installing the Mock ICD to system directories is probably not desired since this ICD is not a very complete implementation.
- # Require the user to ask that it be installed if they really want it.
- option(INSTALL_ICD "Install icd" OFF)
+
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+