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
2022-09-29 16:42:16 +03:00
committed by GitHub
parent c215893aab
commit e0ad201ede
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/vulkan/vulkan/actions.py
+14 -9
View File
@@ -24,7 +24,7 @@ def setup():
-DBUILD_WSI_XCB_SUPPORT=On \ -DBUILD_WSI_XCB_SUPPORT=On \
-DBUILD_WSI_XLIB_SUPPORT=On \ -DBUILD_WSI_XLIB_SUPPORT=On \
-DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_WSI_WAYLAND_SUPPORT=On \
-DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \
-DVULKAN_HEADERS_INSTALL_DIR='/usr' \ -DVULKAN_HEADERS_INSTALL_DIR='/usr' \
" "
validation_opts = " -DCMAKE_INSTALL_SYSCONFDIR=/etc \ validation_opts = " -DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -36,7 +36,7 @@ def setup():
-DBUILD_WSI_XCB_SUPPORT=On \ -DBUILD_WSI_XCB_SUPPORT=On \
-DBUILD_WSI_XLIB_SUPPORT=On \ -DBUILD_WSI_XLIB_SUPPORT=On \
-DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_WSI_WAYLAND_SUPPORT=On \
-DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \
-DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_LAYER_SUPPORT_FILES=ON \
-DSPIRV_TOOLS_INSTALL_DIR='/usr' \ -DSPIRV_TOOLS_INSTALL_DIR='/usr' \
-DUSE_ROBIN_HOOD_HASHING=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \
@@ -59,7 +59,8 @@ def setup():
cmaketools.configure(loader_opts, sourceDir="..") cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) # shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
#shelltools.system("../scripts/update_deps.py") #shelltools.system("../scripts/update_deps.py")
@@ -72,14 +73,16 @@ def setup():
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
shelltools.export("CC", "gcc")
shelltools.export("CXX", "g++")
loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \ loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \ -DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \
" "
cmaketools.configure(loader_opts, sourceDir="..") cmaketools.configure(loader_opts, sourceDir="..")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) # shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
#shelltools.system("../scripts/update_deps.py") #shelltools.system("../scripts/update_deps.py")
@@ -95,11 +98,12 @@ def setup():
def build(): def build():
shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
shelltools.cd("build") shelltools.cd("build")
cmaketools.make("-j1") cmaketools.make("-j4")
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) # shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("build") shelltools.cd("build")
cmaketools.make("-j1") cmaketools.make("-j4")
def install(): def install():
@@ -107,7 +111,8 @@ def install():
shelltools.cd("build") shelltools.cd("build")
autotools.rawInstall("DESTDIR=%s" %get.installDIR()) autotools.rawInstall("DESTDIR=%s" %get.installDIR())
shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) # shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("build") shelltools.cd("build")
autotools.rawInstall("DESTDIR=%s" %get.installDIR()) autotools.rawInstall("DESTDIR=%s" %get.installDIR())
x11/vulkan/vulkan/pspec.xml
+5 -2
View File
@@ -14,7 +14,7 @@
<Summary>Vulkan headers, loaders and validations layers</Summary> <Summary>Vulkan headers, loaders and validations layers</Summary>
<Description>Vulkan headers, loaders and validations layers</Description> <Description>Vulkan headers, loaders and validations layers</Description>
<Archive sha1sum="a758d1b05bb76f50d8655d05fbbd3b8061d86686" type="targz" name="Vulkan-Loader-1.3.229.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.229.tar.gz</Archive> <Archive sha1sum="a758d1b05bb76f50d8655d05fbbd3b8061d86686" type="targz" name="Vulkan-Loader-1.3.229.tar.gz">https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.229.tar.gz</Archive>
<Archive sha1sum="1bae9c0ec753523312012954915f95d8a1645de1" type="targz" name="Vulkan-ValidationLayers-1.3.229.tar.gz">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.229.tar.gz</Archive> <Archive sha1sum="d08ab93955f675901839ebeee537afcc3e05024b" type="zip" name="Vulkan-ValidationLayers-1.3.229.zip">https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/heads/master.zip</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>python3-lxml</Dependency> <Dependency>python3-lxml</Dependency>
<Dependency>libX11-devel</Dependency> <Dependency>libX11-devel</Dependency>
@@ -28,8 +28,11 @@
<Dependency>wayland-server</Dependency> <Dependency>wayland-server</Dependency>
<Dependency>wayland-client</Dependency> <Dependency>wayland-client</Dependency>
<Dependency>wayland-cursor</Dependency> <Dependency>wayland-cursor</Dependency>
<Dependency versionFrom="2022.3">spirv-tools-devel</Dependency> <Dependency versionFrom="2022.2">spirv-tools-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches>
<!-- <Patch level="1">fix_shared.patch</Patch> -->
</Patches>
</Source> </Source>
<Package> <Package>