[arch-commits] Commit in vulkan-loader-layers/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Sunday, July 17, 2016 @ 08:31:32
  Author: lcarlier
Revision: 271954

upgpkg: vulkan-loader-layers 1.0.17.0-1

upstream update 1.0.17

Modified:
  vulkan-loader-layers/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-17 06:19:55 UTC (rev 271953)
+++ PKGBUILD	2016-07-17 08:31:32 UTC (rev 271954)
@@ -4,7 +4,7 @@
 pkgbase=vulkan-loader-layers
 pkgname=(vulkan-icd-loader vulkan-validation-layers)
 _pkgname=Vulkan-LoaderAndValidationLayers
-pkgver=1.0.11.0
+pkgver=1.0.17.0
 pkgrel=1
 arch=(i686 x86_64)
 url="https://www.khronos.org/vulkan/"
@@ -12,35 +12,49 @@
 depends=()
 makedepends=(git cmake python-lxml libx11 wayland)
 source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz"
-        'git://github.com/KhronosGroup/glslang.git#commit=d99524197f3b68dbd6267bd3f4d7e8a0f49167b4')
-sha256sums=('966c7bdcba8aa45bcf91c4cd0a55e5155e234a120953b04dc25e267bc076ef8a'
+        'git://github.com/KhronosGroup/glslang.git#commit=4678ca9dacfec7a084dbc69bbe568bdad6889f1b'
+        'git://github.com/KhronosGroup/SPIRV-Tools.git#commit=37e4600c3efad7b1cfdc1df70a977be82eb3c811'
+        'git://github.com/KhronosGroup/SPIRV-Headers')
+sha256sums=('b19fcff86e606d11ca149f7e10bdb7f8b073c5bb40647fe68a52045e1d0d7c8f'
+            'SKIP'
+            'SKIP'
             'SKIP')
 
 build() {
-  # for validation layers
+  cd "${srcdir}/${_pkgname}-sdk-${pkgver}"
+  
+  # reproduce some of the update_external_sources.sh script
+  rm -rf external ; mkdir external ; cd external
+  git clone ${srcdir}/glslang
+  git clone ${srcdir}/SPIRV-Tools spirv-tools
+  pushd spirv-tools
+  git clone ${srcdir}/SPIRV-Headers external/spirv-headers
+  popd
+  
   pushd glslang
   rm -rf build ; mkdir build ; cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    ../
+  cmake -D CMAKE_BUILD_TYPE=Release ..
+  cmake -D CMAKE_BUILD_TYPE=Release ..
   make
-  make DESTDIR=install install
-  cd install
-  ln -s usr/* .
+  make install
   popd
   
+  pushd spirv-tools
+  rm -rf build ; mkdir build ; cd build
+  cmake -D CMAKE_BUILD_TYPE=Release ..
+  make
+  popd
   
   cd "${srcdir}/${_pkgname}-sdk-${pkgver}"
+
   rm -rf build ; mkdir build ; cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DINCLUDE_INSTALL_DIR=/usr/include \
-    -DLIB_INSTALL_DIR=/usr/lib \
     -DCMAKE_INSTALL_DATADIR=/share \
     -DCMAKE_SKIP_RPATH=True \
-    -DGLSLANG_PREFIX=${srcdir}/glslang \
-    -DBUILD_WSI_XLIB_SUPPORT=1 \
-    -DBUILD_WSI_WAYLAND_SUPPORT=1 \
+    -DBUILD_TESTS=Off \
+    -DBUILD_WSI_XLIB_SUPPORT=On \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DCMAKE_BUILD_TYPE=Release \
     ..
   make
@@ -56,10 +70,7 @@
   install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
   install -dm755 ${pkgdir}/etc/vulkan/icd.d/
   
-  install -m644 build/loader/libvulkan.so.1.0.8 ${pkgdir}/usr/lib
-  ln -s libvulkan.so.1.0.8 ${pkgdir}/usr/lib/libvulkan.so.1
-  ln -s libvulkan.so.1.0.8 ${pkgdir}/usr/lib/libvulkan.so
-
+  cp -rv  build/loader/libvulkan.so* ${pkgdir}/usr/lib
   install -m644 include/vulkan/vk_icd.h ${pkgdir}/usr/include/vulkan/
   
   install -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/