vulkan ver. bump

2025-04-14 13:23:38 +03:00
parent f9eaa833dd
commit 58bdba8428
14 changed files with 363 additions and 42 deletions
@@ -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; }
+
@@ -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>