use upstream ICD; remove unused files

1 files changed, 7 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 09d385947f2..8af9107a429 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Christoph Haag <haagch@studi.informatik.uni-stuttgart.de>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Maintainer: Adrià Cereto i Massagué <ssorgatem at gmail.com>
 
 pkgname=amdvlk-git
-pkgver=r18.0eb7396
+pkgver=r20.d62dbcc
 pkgrel=1
 pkgdesc="AMD's standalone Vulkan driver"
 arch=(x86_64)
@@ -12,20 +13,18 @@ depends=('vulkan-icd-loader')
 provides=('vulkan-amdvlk')
 conflicts=('vulkan-amdvlk')
 makedepends=('dri2proto' 'xorg-server-devel' 'cmake' 'python' 'git')
-source=('llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-master'
+source=('llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-dev'
 	'git+https://github.com/GPUOpen-Drivers/xgl.git#branch=dev'
 	'git+https://github.com/GPUOpen-Drivers/pal.git#branch=dev'
 	'git+https://github.com/GPUOpen-Drivers/AMDVLK.git#branch=dev'
-	'0001-remove-linking-with-whole-archive-v2.patch'
 	'amdPalSettings.cfg'
-	'amd_icd64.json')
+	)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '268528bf2c6e855707635e65ece19b179135fa8823c1a9cc01746fd9235b8139'
             '5f798911bf1cbbe5a83f5ae4886107ef0d02be5753450753ae2d3fc6f80e7012'
-            '39c26b6d91a8c5b42818a6cc3529b3803aba8f3a759d8eb6b682ecb027f4762c')
+            )
             
 pkgver() {
   XGL_VER=$(cd xgl; printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
@@ -35,7 +34,6 @@ pkgver() {
 
 prepare() {
   cd xgl
-  #patch -Np1 -i ${srcdir}/0001-remove-linking-with-whole-archive-v2.patch
 }
 
 build() {
@@ -44,7 +42,7 @@ build() {
   cmake -H. -Bbuilds/Release64 -DCMAKE_BUILD_TYPE=Release
   cd builds/Release64
   make
-  msg "bulding xgl finished!"
+  msg "building xgl finished!"
 }
 
 package() {
@@ -54,7 +52,7 @@ package() {
   install -m755 -d "${pkgdir}"/etc/amd
 
   install xgl/builds/Release64/icd/amdvlk64.so "${pkgdir}"/usr/lib/
-  install amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
+  install AMDVLK/json/Redhat/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
   install AMDVLK/LICENSE.txt "${pkgdir}"/usr/share/licenses/amdvlk-git/
   install amdPalSettings.cfg "${pkgdir}"/etc/amd/
 }