From e50e83e28738388bac4abb2500662f28785c3805 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 14 Mar 2023 18:52:12 +0300 Subject: [PATCH] vulkan-* ver. bump --- .../glslang-11.13.0-cmake_include_dirs.patch | 24 +++++++++++++++++ x11/vulkan/glslang/pspec.xml | 16 ++++++++--- x11/vulkan/spirv-headers/pspec.xml | 9 ++++++- x11/vulkan/spirv-llvm/pspec.xml | 7 +++++ x11/vulkan/spirv-tools/pspec.xml | 9 ++++++- x11/vulkan/vulkan-headers/pspec.xml | 9 ++++++- x11/vulkan/vulkan-tools/pspec.xml | 27 ++++++++++++++++--- x11/vulkan/vulkan/actions.py | 9 +++---- x11/vulkan/vulkan/pspec.xml | 19 ++++++++----- 9 files changed, 109 insertions(+), 20 deletions(-) create mode 100644 x11/vulkan/glslang/files/glslang-11.13.0-cmake_include_dirs.patch diff --git a/x11/vulkan/glslang/files/glslang-11.13.0-cmake_include_dirs.patch b/x11/vulkan/glslang/files/glslang-11.13.0-cmake_include_dirs.patch new file mode 100644 index 0000000000..f9bf8fb95c --- /dev/null +++ b/x11/vulkan/glslang/files/glslang-11.13.0-cmake_include_dirs.patch @@ -0,0 +1,24 @@ +diff -ruN a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +--- a/SPIRV/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 ++++ b/SPIRV/CMakeLists.txt 2022-12-16 12:15:03.231070779 +0100 +@@ -100,7 +100,7 @@ + target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) + target_include_directories(SPIRV PUBLIC + $ +- $) ++ ) + else() + target_link_libraries(SPIRV PRIVATE MachineIndependent) + endif() +diff -ruN a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +--- a/StandAlone/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 ++++ b/StandAlone/CMakeLists.txt 2022-12-16 12:15:20.527812776 +0100 +@@ -83,7 +83,7 @@ + target_link_libraries(glslangValidator ${LIBRARIES}) + target_include_directories(glslangValidator PUBLIC + $ +- $) ++) + + if(ENABLE_OPT) + target_include_directories(glslangValidator diff --git a/x11/vulkan/glslang/pspec.xml b/x11/vulkan/glslang/pspec.xml index 5fadc385b6..141f38af2d 100755 --- a/x11/vulkan/glslang/pspec.xml +++ b/x11/vulkan/glslang/pspec.xml @@ -12,13 +12,16 @@ library OpenGL and OpenGL ES shader front end and validator OpenGL and OpenGL ES shader front end and validator - https://github.com/KhronosGroup/glslang/archive/11.12.0.tar.gz + https://github.com/KhronosGroup/glslang/archive/11.13.0.tar.gz cmake - spirv-headers + spirv-headers python3-devel - spirv-tools-devel + spirv-tools-devel + + glslang-11.13.0-cmake_include_dirs.patch + @@ -54,6 +57,13 @@ + + 2023-03-14 + 11.13.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 11.12.0 diff --git a/x11/vulkan/spirv-headers/pspec.xml b/x11/vulkan/spirv-headers/pspec.xml index 13d660ba11..1734231f14 100755 --- a/x11/vulkan/spirv-headers/pspec.xml +++ b/x11/vulkan/spirv-headers/pspec.xml @@ -13,7 +13,7 @@ vulkan SPIR-V Headers SPIR-V Headers - https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.231.1.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.239.0.tar.gz cmake @@ -30,6 +30,13 @@ + + 2023-03-14 + 1.3.239.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 1.3.231.1 diff --git a/x11/vulkan/spirv-llvm/pspec.xml b/x11/vulkan/spirv-llvm/pspec.xml index 76ff11cbd4..120231cb0e 100644 --- a/x11/vulkan/spirv-llvm/pspec.xml +++ b/x11/vulkan/spirv-llvm/pspec.xml @@ -83,6 +83,13 @@ + + 2023-03-14 + 15.0.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-01-19 15.0.0 diff --git a/x11/vulkan/spirv-tools/pspec.xml b/x11/vulkan/spirv-tools/pspec.xml index 8ba46577c3..b34f5925e4 100755 --- a/x11/vulkan/spirv-tools/pspec.xml +++ b/x11/vulkan/spirv-tools/pspec.xml @@ -13,7 +13,7 @@ vulkan API and commands for processing SPIR-V modules API and commands for processing SPIR-V modules - https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2022.4.tar.gz + https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2023.1.tar.gz cmake @@ -58,6 +58,13 @@ + + 2023-03-14 + 2023.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 2022.4 diff --git a/x11/vulkan/vulkan-headers/pspec.xml b/x11/vulkan/vulkan-headers/pspec.xml index 87c3808bab..ea4dbc6066 100755 --- a/x11/vulkan/vulkan-headers/pspec.xml +++ b/x11/vulkan/vulkan-headers/pspec.xml @@ -13,7 +13,7 @@ vulkan Vulkan headers Vulkan headers - https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.235.tar.gz + https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.243.tar.gz cmake python3-devel @@ -31,6 +31,13 @@ + + 2023-03-14 + 1.3.243 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 1.3.235 diff --git a/x11/vulkan/vulkan-tools/pspec.xml b/x11/vulkan/vulkan-tools/pspec.xml index a5479ca68a..ec1467acb6 100755 --- a/x11/vulkan/vulkan-tools/pspec.xml +++ b/x11/vulkan/vulkan-tools/pspec.xml @@ -13,14 +13,14 @@ vulkan Vulkan Utilities and Tools This project provides Khronos official Vulkan Tools and Utilities for Linux - https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.3.235.tar.gz + https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.3.243.tar.gz libX11-devel libxcb-devel libXrandr-devel wayland-devel - vulkan-headers - vulkan-devel + vulkan-headers + vulkan-devel python3-devel cmake git @@ -52,6 +52,27 @@ + + 2023-03-14 + 1.3.243 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-03-14 + 1.3.243 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-01-21 + 1.3.239 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 1.3.235 diff --git a/x11/vulkan/vulkan/actions.py b/x11/vulkan/vulkan/actions.py index 4cae6c9024..0bbddc3819 100755 --- a/x11/vulkan/vulkan/actions.py +++ b/x11/vulkan/vulkan/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Licensed under the GNU General Public License, version 3. +# Licensed under the GNU General Public License, verion 3. # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import cmaketools @@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import pisitools from pisi.actionsapi import get -pisitools.cxxflags.add("-std=gnu++11") +# pisitools.cxxflags.add("-std=gnu++11") ver = get.srcVERSION() @@ -38,7 +38,6 @@ def setup(): -DBUILD_WSI_WAYLAND_SUPPORT=On \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DBUILD_LAYER_SUPPORT_FILES=ON \ - -DSPIRV_TOOLS_INSTALL_DIR='/usr' \ -DUSE_ROBIN_HOOD_HASHING=OFF \ -DGLSLANG_INSTALL_DIR=/usr \ " @@ -63,7 +62,7 @@ def setup(): # shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR()) shelltools.makedirs("build") shelltools.cd("build") - #shelltools.system("../scripts/update_deps.py") + # shelltools.system("../scripts/update_deps.py") validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \ " @@ -85,7 +84,7 @@ def setup(): # shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR()) shelltools.makedirs("build") shelltools.cd("build") - #shelltools.system("../scripts/update_deps.py") + # shelltools.system("../scripts/update_deps.py") validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \ -DSPIRV_TOOLS_LIB='/usr/lib' \ diff --git a/x11/vulkan/vulkan/pspec.xml b/x11/vulkan/vulkan/pspec.xml index 5642161a1b..eac9e05643 100755 --- a/x11/vulkan/vulkan/pspec.xml +++ b/x11/vulkan/vulkan/pspec.xml @@ -13,22 +13,22 @@ vulkan Vulkan headers, loaders and validations layers Vulkan headers, loaders and validations layers - https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.235.tar.gz - https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.235.tar.gz + https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.243.tar.gz + https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.243.tar.gz python3-lxml libX11-devel libXrandr-devel wayland-devel - vulkan-headers + vulkan-headers cmake git - spirv-headers - glslang-devel + spirv-headers + glslang-devel wayland-server wayland-client wayland-cursor - spirv-tools-devel + spirv-tools-devel @@ -91,6 +91,13 @@ + + 2023-03-14 + 1.3.243 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-27 1.3.235