jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8170 from heitbaum/vulkan

Browse Source 
Vulkan update to 1.3.265
This commit is contained in:
Christian Hewitt 2023-09-28 23:36:54 +04:00 committed by GitHub
commit 6ac9e6595b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/graphics/vulkan/vulkan-headers/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-headers" PKG_NAME="vulkan-headers"
PKG_VERSION="1.3.264" PKG_VERSION="1.3.265"
PKG_SHA256="bdce6a99f0e5869a341946ee0a92eef270ef9b4b106e82f238aa68aeb2cd4995" PKG_SHA256="24076540521da1eceecfb56235cb0361a01fb24a306cbefe874c949bf2d2e9a4"
PKG_LICENSE="Apache-2.0" PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers" PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers"
PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz"

4
packages/graphics/vulkan/vulkan-loader/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-loader" PKG_NAME="vulkan-loader"
PKG_VERSION="1.3.264" PKG_VERSION="1.3.265"
PKG_SHA256="34c712e49d23952ece9509b945fc7fc9c1c68700ab805c42558bf30e193a665a" PKG_SHA256="fffca4a5e6daf3bbe18585f96bf7cad8cf173ebf3fa4d00b755108bd0b129bd8"
PKG_LICENSE="Apache-2.0" PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader" PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader"
PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz"

8
packages/graphics/vulkan/vulkan-tools/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-tools" PKG_NAME="vulkan-tools"
PKG_VERSION="1.3.264" PKG_VERSION="1.3.265"
PKG_SHA256="711e1b00436e5ce59e255c91fa531c0cfd09967cddf4e23fcd76c05b9773c1dd" PKG_SHA256="f212a0f7f5b5adc5b64acc060e461a48e0c3cf6a0984a9f5b0621db52d02d133"
PKG_LICENSE="Apache-2.0" PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools" PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"
@ -24,25 +24,27 @@ pre_configure_target() {
PKG_CMAKE_OPTS_TARGET="-DVULKAN_HEADERS_INSTALL_DIR=${SYSROOT_PREFIX}/usr \ PKG_CMAKE_OPTS_TARGET="-DVULKAN_HEADERS_INSTALL_DIR=${SYSROOT_PREFIX}/usr \
-DBUILD_VULKANINFO=ON \ -DBUILD_VULKANINFO=ON \
-DBUILD_ICD=OFF \ -DBUILD_ICD=OFF \
-DINSTALL_ICD=OFF \
-DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
-DPython3_EXECUTABLE=${TOOLCHAIN}/bin/python3 \ -DPython3_EXECUTABLE=${TOOLCHAIN}/bin/python3 \
-Wno-dev" -Wno-dev"
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \ PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
-DCOMPILE_CUBE_SHADERS=ON \
-DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \
-DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \
-DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-DCUBE_WSI_SELECTION=XCB" -DCUBE_WSI_SELECTION=XCB"
elif [ "${DISPLAYSERVER}" = "wl" ]; then elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \ PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
-DCOMPILE_CUBE_SHADERS=ON \
-DBUILD_WSI_XCB_SUPPORT=OFF \ -DBUILD_WSI_XCB_SUPPORT=OFF \
-DBUILD_WSI_XLIB_SUPPORT=OFF \ -DBUILD_WSI_XLIB_SUPPORT=OFF \
-DBUILD_WSI_WAYLAND_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON
-DCUBE_WSI_SELECTION=WAYLAND" -DCUBE_WSI_SELECTION=WAYLAND"
else else
PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \ PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
-DCOMPILE_CUBE_SHADERS=ON \
-DBUILD_WSI_XCB_SUPPORT=OFF \ -DBUILD_WSI_XCB_SUPPORT=OFF \
-DBUILD_WSI_XLIB_SUPPORT=OFF \ -DBUILD_WSI_XLIB_SUPPORT=OFF \
-DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \

9
packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
View File

@ -11,7 +11,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 422b7d2cc..d123c9dc5 100644 index 422b7d2cc..d123c9dc5 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -41,6 +41,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -34,6 +34,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
option(BUILD_CUBE "Build cube" ON) option(BUILD_CUBE "Build cube" ON)
option(BUILD_VULKANINFO "Build vulkaninfo" ON) option(BUILD_VULKANINFO "Build vulkaninfo" ON)
option(BUILD_ICD "Build icd" ON) option(BUILD_ICD "Build icd" ON)
@ -20,7 +20,6 @@ index 422b7d2cc..d123c9dc5 100644
+option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON) +option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
+option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF) +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)") +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. if (UNIX AND NOT APPLE) # i.e. Linux
# Require the user to ask that it be installed if they really want it. option(ENABLE_ADDRESS_SANITIZER "Use addres sanitization" OFF)
option(INSTALL_ICD "Install icd" OFF)

68
packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
View File

@ -1,68 +0,0 @@
From a1894dc9f650ab94fb7e348e1b06ee75a1e9728b Mon Sep 17 00:00:00 2001
From: SupervisedThinking <supervisedthinking@gmail.com>
Date: Sat, 20 Nov 2021 18:39:04 +0100
Subject: [PATCH] CMakeLists: updated glslangValidator logik
---
cube/CMakeLists.txt | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
index d59eb4366..a684fc4f0 100644
--- a/cube/CMakeLists.txt
+++ b/cube/CMakeLists.txt
@@ -26,27 +26,38 @@ endif()
if(GLSLANG_INSTALL_DIR)
message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator")
find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin")
+
else()
find_package(Python3 REQUIRED QUIET)
set(GLSLANG_VALIDATOR_NAME "glslangValidator")
- message(STATUS "Using cmake find_program to look for glslangValidator")
- if(WIN32)
- execute_process(
- COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
- set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
- elseif(APPLE)
- execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
- elseif(UNIX AND NOT APPLE) # i.e. Linux
- execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
- endif()
- if (WIN32)
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
- elseif(APPLE)
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
+ message(CHECK_START "Looking for glslangValidator")
+ find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
+ if(GLSLANG_VALIDATOR)
+ message(CHECK_PASS ${GLSLANG_VALIDATOR})
else()
- set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
+ if(WIN32)
+ execute_process(
+ COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
+ set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
+ elseif(APPLE)
+ execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
+ elseif(UNIX AND NOT APPLE) # i.e. Linux
+ execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
+ endif()
+ if (WIN32)
+ set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
+ elseif(APPLE)
+ set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
+ else()
+ set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
+ endif()
+ find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
+ if(GLSLANG_VALIDATOR)
+ message(CHECK_PASS ${GLSLANG_VALIDATOR})
+ else()
+ message(FATAL_ERROR "no glslangValidator binary found")
+ endif()
endif()
- find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
endif()
if(UNIX AND NOT APPLE) # i.e. Linux