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

[Laurent Carlier]

    Date: Monday, January 18, 2021 @ 17:13:43
  Author: lcarlier
Revision: 406359

upgpkg: amdvlk 2021.Q1.1-2: workaround FS#69346 - remove useless spvgen library

Modified:
  amdvlk/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-18 09:16:34 UTC (rev 406358)
+++ PKGBUILD	2021-01-18 17:13:43 UTC (rev 406359)
@@ -3,7 +3,7 @@
 
 pkgname=amdvlk
 pkgver=2021.Q1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD's standalone Vulkan driver"
 arch=(x86_64)
 url="https://github.com/GPUOpen-Drivers"
@@ -30,9 +30,6 @@
       popd
     (( nrepos-- ))
   done
-  
-  # fix build with gcc9 
-  sed -i "s/-Werror//g" ${srcdir}/pal/shared/gpuopen/cmake/AMD.cmake
 }
 
 build() {
@@ -46,21 +43,23 @@
     -G Ninja
     
   ninja -C builds/Release64
-  ninja -C builds/Release64 spvgen
+  # only for compiling glsl with the standalone compiler (amdllpc)
+  #ninja -C builds/Release64 spvgen
 }
 
 package() {
   install -m755 -d "${pkgdir}"/usr/lib
   install -m755 -d "${pkgdir}"/usr/share/vulkan/icd.d
-  install -m755 -d "${pkgdir}"/usr/share/vulkan/implicit_layer.d
+  #install -m755 -d "${pkgdir}"/usr/share/vulkan/implicit_layer.d
   install -m755 -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
   install xgl/builds/Release64/icd/amdvlk64.so "${pkgdir}"/usr/lib/
-  install xgl/builds/Release64/spvgen/spvgen.so ${pkgdir}/usr/lib/
+  #install xgl/builds/Release64/spvgen/spvgen.so ${pkgdir}/usr/lib/
   install AMDVLK/json/Redhat/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
-  install AMDVLK/json/Redhat/amd_icd64.json "${pkgdir}"/usr/share/vulkan/implicit_layer.d/
+  # broken, see https://github.com/GPUOpen-Drivers/AMDVLK/issues/196
+  #install AMDVLK/json/Redhat/amd_icd64.json "${pkgdir}"/usr/share/vulkan/implicit_layer.d/
   install AMDVLK/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
   
   sed -i "s#/lib64#/lib#g" "${pkgdir}"/usr/share/vulkan/icd.d/amd_icd64.json
-  sed -i "s#/lib64#/lib#g" "${pkgdir}"/usr/share/vulkan/implicit_layer.d/amd_icd64.json
+  #sed -i "s#/lib64#/lib#g" "${pkgdir}"/usr/share/vulkan/implicit_layer.d/amd_icd64.json
 }