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

[Laurent Carlier]

    Date: Friday, July 20, 2018 @ 14:33:43
  Author: lcarlier
Revision: 329099

upgpkg: vulkan-lunarg-tools 1.1.79+10184+7ae1b7c06-1

Sync with vulkan-headers package

Modified:
  vulkan-lunarg-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   76 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-20 14:23:54 UTC (rev 329098)
+++ PKGBUILD	2018-07-20 14:33:43 UTC (rev 329099)
@@ -3,23 +3,34 @@
 
 pkgbase=vulkan-lunarg-tools
 pkgname=(vulkan-trace vulkan-extra-layers)
-pkgver=1.1.73.0
+pkgver=1.1.79+10184+7ae1b7c06
 pkgrel=1
 arch=(x86_64)
 url="http://lunarg.com/"
 license=('custom')
 depends=()
-makedepends=(git cmake wget python-lxml libxcb libxrandr imagemagick qt5-svg)
-source=("git+https://github.com/LunarG/VulkanTools#tag=sdk-${pkgver}")
+makedepends=(git cmake python vulkan-headers vulkan-icd-loader glslang spirv-tools libx11 libxrandr wayland qt5-svg)
+source=("VulkanLunargTools::git+https://github.com/LunarG/VulkanTools.git#commit=7ae1b7c066137e5730e941de572b2edef17c27df")
 sha256sums=('SKIP')
 
-prepare() {
-  cd ${srcdir}
-  ln -s VulkanTools "VulkanTools-sdk-${pkgver}"
+_install() {
+  local src f dir
+  for src; do
+    f="${src#fakeinstall/}"
+    dir="${pkgdir}/${f%/*}"
+    install -m755 -d "${dir}"
+    mv -v "${src}" "${dir}/"
+  done
 }
 
+pkgver() {
+  cd "${srcdir}/VulkanLunargTools"
+
+  echo 1.1.79+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
+}
+
 build() {
-  cd "${srcdir}/VulkanTools-sdk-${pkgver}"
+  cd "${srcdir}/VulkanLunargTools"
 
   ./update_external_sources.sh
 
@@ -28,41 +39,33 @@
     -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 \
     -DBUILD_WSI_XCB_SUPPORT=On \
     -DBUILD_WSI_XLIB_SUPPORT=On \
     -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_WSI_MIR_SUPPORT=Off \
     -DBUILD_TESTS=OFF \
-    -DBUILD_DEMOS=OFF \
     -DBUILD_VIA=OFF \
     -DCMAKE_BUILD_TYPE=Release \
     ..
   make
+  make DESTDIR="${srcdir}/fakeinstall" install
 }
 
 package_vulkan-trace() {
   pkgdesc="Vulkan tracing and replaying tools"
-  depends=(vulkan-icd-loader qt5-svg)
+  depends=(vulkan-validation-layers qt5-svg)
   groups=('vulkan-devel')
-  
-  cd "${srcdir}/VulkanTools-sdk-${pkgver}"
-  
-  [[ $CARCH == i686 ]] && suffix=32
 
-  install -dm755 ${pkgdir}/usr/{bin,lib}
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -dm755 ${pkgdir}/usr/share/vulkan/explicit_layer.d
-  
-  install -m755 build/vktrace/{vkreplay,vktrace}${suffix} ${pkgdir}/usr/bin/
-  install -m755 build/vktrace/vktraceviewer${suffix} ${pkgdir}/usr/bin/
-  install -m755 build/vktrace/libVkLayer_vktrace_layer${suffix}.so ${pkgdir}/usr/lib/
+  _install fakeinstall/usr/bin/*
+  _install fakeinstall/usr/lib/libVkLayer_vktrace_layer.so
+  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
 
-  sed 's at ../vktrace/libVkLayer_vktrace_layer.so at libVkLayer_vktrace_layer'${suffix}'.so@'\
-       vktrace/vktrace_layer/linux/VkLayer_vktrace_layer.json \
-       > ${pkgdir}/usr/share/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
- 
-  install -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  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}/
 }
 
 package_vulkan-extra-layers() {
@@ -70,19 +73,18 @@
   depends=(vulkan-validation-layers)
   groups=('vulkan-devel')
   
-  cd "${srcdir}/VulkanTools-sdk-${pkgver}"
+  _install fakeinstall/usr/lib/libVkLayer_api_dump.so
+  _install fakeinstall/usr/lib/libVkLayer_monitor.so
+  _install fakeinstall/usr/lib/libVkLayer_screenshot.so
+  _install fakeinstall/usr/lib/libVkLayer_device_simulation.so
 
-  install -dm755 ${pkgdir}/usr/lib
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -dm755 ${pkgdir}/usr/share/vulkan/explicit_layer.d
- 
-  install -m644 build/layersvt/*.so ${pkgdir}/usr/lib
+  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_api_dump.json
+  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_monitor.json
+  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_screenshot.json
+  _install fakeinstall/etc/vulkan/explicit_layer.d/VkLayer_device_simulation.json
 
-  # fix library paths  
-  for i in layersvt/linux/*.json ; do 
-    sed 's at ./@@' $i > ${pkgdir}/usr/share/vulkan/explicit_layer.d/$(basename $i)
-  done
-
-  install -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  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}/
 }