Updated to version 2019.06.21

1 files changed, 28 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0c959847a194..3a9a34e8179d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _spirv_tools_commit='89fe836fe22c3e5c2a062ebeade012e2c2f0839b'
 _spirv_headers_commit='c4f8f65792d4bf2657ca751904c511bbcf2ac77b'
 
 pkgname=spirv-cross
-pkgver=2019.05.20
+pkgver=2019.06.21
 _srcver="${pkgver//./-}"
 pkgrel=1
 pkgdesc='A tool and library for parsing and converting SPIR-V to other shader languages'
@@ -13,18 +13,24 @@ arch=('x86_64')
 url='https://github.com/KhronosGroup/SPIRV-Cross/'
 license=('Apache')
 depends=('gcc-libs')
-makedepends=('git' 'cmake' 'python')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/SPIRV-Cross/archive/${_srcver}.tar.gz"
+makedepends=('git' 'cmake' 'python' 'python-nose')
+source=("git+https://github.com/KhronosGroup/SPIRV-Cross.git#tag=${_srcver}"
         "git+https://github.com/KhronosGroup/glslang.git#commit=${_glslang_commit}"
         "git+https://github.com/KhronosGroup/SPIRV-Tools.git#commit=${_spirv_tools_commit}"
-        "git+https://github.com/KhronosGroup/SPIRV-Headers.git#commit=${_spirv_headers_commit}")
-sha256sums=('bc01afeacd77ff786a10755117a7aeb219c8d50e3db3931e59bf8f50f4cad55d'
+        "git+https://github.com/KhronosGroup/SPIRV-Headers.git#commit=${_spirv_headers_commit}"
+        'spirv-cross-workaround-gcc9.1-bug.patch'::'https://github.com/KhronosGroup/SPIRV-Cross/commit/7557ff5567d88f97c10c0c097df1d9f993cafa42.patch')
+sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '7e71831e2c96f9e3967dd9797429a56a6a478de47398794ce54a12b55fb9a7ef')
 
 prepare() {
-    cd "SPIRV-Cross-${_srcver}"
+    cd SPIRV-Cross
+    
+    # fix tests with gcc 9.1.0
+    ## https://github.com/KhronosGroup/SPIRV-Cross/issues/1038
+    patch -Np1 -i "${srcdir}/spirv-cross-workaround-gcc9.1-bug.patch"
     
     mkdir -p build external/{glslang,spirv-tools}-build
     
@@ -34,47 +40,52 @@ prepare() {
 }
 
 build() {
+    # NOTE (1): test suite fails when using 'None' build type
+    # NOTE (2): test suite fails when using glslang and spirv-tools from the repos
+    #           (probably because spirv-tools is outdated at the time of writing)
+    
     # glslang (required for tests)
     printf '%s\n' '  -> Building glslang...'
-    cd "SPIRV-Cross-${_srcver}/external/glslang-build"
+    cd "SPIRV-Cross/external/glslang-build"
     cmake \
-        -DCMAKE_BUILD_TYPE:STRING='None' \
+        -DCMAKE_BUILD_TYPE:STRING='Release' \
         -DCMAKE_INSTALL_PREFIX:PATH='output' \
         -Wno-dev \
         ../glslang
-    cmake --build . --config None --target install
+    cmake --build . --config Release --target install
     
     # spirv-tools (required for tests)
     printf '%s\n' '  -> Building SPIRV-Tools...'
-    cd "${srcdir}/SPIRV-Cross-${_srcver}/external/spirv-tools-build"
+    cd "${srcdir}/SPIRV-Cross/external/spirv-tools-build"
     cmake \
-        -DCMAKE_BUILD_TYPE:STRING='None' \
+        -DCMAKE_BUILD_TYPE:STRING='Release' \
         -DSPIRV_WERROR:BOOL='OFF' \
         -DCMAKE_INSTALL_PREFIX:PATH='output' \
         -Wno-dev \
         ../spirv-tools
-    cmake --build . --config None --target install
+    cmake --build . --config Release --target install
     
     # spirv-cross
     printf '%s\n' '  -> Building SPIRV-Cross...'
-    cd "${srcdir}/SPIRV-Cross-${_srcver}/build"
+    cd "${srcdir}/SPIRV-Cross/build"
     cmake \
-        -DCMAKE_BUILD_TYPE:STRING='None' \
+        -DCMAKE_BUILD_TYPE:STRING='Release' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DSPIRV_CROSS_SHARED:BOOL='ON' \
         -Wno-dev \
         ..
+        
     make
 }
 
 check() {
-    cd "SPIRV-Cross-${_srcver}/build"
+    cd "SPIRV-Cross/build"
     
     make test
 }
 
 package() {
-    cd "SPIRV-Cross-${_srcver}/build"
+    cd SPIRV-Cross/build
     
     make DESTDIR="$pkgdir" install
 }