From eeea3dba28b16057ea7e927d973d7ca14680682a Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 18 Nov 2021 22:29:45 +0200 Subject: [PATCH] vulkan-tools rebuild --- x11/vulkan/vulkan-tools/actions.py | 33 +++++++++++++++++------------- x11/vulkan/vulkan-tools/pspec.xml | 3 +-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/x11/vulkan/vulkan-tools/actions.py b/x11/vulkan/vulkan-tools/actions.py index db352e8dcc..e215ed5248 100755 --- a/x11/vulkan/vulkan-tools/actions.py +++ b/x11/vulkan/vulkan-tools/actions.py @@ -15,23 +15,28 @@ pisitools.cxxflags.add("-std=gnu++11") ver = get.srcVERSION() def setup(): - cmaketools.configure("-DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_SKIP_RPATH=True \ - -DBUILD_WSI_XCB_SUPPORT=On \ - -DBUILD_WSI_XLIB_SUPPORT=On \ - -DBUILD_WSI_WAYLAND_SUPPORT=On \ - -DBUILD_CUBE=ON \ - -DBUILD_VULKANINFO=ON \ - -DBUILD_ICD=OFF \ - ") + shelltools.makedirs("build") + shelltools.cd("build") + cmaketools.configure("-DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_SKIP_RPATH=True \ + -DBUILD_WSI_XCB_SUPPORT=On \ + -DBUILD_WSI_XLIB_SUPPORT=On \ + -DBUILD_WSI_WAYLAND_SUPPORT=On \ + -DBUILD_CUBE=ON \ + -DBUILD_VULKANINFO=ON \ + -DGLSLANG_INSTALL_DIR=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_ICD=OFF \ + ", sourceDir="..") def build(): - cmaketools.make() + shelltools.cd("build") + cmaketools.make() - def install(): - autotools.rawInstall("DESTDIR=%s" %get.installDIR()) + shelltools.cd("build") + autotools.rawInstall("DESTDIR=%s" %get.installDIR()) - - pisitools.dodoc("README.md", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md", "GOVERNANCE.md") + shelltools.cd("..") + pisitools.dodoc("README.md", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md", "GOVERNANCE.md") diff --git a/x11/vulkan/vulkan-tools/pspec.xml b/x11/vulkan/vulkan-tools/pspec.xml index c41ddee01a..8a7f3ecb3e 100755 --- a/x11/vulkan/vulkan-tools/pspec.xml +++ b/x11/vulkan/vulkan-tools/pspec.xml @@ -18,13 +18,12 @@ libxcb-devel libXrandr-devel wayland-devel - wayland-client vulkan-headers vulkan-devel python3-devel cmake git - + glslang-devel wayland-server wayland-client wayland-cursor