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

[Laurent Carlier]

    Date: Friday, October 28, 2016 @ 07:13:55
  Author: lcarlier
Revision: 279376

upgpkg: vulkan-tools 1.0.30.0-2

use upstream script to build dependencies (FS#51562)

Modified:
  vulkan-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-28 07:01:47 UTC (rev 279375)
+++ PKGBUILD	2016-10-28 07:13:55 UTC (rev 279376)
@@ -4,48 +4,20 @@
 pkgbase=vulkan-tools
 pkgname=(vulkan-trace vulkan-extra-layers)
 pkgver=1.0.30.0
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://lunarg.com/"
 license=('custom')
 depends=()
 makedepends=(git cmake wget python-lxml libxcb imagemagick)
-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=('7cabc5e25ec0b8873f9ba44755ba6ec935b66305e3f58761d943be10c694df4b'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+source=("vulkanTools-sdk-${pkgver}::https://github.com/LunarG/VulkanTools/archive/sdk-${pkgver}.tar.gz")
+sha256sums=('7cabc5e25ec0b8873f9ba44755ba6ec935b66305e3f58761d943be10c694df4b')
 
 build() {
   cd "${srcdir}/VulkanTools-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 -D CMAKE_BUILD_TYPE=Release ..
-  cmake -D CMAKE_BUILD_TYPE=Release ..
-  make
-  make install
-  popd
-  
-  pushd spirv-tools
-  rm -rf build ; mkdir build ; cd build
-  cmake -D CMAKE_BUILD_TYPE=Release ..
-  make
-  popd
+  ./update_external_sources.sh --glslang --spirv-tools
 
-  cd "${srcdir}/VulkanTools-sdk-${pkgver}"
-
   rm -rf build ; mkdir build ; cd build
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \