0001-Use-repo-for-downloading-correct-versions-of-dependencies.patch

From efb7496ca4d50c509235f7901dc5ce013e98fd3e Mon Sep 17 00:00:00 2001
In-Reply-To: <20190610083136.11546-1-mcoffin13@gmail.com>
References: <20190610083136.11546-1-mcoffin13@gmail.com>
From: Matt Coffin 
Date: Sat, 8 Jun 2019 12:23:51 -0600
Subject: [AUR PATCH v2 amdvlk-git] Use repo for downloading correct versions
 of dependencies
To: haagch+aur@frickel.club,
    Laurent Carlier ,
    ssorgatem@gmail.com
Cc: Chryseus8080@gmail.com

Previously, sources were downloaded by manually specifying branches for
projects in the sources array in the PKGBUILD.

This patch follows the instructions in the AMDVLK README to use the
"repo" tool for managing dependencies.

This is needed to avoid continually breaking the build by pulling the
wrong versions of dependencies. The AMDVLK project maintains a
"default.xml" file describing the required versions of each of the other
repositories (but oddly hasn't yet specified `wsa`, so there's a
temporary fix with the master branch of that still being in the sources
array).

v2: Fix pkgver sourcing, and use release tag from AMDVLK if available
---
 PKGBUILD | 65 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index e180ab4..8244fd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Adrià Cereto i Massagué 
 
 pkgname=amdvlk-git
-pkgver=r43.6d9d93a
+pkgver=v.2019.Q2.5.r0.193a788
 pkgrel=1
 pkgdesc="AMD's standalone Vulkan driver"
 arch=(x86_64)
@@ -12,30 +12,42 @@ license=('MIT')
 depends=('vulkan-icd-loader')
 provides=('vulkan-amdvlk' 'vulkan-driver')
 conflicts=('vulkan-amdvlk')
-makedepends=('dri2proto' 'xorg-server-devel' 'libxrandr' 'cmake' 'python' 'libxml2' 'wayland' 'libdrm' 'git')
-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/wsa.git#branch=master'
-	'git+https://github.com/GPUOpen-Drivers/AMDVLK.git#branch=dev'
-	'git+https://github.com/GPUOpen-Drivers/llpc.git#branch=dev'
-	)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+makedepends=('dri2proto' 'xorg-server-devel' 'libxrandr' 'cmake' 'python' 'libxml2' 'wayland' 'libdrm' 'git' 'ninja' 'repo')
+source=('git+https://github.com/GPUOpen-Drivers/wsa.git#branch=master')
+sha512sums=('SKIP')
             
 pkgver() {
-  XGL_VER=$(cd xgl; printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
+  pushd drivers/AMDVLK > /dev/null
+  AMDVLK_VER=$(printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')")
+  popd > /dev/null
+  if [ -z "$AMDVLK_VER" ]; then
+    pushd drivers/xgl > /dev/null
+    XGL_VER=$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
+    popd > /dev/null
+  else
+    XGL_VER=$AMDVLK_VER
+  fi
   #PAL_VER=$(cd pal; printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
   echo "$XGL_VER"
 }
 
 prepare() {
+  cd "$srcdir"
+  repo init -u 'https://github.com/GPUOpen-Drivers/AMDVLK.git' -b master
+  repo sync
+  if [ ! -e ./drivers/wsa ]; then
+    ln -rs ./wsa ./drivers/wsa
+  fi
   # fix building with commit f609020
-  sed -i "s/