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

[Laurent Carlier]

    Date: Wednesday, September 2, 2020 @ 13:45:03
  Author: lcarlier
Revision: 395146

upgpkg: vulkan-lunarg-tools 1.2.148.1+10736+3ce31c1c2-1: upstream update 1.2.148.1 - no more vulkan-trace, removed upstream

Modified:
  vulkan-lunarg-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-02 13:43:39 UTC (rev 395145)
+++ PKGBUILD	2020-09-02 13:45:03 UTC (rev 395146)
@@ -1,8 +1,8 @@
 # Maintainer: Laurent Carlier <lordheavym at gmail.com>
 
 pkgbase=vulkan-lunarg-tools
-pkgname=(vulkan-trace vulkan-extra-layers)
-pkgver=1.2.141.0+10646+e51f7617f
+pkgname=(vulkan-extra-tools vulkan-extra-layers)
+pkgver=1.2.148.1+10736+3ce31c1c2
 pkgrel=1
 arch=(x86_64)
 url="http://lunarg.com/"
@@ -10,7 +10,7 @@
 depends=()
 makedepends=(git cmake python libx11 libxrandr wayland qt5-svg qt5-webengine)
 #source=("https://github.com/LunarG/VulkanTools/archive/sdk-${pkgver}.tar.gz")
-source=("VulkanTools-sdk::git+https://github.com/LunarG/VulkanTools.git#commit=e51f7617f73ee8cfd8908dd7d8c6b92531c9831")
+source=("VulkanTools-sdk::git+https://github.com/LunarG/VulkanTools.git#commit=3ce31c1c29919f0695d2d4d4990f29a90e39bcf6")
 sha256sums=('SKIP')
 
 _install() {
@@ -26,7 +26,7 @@
 pkgver() {
   cd "${srcdir}"/VulkanTools*
 
-  echo 1.2.141.0+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
+  echo 1.2.148.1+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
 }
 
 build() {
@@ -46,7 +46,7 @@
     -DBUILD_WSI_XLIB_SUPPORT=On \
     -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_TESTS=OFF \
-    -DBUILD_VIA=OFF \
+    -DBUILD_VIA=ON \
     -DCMAKE_BUILD_TYPE=Release \
     ..
   make
@@ -53,19 +53,17 @@
   make DESTDIR="${srcdir}/fakeinstall" install
 }
 
-package_vulkan-trace() {
-  pkgdesc="Vulkan tracing and replaying tools"
+package_vulkan-extra-tools() {
+  pkgdesc="Vulkan lunarg tools"
   depends=(vulkan-validation-layers qt5-svg qt5-webengine)
+  conflicts=('vulkan-trace<1.2.148.1')
   groups=('vulkan-devel')
 
   _install fakeinstall/usr/bin/*
-  _install fakeinstall/usr/lib/libVkLayer_vktrace_layer.so
-  _install fakeinstall/usr/lib/libvkdisplay_*.so
-  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
 
   install -dm755 ${pkgdir}/usr/share/{doc,licenses}/${pkgname}
-  install -m644 VulkanTools*/vktrace/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/
-  install -m644 VulkanTools*/vktrace/vktrace.md "${pkgdir}"/usr/share/doc/${pkgname}/
+  install -m644 VulkanTools*/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -m644 VulkanTools*/vkconfig/vkconfig.md "${pkgdir}"/usr/share/doc/${pkgname}/
 }
 
 package_vulkan-extra-layers() {