diff --git a/x11/vulkan/glslang/actions.py b/x11/vulkan/glslang/actions.py index 4c646c18cd..c2a230c194 100755 --- a/x11/vulkan/glslang/actions.py +++ b/x11/vulkan/glslang/actions.py @@ -17,8 +17,8 @@ def setup(): if get.buildTYPE() == "emul32": cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib32 \ -DBUILD_SHARED_LIBS=ON \ - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ - -DENABLE_GLSLANG_BINARIES=OFF") + -DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + # -DENABLE_GLSLANG_BINARIES=OFF else: cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \ -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ diff --git a/x11/vulkan/glslang/files/fix_spirv_backcompat.patch b/x11/vulkan/glslang/files/fix_spirv_backcompat.patch new file mode 100644 index 0000000000..df03e5a41d --- /dev/null +++ b/x11/vulkan/glslang/files/fix_spirv_backcompat.patch @@ -0,0 +1,63 @@ +From 0018771b46c492e28ca916b00eda96093381a3b2 Mon Sep 17 00:00:00 2001 +From: Juan Ramos +Date: Sat, 1 Mar 2025 10:55:31 -0800 +Subject: [PATCH] Fix spirv backcompat + +closes #3882 +--- + SPIRV/CMakeLists.txt | 5 ++--- + glslang/stub.cpp | 20 +++++++++++++++++--- + 2 files changed, 19 insertions(+), 6 deletions(-) + +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index 4b3ec1e3d5..d746839a80 100644 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -91,6 +91,7 @@ set_target_properties(SPIRV PROPERTIES + target_include_directories(SPIRV PUBLIC + $ + $) ++glslang_only_export_explicit_symbols(SPIRV) + + if (ENABLE_SPVREMAPPER) + add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) +@@ -128,9 +129,7 @@ if(GLSLANG_ENABLE_INSTALL) + install(TARGETS SPVRemapper EXPORT glslang-targets) + endif() + +- if (NOT BUILD_SHARED_LIBS) +- install(TARGETS SPIRV EXPORT glslang-targets) +- endif() ++ install(TARGETS SPIRV EXPORT glslang-targets) + + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) + endif() +diff --git a/glslang/stub.cpp b/glslang/stub.cpp +index b9aec6d15e..9c286fb909 100644 +--- a/glslang/stub.cpp ++++ b/glslang/stub.cpp +@@ -32,6 +32,20 @@ + // POSSIBILITY OF SUCH DAMAGE. + // + +-// This empty source file exists to support building stubbed versions of +-// deprecated libraries which have been integrated into the main glslang +-// library. It should be deleted once the stub libraries are fully removed. ++#ifdef GLSLANG_IS_SHARED_LIBRARY ++#ifdef _WIN32 ++#ifdef GLSLANG_EXPORTING ++#define STUB_EXPORT __declspec(dllexport) ++#else ++#define STUB_EXPORT __declspec(dllimport) ++#endif ++#endif ++#endif // GLSLANG_IS_SHARED_LIBRARY ++ ++#ifndef STUB_EXPORT ++#define STUB_EXPORT ++#endif ++ ++// Force stub library to export function to preserve backcompat. ++// https://github.com/KhronosGroup/glslang/issues/3882 ++STUB_EXPORT int stub_library_function() { return 0; } + diff --git a/x11/vulkan/glslang/pspec.xml b/x11/vulkan/glslang/pspec.xml index 851cf25546..c2a624d99e 100755 --- a/x11/vulkan/glslang/pspec.xml +++ b/x11/vulkan/glslang/pspec.xml @@ -12,15 +12,15 @@ 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/15.1.0.tar.gz + https://github.com/KhronosGroup/glslang/archive/15.2.0.tar.gz cmake - spirv-headers + spirv-headers python3-devel - spirv-tools-devel + spirv-tools-devel - + fix_spirv_backcompat.patch @@ -66,6 +66,13 @@ + + 2025-04-14 + 15.2.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 15.1.0 diff --git a/x11/vulkan/spirv-headers/pspec.xml b/x11/vulkan/spirv-headers/pspec.xml index 51aae0e8d2..6e5e81714f 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/vulkan-sdk-1.4.304.0.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz cmake @@ -30,6 +30,13 @@ + + 2025-04-14 + 1.4.309.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 1.4.304.0 diff --git a/x11/vulkan/spirv-llvm/pspec.xml b/x11/vulkan/spirv-llvm/pspec.xml index d6490e21c8..252ddea78f 100644 --- a/x11/vulkan/spirv-llvm/pspec.xml +++ b/x11/vulkan/spirv-llvm/pspec.xml @@ -12,7 +12,7 @@ library Tool and a library for bi-directional translation between SPIR-V and LLVM IR Tool and a library for bi-directional translation between SPIR-V and LLVM IR - https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v19.1.3.tar.gz + https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v19.1.6.tar.gz cmake @@ -81,6 +81,13 @@ + + 2025-04-14 + 19.1.6 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-19 19.1.3 diff --git a/x11/vulkan/spirv-tools/actions.py b/x11/vulkan/spirv-tools/actions.py index 6dbe362fab..036f843f1b 100755 --- a/x11/vulkan/spirv-tools/actions.py +++ b/x11/vulkan/spirv-tools/actions.py @@ -23,8 +23,8 @@ def setup(): -DSPIRV_TOOLS_BUILD_STATIC=OFF \ -DSPIRV_WERROR=Off \ -DSPIRV-Headers_SOURCE_DIR=/usr \ - -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ -DCMAKE_INSTALL_BINDIR=bin32") + # -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ else: cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/x11/vulkan/spirv-tools/pspec.xml b/x11/vulkan/spirv-tools/pspec.xml index b4fb960554..db50ef000e 100755 --- a/x11/vulkan/spirv-tools/pspec.xml +++ b/x11/vulkan/spirv-tools/pspec.xml @@ -13,11 +13,11 @@ 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/v2024.4.rc2.tar.gz + https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz + cmake - spirv-headers + spirv-headers python3-devel @@ -58,6 +58,13 @@ + + 2025-04-14 + 1.4.309.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 2024.4 diff --git a/x11/vulkan/spirv-tools/yedek-pspec.xml b/x11/vulkan/spirv-tools/yedek-pspec.xml new file mode 100644 index 0000000000..b4fb960554 --- /dev/null +++ b/x11/vulkan/spirv-tools/yedek-pspec.xml @@ -0,0 +1,195 @@ + + + + + spirv-tools + https://www.khronos.org/vulkan/ + + Idris Kalp + idriskalp@gmail.com + + BSD + library + 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/v2024.4.rc2.tar.gz + + cmake + spirv-headers + python3-devel + + + + + + + + spirv-tools + + /usr/bin + /usr/lib/libSPIRV-Tools* + /usr/share + /usr/share/doc + + + + + spirv-tools-32bit + emul32 + emul32 + + /usr/lib32 + + + + + spirv-tools-devel + + spirv-tools + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/lib/cmake + + + + + + 2025-01-14 + 2024.4 + Version bump. + Pisi Linux Community + admin@pisilinux.org + + + 2024-07-02 + 2024.2 + Version bump. + Pisi Linux Community + admin@pisilinux.org + + + 2024-03-18 + 2023.6 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-12-04 + 1.3.268.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-09-26 + 1.3.261.0 + Ver. Bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-04-01 + 2023.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2023-03-14 + 2023.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2022-11-27 + 2022.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2022-09-26 + 2022.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2022-07-23 + 2022.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + + + 2022-06-19 + 2022.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + + + 2022-04-21 + 2022.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2021-12-17 + 2021.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2021-10-24 + 2021.3 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + + + 2021-08-29 + 2021.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2021-06-27 + 2021.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2021-02-01 + 2020.6 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2020-07-06 + 2020.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2020-01-11 + 2019.4 + First release + Idris Kalp + idriskalp@gmail.com + + + diff --git a/x11/vulkan/vulkan-headers/pspec.xml b/x11/vulkan/vulkan-headers/pspec.xml index 2fcdb8d6f5..ca724e5107 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/refs/tags/v1.4.304.tar.gz + https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz cmake python3-devel @@ -31,6 +31,13 @@ + + 2025-04-14 + 1.4.309.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 1.4.304 diff --git a/x11/vulkan/vulkan-tools/pspec.xml b/x11/vulkan/vulkan-tools/pspec.xml index dc86dbe2b0..4b5b1e938e 100755 --- a/x11/vulkan/vulkan-tools/pspec.xml +++ b/x11/vulkan/vulkan-tools/pspec.xml @@ -13,19 +13,19 @@ 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.4.304.tar.gz + https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz libX11-devel libxcb-devel libXrandr-devel wayland-devel - vulkan-headers - vulkan-devel - vulkan-volk-devel + vulkan-headers + vulkan-devel + vulkan-volk-devel python3-devel cmake git - glslang-devel + glslang-devel wayland-server wayland-client wayland-cursor @@ -53,6 +53,13 @@ + + 2025-04-14 + 1.4.309.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 1.4.304 diff --git a/x11/vulkan/vulkan-utility-libraries/pspec.xml b/x11/vulkan/vulkan-utility-libraries/pspec.xml index 17b2e9446b..e5cf61e5b1 100644 --- a/x11/vulkan/vulkan-utility-libraries/pspec.xml +++ b/x11/vulkan/vulkan-utility-libraries/pspec.xml @@ -13,10 +13,10 @@ Vulkan Utility Libraries vulkan Vulkan Utility Libraries - https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/v1.4.304.tar.gz + https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz cmake - vulkan-headers + vulkan-headers @@ -95,6 +95,13 @@ + + 2025-04-14 + 1.4.309.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-14 1.4.304