Merge pull request #16404 from Rmys/master

vulkan ver. bump
This commit is contained in:
Rmys
2025-04-14 13:24:49 +03:00
committed by GitHub
14 changed files with 363 additions and 42 deletions
+2 -2
View File
@@ -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 \
@@ -0,0 +1,63 @@
From 0018771b46c492e28ca916b00eda96093381a3b2 Mon Sep 17 00:00:00 2001
From: Juan Ramos <github@jpr.mozmail.com>
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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+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; }
+11 -4
View File
@@ -12,15 +12,15 @@
<IsA>library</IsA>
<Summary>OpenGL and OpenGL ES shader front end and validator</Summary>
<Description>OpenGL and OpenGL ES shader front end and validator</Description>
<Archive sha1sum="ff86c6b86df3940dd895258bd35eb4206511324c" type="targz">https://github.com/KhronosGroup/glslang/archive/15.1.0.tar.gz</Archive>
<Archive sha1sum="7cd1c5ad016a6ec9f29192f1eacb9fab11aa8846" type="targz">https://github.com/KhronosGroup/glslang/archive/15.2.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency versionFrom="1.4.304.0">spirv-headers</Dependency>
<Dependency versionFrom="1.4.309.0">spirv-headers</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency versionFrom="2024.4">spirv-tools-devel</Dependency>
<Dependency versionFrom="1.4.309.0">spirv-tools-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">glslang-11.13.0-cmake_include_dirs.patch</Patch> -->
<Patch level="1">fix_spirv_backcompat.patch</Patch>
</Patches>
</Source>
@@ -66,6 +66,13 @@
</Package>
<History>
<Update release="18">
<Date>2025-04-14</Date>
<Version>15.2.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="17">
<Date>2025-01-14</Date>
<Version>15.1.0</Version>
+8 -1
View File
@@ -13,7 +13,7 @@
<Icon>vulkan</Icon>
<Summary>SPIR-V Headers</Summary>
<Description>SPIR-V Headers</Description>
<Archive sha1sum="b5e5c6aa50778e9ee6092ee752fd407130fc3094" type="targz" name="SPIRV-Headers-1.4.304.0.ta.gz">https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-1.4.304.0.tar.gz</Archive>
<Archive sha1sum="51534dac3713f969d05606bb9f5edf4a4c35137a" type="targz" name="SPIRV-Headers-1.4.309.0.ta.gz">https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
</BuildDependencies>
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="20">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="19">
<Date>2025-01-14</Date>
<Version>1.4.304.0</Version>
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Tool and a library for bi-directional translation between SPIR-V and LLVM IR</Summary>
<Description>Tool and a library for bi-directional translation between SPIR-V and LLVM IR</Description>
<Archive sha1sum="0dfcead55347e48a51e1484634801245fa94d3dd" type="targz">https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v19.1.3.tar.gz</Archive>
<Archive sha1sum="034a472f7c31de3a78c6ef87d27ad40c3a0f8591" type="targz">https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v19.1.6.tar.gz</Archive>
<BuildDependencies>
<!-- <Dependency>git</Dependency> -->
<Dependency>cmake</Dependency>
@@ -81,6 +81,13 @@
</Package>
<History>
<Update release="15">
<Date>2025-04-14</Date>
<Version>19.1.6</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="14">
<Date>2025-01-19</Date>
<Version>19.1.3</Version>
+1 -1
View File
@@ -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 \
+10 -3
View File
@@ -13,11 +13,11 @@
<Icon>vulkan</Icon>
<Summary>API and commands for processing SPIR-V modules</Summary>
<Description>API and commands for processing SPIR-V modules</Description>
<!-- <Archive sha1sum="016cde288a85b40245c0773c640f823f82b06312" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.3.296.0.tar.gz</Archive> -->
<Archive sha1sum="87fe9581bf8aa856168dac76bfcb6a9d277ac495" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc2.tar.gz</Archive>
<Archive sha1sum="759ebcc342739776b435c88dbcefd0693d66ba3b" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<!-- <Archive sha1sum="87fe9581bf8aa856168dac76bfcb6a9d277ac495" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc2.tar.gz</Archive> -->
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency versionFrom="1.4.304.0">spirv-headers</Dependency>
<Dependency versionFrom="1.4.309.0">spirv-headers</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
@@ -58,6 +58,13 @@
</Package>
<History>
<Update release="20">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="19">
<Date>2025-01-14</Date>
<Version>2024.4</Version>
+195
View File
@@ -0,0 +1,195 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>spirv-tools</Name>
<Homepage>https://www.khronos.org/vulkan/</Homepage>
<Packager>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Packager>
<License>BSD</License>
<IsA>library</IsA>
<Icon>vulkan</Icon>
<Summary>API and commands for processing SPIR-V modules</Summary>
<Description>API and commands for processing SPIR-V modules</Description>
<!-- <Archive sha1sum="016cde288a85b40245c0773c640f823f82b06312" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.3.296.0.tar.gz</Archive> -->
<Archive sha1sum="87fe9581bf8aa856168dac76bfcb6a9d277ac495" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc2.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency versionFrom="1.4.304.0">spirv-headers</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">spirv-tools-gcc11.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>spirv-tools</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/libSPIRV-Tools*</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>spirv-tools-32bit</Name>
<BuildType>emul32</BuildType>
<PartOf>emul32</PartOf>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<Package>
<Name>spirv-tools-devel</Name>
<RuntimeDependencies>
<Dependency release="current">spirv-tools</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib32/pkgconfig</Path>
<Path fileType="library">/usr/lib/cmake</Path>
</Files>
</Package>
<History>
<Update release="19">
<Date>2025-01-14</Date>
<Version>2024.4</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="18">
<Date>2024-07-02</Date>
<Version>2024.2</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="17">
<Date>2024-03-18</Date>
<Version>2023.6</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2023-12-04</Date>
<Version>1.3.268.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2023-09-26</Date>
<Version>1.3.261.0</Version>
<Comment>Ver. Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2023-04-01</Date>
<Version>2023.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="13">
<Date>2023-03-14</Date>
<Version>2023.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="12">
<Date>2022-11-27</Date>
<Version>2022.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2022-09-26</Date>
<Version>2022.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10">
<Date>2022-07-23</Date>
<Version>2022.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2022-06-19</Date>
<Version>2022.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2022-04-21</Date>
<Version>2022.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2021-12-17</Date>
<Version>2021.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2021-10-24</Date>
<Version>2021.3</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2021-08-29</Date>
<Version>2021.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2021-06-27</Date>
<Version>2021.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2021-02-01</Date>
<Version>2020.6</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2020-07-06</Date>
<Version>2020.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="1">
<Date>2020-01-11</Date>
<Version>2019.4</Version>
<Comment>First release</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
</History>
</PISI>
+8 -1
View File
@@ -13,7 +13,7 @@
<Icon>vulkan</Icon>
<Summary>Vulkan headers</Summary>
<Description>Vulkan headers</Description>
<Archive sha1sum="88a7b79fed3772b37ac7c40ab1a23bfa9854fceb" type="targz" name="Vulkan-Headers-1.4.304.tar.gz">https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v1.4.304.tar.gz</Archive>
<Archive sha1sum="d15decfe0ce9cbc26b19f832791071a3735079d6" type="targz" name="Vulkan-Headers-1.4.309.0.tar.gz">https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>python3-devel</Dependency>
@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="21">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="20">
<Date>2025-01-14</Date>
<Version>1.4.304</Version>
+12 -5
View File
@@ -13,19 +13,19 @@
<Icon>vulkan</Icon>
<Summary>Vulkan Utilities and Tools</Summary>
<Description>This project provides Khronos official Vulkan Tools and Utilities for Linux</Description>
<Archive sha1sum="8ea39fed720a0a6d77e7190b4bf7c8fa94f48d1c" type="targz" name="Vulkan-Tools-1.4.304.tar.gz">https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.4.304.tar.gz</Archive>
<Archive sha1sum="a74c1776dd5ba87e35c9686de3ec62c31126c12d" type="targz" name="Vulkan-Tools-1.4.309.0.tar.gz">https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency versionFrom="1.4.304">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.304">vulkan-devel</Dependency>
<Dependency versionFrom="1.4.304.0">vulkan-volk-devel</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-devel</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-volk-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>git</Dependency>
<Dependency versionFrom="15.1.0">glslang-devel</Dependency>
<Dependency versionFrom="15.2.0">glslang-devel</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency>
@@ -53,6 +53,13 @@
</Package>
<History>
<Update release="23">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="22">
<Date>2025-01-14</Date>
<Version>1.4.304</Version>
@@ -13,10 +13,10 @@
<Summary>Vulkan Utility Libraries</Summary>
<Icon>vulkan</Icon>
<Description>Vulkan Utility Libraries</Description>
<Archive sha1sum="b80fcffb980d510d65b91f0727e4da4bc9a05608" type="targz" name="Vulkan-Utility-Libraries-1.4.304.tar.gz">https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/v1.4.304.tar.gz</Archive>
<Archive sha1sum="e14541a0ffcc6844fef838a4edf59f742495809b" type="targz" name="Vulkan-Utility-Libraries-1.4.309.0.tar.gz">https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>vulkan-headers</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-headers</Dependency>
</BuildDependencies>
<!--
<Patches>
@@ -60,6 +60,13 @@
</Package>
<History>
<Update release="4">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2025-01-14</Date>
<Version>1.4.304</Version>
+10 -3
View File
@@ -12,11 +12,11 @@
<IsA>library</IsA>
<Summary>volk is a meta-loader for Vulkan</Summary>
<Description>volk, Vulkan için bir meta yükleyicidir</Description>
<Archive sha1sum="7fdc54442149808778ebecdf97a41fb37bf88dbe" type="targz">https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-1.4.304.0.tar.gz</Archive>
<Archive sha1sum="82163ec6bcb6ecffd4dd1b61d23e7e670079167b" type="targz">https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency versionFrom="1.4.304">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.304">vulkan-devel</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-devel</Dependency>
</BuildDependencies>
<!--
<Patches>
@@ -52,6 +52,13 @@
</Package>
<History>
<Update release="3">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2025-01-14</Date>
<Version>1.4.304.0</Version>
+12 -12
View File
@@ -49,7 +49,7 @@ def setup():
shelltools.export("CXXFLAGS", "-m32")
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-vulkan-sdk-%s" %(get.workDIR(), ver))
shelltools.makedirs("build")
shelltools.cd("build")
@@ -59,8 +59,8 @@ def setup():
cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-master" % get.workDIR())
shelltools.makedirs("build")
shelltools.cd("build")
# shelltools.system("../scripts/update_deps.py")
@@ -70,7 +70,7 @@ def setup():
cmaketools.configure(validation_opts, sourceDir="..")
else:
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-vulkan-sdk-%s" %(get.workDIR(), ver))
shelltools.makedirs("build")
shelltools.cd("build")
shelltools.export("CC", "gcc")
@@ -81,8 +81,8 @@ def setup():
cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-master" % get.workDIR())
shelltools.makedirs("build")
shelltools.cd("build")
# shelltools.system("../scripts/update_deps.py")
@@ -96,23 +96,23 @@ def setup():
cmaketools.configure(validation_opts, sourceDir="..")
def build():
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-vulkan-sdk-%s" %(get.workDIR(), ver))
shelltools.cd("build")
cmaketools.make("-j4")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-master" % get.workDIR())
shelltools.cd("build")
cmaketools.make("-j4")
def install():
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-vulkan-sdk-%s" %(get.workDIR(), ver))
shelltools.cd("build")
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-vulkan-sdk-master" % get.workDIR())
shelltools.cd("build")
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
+14 -7
View File
@@ -13,23 +13,23 @@
<Icon>vulkan</Icon>
<Summary>Vulkan headers, loaders and validations layers</Summary>
<Description>Vulkan headers, loaders and validations layers</Description>
<Archive sha1sum="4e8e180f4d10485476047b236ddeb1e3b30f9529" type="targz" name="Vulkan-Loader-1.4.304.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.4.304.tar.gz</Archive>
<Archive sha1sum="1053bee027ea2113ac74336470d3a94d35be1fb7" type="targz" name="Vulkan-ValidationLayers-1.4.304.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.4.304.tar.gz</Archive>
<Archive sha1sum="5148116e59995f57bc9426a6e5dee2535cd40bbb" type="targz" name="Vulkan-Loader-1.4.309.0.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<Archive sha1sum="9e110d37b9d708649069dcd41b407bed8f62db77" type="targz" name="Vulkan-ValidationLayers-1.4.309.0.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-lxml</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency versionFrom="1.4.304">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.304">vulkan-utility-libraries-devel</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-headers</Dependency>
<Dependency versionFrom="1.4.309.0">vulkan-utility-libraries-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>git</Dependency>
<Dependency versionFrom="1.4.304.0">spirv-headers</Dependency>
<Dependency versionFrom="15.1.0">glslang-devel</Dependency>
<Dependency versionFrom="1.4.309.0">spirv-headers</Dependency>
<Dependency versionFrom="15.2.0">glslang-devel</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency>
<Dependency versionFrom="2024.4">spirv-tools-devel</Dependency>
<Dependency versionFrom="1.4.309.0">spirv-tools-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">fix_shared.patch</Patch> -->
@@ -95,6 +95,13 @@
</Package>
<History>
<Update release="21">
<Date>2025-04-14</Date>
<Version>1.4.309.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="20">
<Date>2025-01-14</Date>
<Version>1.4.304</Version>