Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11606 from Rmys/master

Browse Source 
vulkan-* ver. bump
This commit is contained in:
Rmys
2023-03-14 18:54:46 +03:00
committed by GitHub
parent d76fd8143e e50e83e287
commit 4c5030423c
9 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/vulkan/glslang/files/glslang-11.13.0-cmake_include_dirs.patch
+24
View File
@@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+ )
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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+)
if(ENABLE_OPT)
target_include_directories(glslangValidator
x11/vulkan/glslang/pspec.xml
+13 -3
View File
@@ -12,13 +12,16 @@
<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="8a5da853addebe077cc3217555a667ac66040bb4" type="targz">https://github.com/KhronosGroup/glslang/archive/11.12.0.tar.gz</Archive>
<Archive sha1sum="5ad0eba51577271a320c53760ca73c7cb68bb7f2" type="targz">https://github.com/KhronosGroup/glslang/archive/11.13.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency versionFrom="1.3.231.1">spirv-headers</Dependency>
<Dependency versionFrom="1.3.239.0">spirv-headers</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency versionFrom="2022.4">spirv-tools-devel</Dependency>
<Dependency versionFrom="2023.1">spirv-tools-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">glslang-11.13.0-cmake_include_dirs.patch</Patch>
</Patches>
</Source>
<Package>
@@ -54,6 +57,13 @@
</Package>
<History>
<Update release="11">
<Date>2023-03-14</Date>
<Version>11.13.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10">
<Date>2022-11-27</Date>
<Version>11.12.0</Version>
x11/vulkan/spirv-headers/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<Icon>vulkan</Icon>
<Summary>SPIR-V Headers</Summary>
<Description>SPIR-V Headers</Description>
<Archive sha1sum="a945ab61c570f4d92d7e63fc9f9458732498b2e4" type="targz" name="SPIRV-Headers-1.3.231.1.ta.gz">https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.231.1.tar.gz</Archive>
<Archive sha1sum="4af846a25044d136c0100019b117b52f4a74d6f8" type="targz" name="SPIRV-Headers-1.3.239.0.ta.gz">https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-1.3.239.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
</BuildDependencies>
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="12">
<Date>2023-03-14</Date>
<Version>1.3.239.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2022-11-27</Date>
<Version>1.3.231.1</Version>
x11/vulkan/spirv-llvm/pspec.xml
+7
View File
@@ -83,6 +83,13 @@
</Package>
<History>
<Update release="6">
<Date>2023-03-14</Date>
<Version>15.0.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2023-01-19</Date>
<Version>15.0.0</Version>
x11/vulkan/spirv-tools/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<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="3e379904ad9b8d98a44d546637d5e63a29b5b900" type="targz" name="SPIRV-Tools-2022.4.tar.gz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2022.4.tar.gz</Archive>
<Archive sha1sum="f0478402e0cee638a70384d1873b0fd8b377255a" type="targz" name="SPIRV-Tools-2023.1.tar.gz">https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2023.1.tar.gz</Archive>
<!-- <Archive sha1sum="49657f53dd391ab9dad0cb1ce47001d673a2c7ab" type="targz" target="SPIRV-Tools-2021.2">https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.4.raytracing.fixed.tar.gz</Archive> -->
<BuildDependencies>
<Dependency>cmake</Dependency>
@@ -58,6 +58,13 @@
</Package>
<History>
<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>
x11/vulkan/vulkan-headers/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<Icon>vulkan</Icon>
<Summary>Vulkan headers</Summary>
<Description>Vulkan headers</Description>
<Archive sha1sum="f695cd7c41688ce8408f62f0c756ae9c89a338fa" type="targz" name="Vulkan-Headers-1.3.235.tar.gz">https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.235.tar.gz</Archive>
<Archive sha1sum="776d26765116bcfffd9d180ce9f471f39d75c320" type="targz" name="Vulkan-Headers-1.3.243.tar.gz">https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.243.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>python3-devel</Dependency>
@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="15">
<Date>2023-03-14</Date>
<Version>1.3.243</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2022-11-27</Date>
<Version>1.3.235</Version>
x11/vulkan/vulkan-tools/pspec.xml
+24 -3
View File
@@ -13,14 +13,14 @@
<Icon>vulkan</Icon>
<Summary>Vulkan Utilities and Tools</Summary>
<Description>This project provides Khronos official Vulkan Tools and Utilities for Linux</Description>
<Archive sha1sum="d4f25a8d59ac3e22f08a6977a2f9daa7ffde2a6b" type="targz" name="Vulkan-Tools-1.3.235.tar.gz">https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.3.235.tar.gz</Archive>
<Archive sha1sum="59fda1a7cb9634886b7f29b32b93514da1632ffd" type="targz" name="Vulkan-Tools-1.3.243.tar.gz">https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.3.243.tar.gz</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency versionFrom="1.3.235">vulkan-headers</Dependency>
<Dependency versionFrom="1.3.235">vulkan-devel</Dependency>
<Dependency versionFrom="1.3.243">vulkan-headers</Dependency>
<Dependency versionFrom="1.3.243">vulkan-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>git</Dependency>
@@ -52,6 +52,27 @@
</Package>
<History>
<Update release="17">
<Date>2023-03-14</Date>
<Version>1.3.243</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2023-03-14</Date>
<Version>1.3.243</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2023-01-21</Date>
<Version>1.3.239</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2022-11-27</Date>
<Version>1.3.235</Version>
x11/vulkan/vulkan/actions.py
+4 -5
View File
@@ -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' \
x11/vulkan/vulkan/pspec.xml
+13 -6
View File
@@ -13,22 +13,22 @@
<Icon>vulkan</Icon>
<Summary>Vulkan headers, loaders and validations layers</Summary>
<Description>Vulkan headers, loaders and validations layers</Description>
<Archive sha1sum="1bdbb0335da8ced32922628af074c7eb8ecc293e" type="targz" name="Vulkan-Loader-1.3.235.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.235.tar.gz</Archive>
<Archive sha1sum="9e4a845ca934d5429d68607227b9a0066aabd4c0" type="targz" name="Vulkan-ValidationLayers-1.3.235.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.235.tar.gz</Archive>
<Archive sha1sum="b726643170b756b7a2037965b31eae953dcf5dd3" type="targz" name="Vulkan-Loader-1.3.243.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.243.tar.gz</Archive>
<Archive sha1sum="5488f29f8b477fddbba76eb6453605e91dbdc16d" type="targz" name="Vulkan-ValidationLayers-1.3.243.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.243.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-lxml</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency versionFrom="1.3.235">vulkan-headers</Dependency>
<Dependency versionFrom="1.3.243">vulkan-headers</Dependency>
<Dependency>cmake</Dependency>
<Dependency>git</Dependency>
<Dependency versionFrom="1.3.224.0">spirv-headers</Dependency>
<Dependency versionFrom="11.11.0">glslang-devel</Dependency>
<Dependency versionFrom="1.3.239.0">spirv-headers</Dependency>
<Dependency versionFrom="11.13.0">glslang-devel</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency>
<Dependency versionFrom="2022.3">spirv-tools-devel</Dependency>
<Dependency versionFrom="2023.1">spirv-tools-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">fix_shared.patch</Patch> -->
@@ -91,6 +91,13 @@
</Package>
<History>
<Update release="15">
<Date>2023-03-14</Date>
<Version>1.3.243</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2022-11-27</Date>
<Version>1.3.235</Version>