From e8be9be7fa246852d2c146b393b782deb32195d3 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Wed, 15 May 2024 21:32:39 +0200
Subject: [PATCH] amdvlk: update to version v2024.Q2.1.

---
 srcpkgs/amdvlk/patches/fix-musl-build.patch | 22 ---------------
 srcpkgs/amdvlk/template                     | 30 ++++++++++-----------
 2 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/amdvlk/patches/fix-musl-build.patch

diff --git a/srcpkgs/amdvlk/patches/fix-musl-build.patch b/srcpkgs/amdvlk/patches/fix-musl-build.patch
deleted file mode 100644
index 41a7a75c1812f9..00000000000000
--- a/srcpkgs/amdvlk/patches/fix-musl-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/pal/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp b/pal/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp
-index 2d62ec3ef..e14ccbb9c 100644
---- a/pal/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp
-+++ b/pal/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp
-@@ -10152,7 +10152,7 @@ uint32 UniversalCmdBuffer::BuildExecuteIndirectIb2Packets(
-                                                                                      drawIndexReg,
-                                                                                      1,
-                                                                                      pParamData[cmdIndex].argBufSize,
--                                                                                     NULL,
-+                                                                                     0UL,
-                                                                                      PacketPredicate(),
-                                                                                      usesLegacyMsFastLaunch,
-                                                                                      pDeCmdIb2Space);
-@@ -10164,7 +10164,7 @@ uint32 UniversalCmdBuffer::BuildExecuteIndirectIb2Packets(
-                                                                                       drawIndexReg,
-                                                                                       1,
-                                                                                       pParamData[cmdIndex].argBufSize,
--                                                                                      NULL,
-+                                                                                      0UL,
-                                                                                       PacketPredicate(),
-                                                                                       usesLegacyMsFastLaunch,
-                                                                                       pDeCmdIb2Space);
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 0c1a625f29bff9..eb87d0cb874883 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,15 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2024.Q1.3
+version=2024.Q2.1
 revision=1
-_xgl_commit=b7100c18eb2d134098738f97d7cc3a26e485862f
-_pal_commit=42e29f4d3d528c6a59c2db77fb6d70127fb9ffab
-_llpc_commit=14535c028dc70a093d95a95efedb749812c1e77d
-_gpurt_commit=2e6d528610f45a99723d6e4f15f24da12fd6a1e5
-_llvm_project_commit=da55e9e39bc7868016b7b265aa535dff84b7d591
+_xgl_commit=f6a447e31ae7c4583c765042071f48421269cfce
+_pal_commit=c789abc769d264f73e3dad3f21238b876918f594
+_llpc_commit=8252cfa83e03aa0a193c0f0cd6a9dba3e99e25d5
+_gpurt_commit=e0f12d951395cacd8ff117a0e82601e1ce5c4c02
+_llvm_project_commit=45cdb88c143dad74438a9a480b3b1d33305b9da4
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
-_llvm_dialects_commit=3f9e17f5f44e825de6450cc8a5aff7f3d5a32ef2
+_llvm_dialects_commit=55e176fb88bcfc4fae45bafaa3ff209ec4c0d4ee
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
@@ -19,7 +19,7 @@ configure_args="-DBUILD_WAYLAND_SUPPORT=ON
  -DLLVM_PARALLEL_LINK_JOBS=2"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel wayland-devel
- DirectXShaderCompiler-devel glslang-devel python3-Jinja2"
+ DirectXShaderCompiler-devel glslang-devel python3-Jinja2 python3-ruamel.yaml"
 depends="vulkan-loader"
 short_desc="AMD Open Source Driver For Vulkan"
 maintainer="John <me@johnnynator.dev>"
@@ -34,15 +34,15 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm-dialects/archive/${_llvm_dialects_commit}.tar.gz"
-checksum="1d9c1d6db54f3f33882d01ce82bf6aa55f87e079d9ded460768392e07f0e939b
- a1d1640d7db89be37b76a595ec5cee3882575edfbe14964b7bbbd2e414ba0eef
- 87c28616b8ce88bdbe58b988c8f18368e7dd6ff047b33058f5d9c21ca3cd69e6
- 9aa6ef9dbddc37b0dff73f8fefdceea21d1b2aed306652e288d0b09d774e2599
- cbc83121e6a160d92b8f61c2911ea8fbf21e17c9310201fdb06c12cd356d854c
- 6cf55ce86ff23d7e8924e145869af76905233d80b8f5cf5f1849f15e3b571236
+checksum="ede2ad261f68da64bb3a7ca47c6debfc42c171d3bd9bd91a01e3727ff5a7d4c8
+ 4a609e8077ad27aa426b0a37ff52c615c10fd19520a83eaed9000b937f93ee16
+ 8bce7f9b491d37ec6d1ca8fe440b145d6a26248278422f700f0beffb2f6f79d3
+ 9c9a2da94c10c6108faf47e87a0db085799874a392bd0ead17881ab248c28874
+ f74a3b15f230a134a86ee76964582dc0b4fb2990d26b77fe2b7be5f62adc0645
+ 644b35c146a08af1474d7c030b15811f2480762741b5cef6d72299c1ec353ac4
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
  87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
- 127ca534fcf8051aeba8cfe02d1dc309d0a6df2ba4d08508713ddea308370250"
+ 996b27e2b9b1d40d038a8c8b741a398ae1dab06e5ef24d48b2f9d006871b9a2d"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"