[arch-commits] Commit in amdvlk/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Laurent Carlier]

    Date: Saturday, January 29, 2022 @ 10:13:55
  Author: lcarlier
Revision: 435376

archrelease: copy trunk to extra-x86_64

Added:
  amdvlk/repos/extra-x86_64/PKGBUILD
    (from rev 435375, amdvlk/trunk/PKGBUILD)
Deleted:
  amdvlk/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  137 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 72 insertions(+), 65 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-29 10:13:51 UTC (rev 435375)
+++ PKGBUILD	2022-01-29 10:13:55 UTC (rev 435376)
@@ -1,65 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: lod <aur at cyber-anlage.de>
-
-pkgname=amdvlk
-pkgver=2022.Q1.1
-pkgrel=1
-pkgdesc="AMD's standalone Vulkan driver"
-arch=(x86_64)
-url="https://github.com/GPUOpen-Drivers"
-license=('MIT')
-provides=('vulkan-driver')
-makedepends=('perl-xml-xpath' 'python' 'wayland' 'libxrandr' 'xorg-server-devel' 'cmake' 'ninja' 'git')
-makedepends+=('python2') # spvgen
-options=('!lto')
-source=("https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${pkgver}.tar.gz")
-sha256sums=('89af0c7d48ae5fb66e2ef72205e674761d9108f48d2807100e23190a91a21094')
-            
-prepare() {
-  local nrepos path name revision
-  
-  nrepos=$(xpath -q -e //project AMDVLK-v-${pkgver}/default.xml | wc -l)
-  
-  while (($nrepos>0))
-  do
-    path=$(xpath -q -e //project[$nrepos]/@path AMDVLK-v-${pkgver}/default.xml | sed 's/ path="drivers\/\(.*\)"/\1/g')
-    name=$(xpath -q -e //project[$nrepos]/@name AMDVLK-v-${pkgver}/default.xml | sed 's/ name="\(.*\)"/\1/g')
-    revision=$(xpath -q -e //project[$nrepos]/@revision AMDVLK-v-${pkgver}/default.xml | sed 's/ revision="\(.*\)"/\1/g')
-    git clone https://github.com/GPUOpen-Drivers/$name $path
-      pushd $path
-        git checkout $revision
-      popd
-    (( nrepos-- ))
-  done
-}
-
-build() {
-  cd ${srcdir}/spvgen/external
-  python2 fetch_external_sources.py
-
-  cd ${srcdir}/xgl
-  cmake -H. -Bbuilds/Release64 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_WAYLAND_SUPPORT=On \
-    -G Ninja
-    
-  ninja -C builds/Release64
-  # 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/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/icd/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
-  install xgl/builds/Release64/icd/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
-}

Copied: amdvlk/repos/extra-x86_64/PKGBUILD (from rev 435375, amdvlk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-29 10:13:55 UTC (rev 435376)
@@ -0,0 +1,72 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: lod <aur at cyber-anlage.de>
+
+pkgname=amdvlk
+pkgver=2022.Q1.2
+pkgrel=1
+pkgdesc="AMD's standalone Vulkan driver"
+arch=(x86_64)
+url="https://github.com/GPUOpen-Drivers"
+license=('MIT')
+provides=('vulkan-driver')
+makedepends=('perl-xml-xpath' 'python' 'wayland' 'libxrandr' 'xorg-server-devel' 'cmake' 'ninja' 'git')
+makedepends+=('python2' 'clang' 'lld')
+options=('!lto')
+source=("https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${pkgver}.tar.gz")
+sha256sums=('9d639e5ba246894ad4ed33c0197c06c7231e799cccd24e1ae3e5baacec9f47e1')
+            
+prepare() {
+  local nrepos path name revision
+  
+  nrepos=$(xpath -q -e //project AMDVLK-v-${pkgver}/default.xml | wc -l)
+  
+  while (($nrepos>0))
+  do
+    path=$(xpath -q -e //project[$nrepos]/@path AMDVLK-v-${pkgver}/default.xml | sed 's/ path="drivers\/\(.*\)"/\1/g')
+    name=$(xpath -q -e //project[$nrepos]/@name AMDVLK-v-${pkgver}/default.xml | sed 's/ name="\(.*\)"/\1/g')
+    revision=$(xpath -q -e //project[$nrepos]/@revision AMDVLK-v-${pkgver}/default.xml | sed 's/ revision="\(.*\)"/\1/g')
+    git clone https://github.com/GPUOpen-Drivers/$name $path
+      pushd $path
+        git checkout $revision
+      popd
+    (( nrepos-- ))
+  done
+}
+
+build() {
+  cd ${srcdir}/spvgen/external
+  python2 fetch_external_sources.py
+
+  # use lld and clang to fix linking error
+  # https://github.com/GPUOpen-Drivers/llpc/issues/1645
+  cd ${srcdir}/xgl
+  cmake -H. -Bbuilds/Release64 \
+    -DCMAKE_C_COMPILER=clang \
+    -DCMAKE_CXX_COMPILER=clang++ \
+    -DLLVM_USE_LINKER=lld \
+    -DCMAKE_EXE_LINKER_FLAGS='-fuse-ld=lld' \
+    -DCMAKE_SHARED_LINKER_FLAGS='-fuse-ld=lld' \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_WAYLAND_SUPPORT=On \
+    -G Ninja
+    
+  ninja -C builds/Release64
+  # 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/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/icd/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
+  install xgl/builds/Release64/icd/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
+}