diff --git a/packages/graphics/vulkan/vulkan-headers/package.mk b/packages/graphics/vulkan/vulkan-headers/package.mk index 7327104941..a5f467b01e 100644 --- a/packages/graphics/vulkan/vulkan-headers/package.mk +++ b/packages/graphics/vulkan/vulkan-headers/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vulkan-headers" -PKG_VERSION="1.3.231" -PKG_SHA256="4cb1c0aeb858e1a4955a736b86b0da8511ca8701222e9a252adcf093d40a8d28" +PKG_VERSION="1.3.232" +PKG_SHA256="b2eedd01c22bc42ea269fa10a2af7e480d7b0f35df4d821c76dda3444229419f" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers" PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/graphics/vulkan/vulkan-loader/package.mk b/packages/graphics/vulkan/vulkan-loader/package.mk index d88f7c2684..5e6da5b37d 100644 --- a/packages/graphics/vulkan/vulkan-loader/package.mk +++ b/packages/graphics/vulkan/vulkan-loader/package.mk @@ -3,21 +3,15 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vulkan-loader" -PKG_VERSION="1.3.231" -PKG_SHA256="02e185b939635167ea8f8815f8daab76af36923a3b995951fe6a5d3e25c55bf7" +PKG_VERSION="1.3.232" +PKG_SHA256="3e30621aea870bfe12227018e73926d4bfacb46b0b207553eb2ebd966df1b202" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader" PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="toolchain:host vulkan-headers:host" -PKG_DEPENDS_TARGET="toolchain vulkan-headers" +PKG_DEPENDS_TARGET="toolchain Python3:host vulkan-headers" PKG_LONGDESC="Vulkan Installable Client Driver (ICD) Loader." configure_package() { - # Builds asm_offset binary for GAS / GNU Assembler - if [ "${ARCH}" != "arm" ]; then - PKG_DEPENDS_TARGET+=" vulkan-loader:host" - fi - # Displayserver Support if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" libxcb libX11" @@ -26,21 +20,6 @@ configure_package() { fi } -pre_configure_host() { - PKG_CMAKE_OPTS_HOST="-DBUILD_WSI_XCB_SUPPORT=OFF \ - -DBUILD_WSI_XLIB_SUPPORT=OFF \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DBUILD_TESTS=OFF" - - # Hack to workaround missing options to build a standalone asm_offset binary, - # if the glibc version of the host & target system differs build will fail otherwise. - sed -e 's|COMMAND asm_offset GAS|COMMAND ./asm_offset GAS|g' -i ${PKG_BUILD}/loader/CMakeLists.txt -} - -makeinstall_host() { - cp ${PKG_BUILD}/.${HOST_NAME}/loader/asm_offset ${TOOLCHAIN}/bin/ -} - pre_configure_target() { PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTS=OFF" @@ -62,7 +41,4 @@ pre_configure_target() { -DBUILD_WSI_XLIB_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF" fi - - # Hack to run asm_offset located at toolchain path - sed -e 's|COMMAND ./asm_offset GAS|COMMAND asm_offset GAS|g' -i ${PKG_BUILD}/loader/CMakeLists.txt } diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk index 69d4fceed2..2a130b1bf6 100644 --- a/packages/graphics/vulkan/vulkan-tools/package.mk +++ b/packages/graphics/vulkan/vulkan-tools/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vulkan-tools" -PKG_VERSION="1.3.231" -PKG_SHA256="379547b11eb65638cf5d83b260827a7b2dbfa7f31ef4002f8bfdca7bf3c89a8f" +PKG_VERSION="1.3.232" +PKG_SHA256="6c850c21cc70405d553a7890e954995b45a29f05ec3da31ba92ddbf7af886ca9" 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" @@ -21,7 +21,8 @@ configure_package() { } pre_configure_target() { - PKG_CMAKE_OPTS_TARGET="-DBUILD_VULKANINFO=ON \ + 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 \