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

Laurent Carlier lcarlier at gemini.archlinux.org
Thu Aug 18 10:07:05 UTC 2022


    Date: Thursday, August 18, 2022 @ 10:07:05
  Author: lcarlier
Revision: 453095

archrelease: copy trunk to extra-x86_64

Added:
  amdvlk/repos/extra-x86_64/PKGBUILD
    (from rev 453094, amdvlk/trunk/PKGBUILD)
  amdvlk/repos/extra-x86_64/pal.patch
    (from rev 453094, amdvlk/trunk/pal.patch)
Deleted:
  amdvlk/repos/extra-x86_64/PKGBUILD

-----------+
 PKGBUILD  |  142 +++++++++++++++++++++++++++++-------------------------------
 pal.patch |   11 ++++
 2 files changed, 81 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-18 10:07:00 UTC (rev 453094)
+++ PKGBUILD	2022-08-18 10:07:05 UTC (rev 453095)
@@ -1,72 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: lod <aur at cyber-anlage.de>
-
-pkgname=amdvlk
-pkgver=2022.Q3.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+=('clang' 'lld')
-options=('!lto')
-source=("https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${pkgver}.tar.gz")
-sha256sums=('fc1a26cbd3aacd197d17025836fdbbf29a9529af54937c3bfabd58ab86c3d2b3')
-            
-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
-  python 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
-}

Copied: amdvlk/repos/extra-x86_64/PKGBUILD (from rev 453094, amdvlk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-18 10:07:05 UTC (rev 453095)
@@ -0,0 +1,70 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: lod <aur at cyber-anlage.de>
+
+pkgname=amdvlk
+pkgver=2022.Q3.3
+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')
+options=('!lto')
+source=("https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${pkgver}.tar.gz"
+        pal.patch)
+sha256sums=('9efa194cf0572f09a66dcd74dd771a8b12a97f85e1f0905ee6d2bf8025a5abfd'
+            '4953f94566c14c51b82bf7e1c60612f4dac3fd35a0c6da31c8460ee3df69de4c')
+            
+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
+  
+  # https://github.com/GPUOpen-Drivers/pal/issues/89
+  cd pal
+  patch -Np1 -i ../pal.patch
+}
+
+build() {
+  cd ${srcdir}/spvgen/external
+  python 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/pal.patch (from rev 453094, amdvlk/trunk/pal.patch)
===================================================================
--- pal.patch	                        (rev 0)
+++ pal.patch	2022-08-18 10:07:05 UTC (rev 453095)
@@ -0,0 +1,11 @@
+diff -Nru pal/src/util/lnx/lnxUuid.cpp pal.b/src/util/lnx/lnxUuid.cpp
+--- pal/src/util/lnx/lnxUuid.cpp	2022-08-18 10:38:07.000000000 +0200
++++ pal.b/src/util/lnx/lnxUuid.cpp	2022-08-18 11:24:11.431430755 +0200
+@@ -29,6 +29,7 @@
+ #include "util/imported/libuuid/libuuid.h"
+ 
+ #include <random>
++#include <ctime>
+ #include <unistd.h>
+ 
+ namespace Util



More information about the arch-commits mailing list