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

vulkan ver. bump

Browse Source
This commit is contained in:
Rmys
2023-09-26 18:05:02 +03:00
parent ad5a06a460
commit d32f4f9187
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/vulkan/vulkan/actions.py
+28 -27
View File
@@ -15,7 +15,7 @@ from pisi.actionsapi import get
ver = get.srcVERSION()
def setup():
loader_opts = "-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=/share \
@@ -28,6 +28,7 @@ def setup():
-DVULKAN_HEADERS_INSTALL_DIR='/usr' \
"
validation_opts = " -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_PREFIX_PATH=/usr \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=/share \
-DCMAKE_SKIP_RPATH=True \
@@ -41,35 +42,35 @@ def setup():
-DUSE_ROBIN_HOOD_HASHING=OFF \
-DGLSLANG_INSTALL_DIR=/usr \
"
if get.buildTYPE() == "_emul32":
shelltools.export("ASFLAGS", "--32")
shelltools.export("CFLAGS", "-m32")
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-sdk-%s" %(get.workDIR(), ver))
shelltools.makedirs("build")
shelltools.cd("build")
loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
-DCMAKE_ASM_FLAGS='--32' \
"
cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.makedirs("build")
shelltools.cd("build")
# shelltools.system("../scripts/update_deps.py")
validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
"
cmaketools.configure(validation_opts, sourceDir="..")
else:
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-sdk-%s" %(get.workDIR(), ver))
shelltools.makedirs("build")
shelltools.cd("build")
shelltools.export("CC", "gcc")
@@ -77,42 +78,42 @@ def setup():
loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \
"
cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.makedirs("build")
shelltools.cd("build")
# shelltools.system("../scripts/update_deps.py")
validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
-DSPIRV_TOOLS_LIB='/usr/lib' \
-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \
-DSPIRV_TOOLS_OPT_LIB='/usr/lib' \
"
cmaketools.configure(validation_opts, sourceDir="..")
def build():
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-Loader-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-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-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-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-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("build")
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
#pisitools.dodoc("README.md", "COPYRIGHT.txt", "LICENSE.txt")
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="22fc0fbff04349fc4ad23362258f767f7b73b8d1" type="targz" name="Vulkan-Loader-1.3.246.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.246.tar.gz</Archive>
<Archive sha1sum="c0c26d593ddba4065a44db23d13d846a9195bbc6" type="targz" name="Vulkan-ValidationLayers-1.3.246.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.246.tar.gz</Archive>
<Archive sha1sum="241bfd2651738763346921adc385d0ee1d1014e6" type="targz" name="Vulkan-Loader-1.3.261.0.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/sdk-1.3.261.0.tar.gz</Archive>
<Archive sha1sum="34028a937fe13fcbb253404a24a71891b877ea6e" type="targz" name="Vulkan-ValidationLayers-1.3.261.0.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/sdk-1.3.261.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-lxml</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency versionFrom="1.3.246">vulkan-headers</Dependency>
<Dependency versionFrom="1.3.265">vulkan-headers</Dependency>
<Dependency>cmake</Dependency>
<Dependency>git</Dependency>
<Dependency versionFrom="1.3.243.0">spirv-headers</Dependency>
<Dependency versionFrom="12.1.0">glslang-devel</Dependency>
<Dependency versionFrom="1.3.261.0">spirv-headers</Dependency>
<Dependency versionFrom="13.0.0">glslang-devel</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency>
<Dependency versionFrom="2023.2">spirv-tools-devel</Dependency>
<Dependency versionFrom="1.3.261.0">spirv-tools-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">fix_shared.patch</Patch> -->
@@ -91,6 +91,13 @@
</Package>
<History>
<Update release="17">
<Date>2023-09-26</Date>
<Version>1.3.261.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2023-04-01</Date>
<Version>1.3.246</Version>