From f2462f3c96b32998e200d1b60ab042cf6ed146a8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 2 Sep 2016 18:06:36 +0000
Subject: [PATCH] extra/vulkan-tools to 1.0.24.0-1

---
 extra/vulkan-tools/PKGBUILD | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/extra/vulkan-tools/PKGBUILD b/extra/vulkan-tools/PKGBUILD
index ebd2bd9f0..88050c1af 100644
--- a/extra/vulkan-tools/PKGBUILD
+++ b/extra/vulkan-tools/PKGBUILD
@@ -6,19 +6,18 @@
 
 pkgbase=vulkan-tools
 pkgname=(vulkan-trace vulkan-extra-layers)
-pkgver=1.0.21.0
+pkgver=1.0.24.0
 pkgrel=1
 arch=(i686 x86_64)
 url="http://lunarg.com/"
 license=('custom')
 depends=()
 makedepends=(git cmake wget python-lxml libxcb imagemagick)
-#source=("https://github.com/LunarG/VulkanTools/archive/sdk-${pkgver}.tar.gz"
-source=("VulkanTools-sdk-1.0.21.0::git+https://github.com/LunarG/VulkanTools.git#commit=e0edb67f0642abbe95ccd351a410114f5961611c"
-        'git://github.com/KhronosGroup/glslang.git#commit=e4821e43c86d97bcf65fb07c1f70471b7102978d'
-        'git://github.com/KhronosGroup/SPIRV-Tools.git#commit=1a9385bbd0e6eae188c14302cf37c415ecc8b698'
-        'git://github.com/KhronosGroup/SPIRV-Headers')
-sha256sums=('SKIP'
+source=("vulkanTools-sdk-${pkgver}::https://github.com/LunarG/VulkanTools/archive/sdk-${pkgver}.tar.gz"
+        'git://github.com/KhronosGroup/glslang.git#commit=81cd764b5ffc475bc73f1fb35f75fd1171bb2343'
+        'git://github.com/KhronosGroup/SPIRV-Tools.git#commit=923a4596b44831a07060df45caacb522613730c9'
+        'git://github.com/KhronosGroup/SPIRV-Headers#commit=33d41376d378761ed3a4c791fc4b647761897f26')
+sha256sums=('e7319a00d5f74e8e1995b29a9f6cb5b8ef4d6ff240ab10cd372429f7ef043a7a'
             'SKIP'
             'SKIP'
             'SKIP')
@@ -26,18 +25,6 @@ sha256sums=('SKIP'
 build() {
   cd "${srcdir}/VulkanTools-sdk-${pkgver}"
 
-  pushd ${srcdir}/glslang
-  # Revert glslang a5c33d6ffb34ccede5b233bc724c907166b6e479
-  # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/681
-  git diff-index --quiet HEAD | true
-  rc=${PIPESTATUS[0]}
-  if (( $rc == 0 ))
-  then
-    echo "applying patch to revert glslang a5c33d"
-    git apply "${srcdir}/VulkanTools-sdk-${pkgver}"/glslang_revert_a5c33d.patch.txt
-  fi
-  popd
-  
   # reproduce some of the update_external_sources.sh script
   rm -rf external && mkdir external && cd external
   git clone ${srcdir}/glslang