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

[Laurent Carlier]

    Date: Friday, October 28, 2016 @ 07:20:09
  Author: lcarlier
Revision: 193876

upgpkg: lib32-vulkan-loader-layers 1.0.30.0-2

use upstream script to build dependencies (FS#51562)

Modified:
  lib32-vulkan-loader-layers/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-28 06:33:30 UTC (rev 193875)
+++ PKGBUILD	2016-10-28 07:20:09 UTC (rev 193876)
@@ -5,20 +5,14 @@
 pkgname=(lib32-vulkan-icd-loader lib32-vulkan-validation-layers)
 _pkgname=Vulkan-LoaderAndValidationLayers
 pkgver=1.0.30.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://www.khronos.org/vulkan/"
 license=('custom')
 depends=()
 makedepends=(git cmake python-lxml lib32-libx11 lib32-wayland)
-source=("https://github.com/KhronosGroup/${_pkgname}/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=('c72586930967dd815bbd6d1cf8a20378e360c06814c78c8c8e6896d97c9541dc'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz")
+sha256sums=('c72586930967dd815bbd6d1cf8a20378e360c06814c78c8c8e6896d97c9541dc')
 
 build() {
   export CC="gcc -m32"
@@ -27,29 +21,7 @@
 
   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 -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
-  
-  cd "${srcdir}/${_pkgname}-sdk-${pkgver}"
+  ./update_external_sources.sh
 
   # cube.cpp fail to build
   sed -i "114,128d" demos/CMakeLists.txt