[arch-commits] Commit in vulkan-lunarg-tools/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Friday, July 26, 2019 @ 13:56:50
  Author: lcarlier
Revision: 358623

upgpkg: vulkan-lunarg-tools 1.1.114+10539+8792090d5-1

upstream update 1.1.114

Modified:
  vulkan-lunarg-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-26 13:23:24 UTC (rev 358622)
+++ PKGBUILD	2019-07-26 13:56:50 UTC (rev 358623)
@@ -2,14 +2,15 @@
 
 pkgbase=vulkan-lunarg-tools
 pkgname=(vulkan-trace vulkan-extra-layers)
-pkgver=1.1.97.0+10340+118b2f331
+pkgver=1.1.114+10539+8792090d5
 pkgrel=1
 arch=(x86_64)
 url="http://lunarg.com/"
 license=('custom')
 depends=()
-makedepends=(git cmake python vulkan-headers vulkan-validation-layers vulkan-icd-loader glslang spirv-tools libx11 libxrandr wayland qt5-svg)
-source=("VulkanLunargTools::git+https://github.com/LunarG/VulkanTools.git#commit=118b2f331839820636539390cdc777ef9e70391f")
+makedepends=(git cmake python libx11 libxrandr wayland qt5-svg qt5-webengine)
+#source=("https://github.com/LunarG/VulkanTools/archive/v${pkgver}.tar.gz")
+source=("VulkanTools-sdk::git+https://github.com/LunarG/VulkanTools.git#commit=8792090d531807522c808663b10043da4a2f502c")
 sha256sums=('SKIP')
 
 _install() {
@@ -23,27 +24,24 @@
 }
 
 pkgver() {
-  cd "${srcdir}/VulkanLunargTools"
+  cd "${srcdir}"/VulkanTools*
 
-  echo 1.1.97.0+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
+  echo 1.1.114+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
 }
 
 build() {
-  cd "${srcdir}/VulkanLunargTools"
+  cd "${srcdir}"/VulkanTools*
 
   ./update_external_sources.sh
+  rm -rf build ; mkdir build ; cd build
+  ../scripts/update_deps.py
 
-  rm -rf build ; mkdir build ; cd build
-  cmake \
+  cmake -C helper.cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DCMAKE_INSTALL_DATADIR=/usr/share \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_SKIP_RPATH=True \
-    -DGLSLANG_INSTALL_DIR=/usr \
-    -DVULKAN_HEADERS_INSTALL_DIR=/usr/include/vulkan \
-    -DVULKAN_LOADER_INSTALL_DIR=/usr \
-    -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=/usr \
     -DBUILD_WSI_XCB_SUPPORT=On \
     -DBUILD_WSI_XLIB_SUPPORT=On \
     -DBUILD_WSI_WAYLAND_SUPPORT=On \
@@ -57,7 +55,7 @@
 
 package_vulkan-trace() {
   pkgdesc="Vulkan tracing and replaying tools"
-  depends=(vulkan-validation-layers qt5-svg)
+  depends=(vulkan-validation-layers qt5-svg qt5-webengine)
   groups=('vulkan-devel')
 
   _install fakeinstall/usr/bin/*
@@ -66,8 +64,8 @@
   _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
 
   install -dm755 ${pkgdir}/usr/share/{doc,licenses}/${pkgname}
-  install -m644 VulkanLunargTools/vktrace/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/
-  install -m644 VulkanLunargTools/vktrace/vktrace.md "${pkgdir}"/usr/share/doc/${pkgname}/
+  install -m644 VulkanTools*/vktrace/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -m644 VulkanTools*/vktrace/vktrace.md "${pkgdir}"/usr/share/doc/${pkgname}/
 }
 
 package_vulkan-extra-layers() {
@@ -86,7 +84,7 @@
   _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_device_simulation.json
 
   install -dm755 ${pkgdir}/usr/share/{doc,licenses}/${pkgname}
-  install -m644 VulkanLunargTools/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-  install -m644 VulkanLunargTools/layersvt/README.md "${pkgdir}"/usr/share/doc/${pkgname}/
+  install -m644 VulkanTools*/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -m644 VulkanTools*/layersvt/README.md "${pkgdir}"/usr/share/doc/${pkgname}/
 }