From 92dd7638c38751f70c05a95a1ea66075d9b5d4b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Jun 2023 17:36:14 +0200
Subject: [PATCH] amdvlk: update to 2023.Q2.3.

---
 .../patches/pal-define-ACCESSPERMS.patch      | 12 ++++++
 srcpkgs/amdvlk/template                       | 38 +++++++++----------
 2 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch

diff --git a/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
new file mode 100644
index 00000000000..d61ba4ba09c
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
@@ -0,0 +1,12 @@
+diff --git a/pal/src/util/lnx/lnxSysUtil.cpp b/pal/src/util/lnx/lnxSysUtil.cpp
+index 3105084b..e61c438a 100644
+--- a/pal/src/util/lnx/lnxSysUtil.cpp
++++ b/pal/src/util/lnx/lnxSysUtil.cpp
+@@ -1207,6 +1207,7 @@ bool IsDebuggerAttached()
+ Result SetRwxFilePermissions(
+     const char* pFileName)
+ {
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX)
+     Result result = Result::Success;
+     struct stat info;
+     int ret = stat(pFileName, &info);
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 76d066d5a0e..3bfefd83e07 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,14 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2022.Q4.4
+version=2023.Q2.3
 revision=1
-_xgl_commit=8aa0e76a110fa264608ee1b4e412aa8fb40286d3
-_pal_commit=287ef684bc36a86af55d4ed1c4c4f4c35577e21e
-_llpc_commit=37dcb2e5cedb00bb025c84238d816f19c93b3060
-_gpurt_commit=1f0c4f7e9cea22452e5e20a6cdfc4a84a2bf5bac
-_llvm_project_commit=42a4d92d3c68995d04f1ed580613d162054f5795
+_xgl_commit=6288905587fafc221b60045bceba73cf26e433ad
+_pal_commit=f01505f7fe4b38b573a41cb4d9d66d00e0c256f0
+_llpc_commit=f44e737f5e13eca803f465fc86532c24608c4daf
+_gpurt_commit=a1103572dfcc29c7baee04e2ececedca8fda86d7
+_llvm_project_commit=02394516f587d6bdb606b068fe604284f5c6a007
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
+_llvm_dialects_commit=e7464fe6373553fa1b1c1398417d7bb76d7931ef
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
@@ -31,15 +32,17 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm-project/archive/${_llvm_project_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="19e1b4344b76aa52429f06bf083ba90070c2415bda90f0991dddebf846e84752
- d3b465c84bdff774d2b2916121d7e9d6b31cb8467eb08fa8e1de9a5136dfe7be
- b992d8f4b4093793de87375a3f7b0ded71a1a2443c620fbc017776588861421d
- 9a2d41a49dd69a9634ab7aa30e750dfdc255c4f2e0c4c739028ac8a52c1bb5a6
- 11c31d5da5a846476825b2af2c67fd2025c892b6133b1b0a97c3548d691e5584
- 2b154a73681aa0424446b09737263fb35ae842fc92ee60fed999bad5fe15a7f9
+ 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="0fd70d472200c98dabdf86b58a0cf7a1af1a46dd32d02d165676faa8dedf16f7
+ 42bf8f0410e48f3e33ad4f728416f769e59d26089dfc259441a0d3f96a1e081a
+ 629778956dcab9afe42450f3048e189c24b4c22862c90524df1de3910a5bbb86
+ 53d5dbcbeae08809a5d7a0c109be07a24bb97bef1ff5099de0666dd72f57ccfb
+ 75ec3380afa1cc3baf55897f72573c84849b70c0e97c36b311761bb2aa9fcb58
+ a2054e610ef420b083f0ca071f62a9f51db29e3c246ba3de2f5d0437b722e611
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
- 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484"
+ 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
+ 6c1c0e9f7dae4848bf5106d4b89f310e4c269a575b74daced547933abd14c7ee"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
@@ -47,11 +50,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*) nodebug=yes;;
 esac
 
-pre_build() {
-	pwd
-	ninja -C build GpuRtGenerateShaders
-}
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -62,6 +60,8 @@ post_extract() {
 	mkdir ${wrksrc}/third_party
 	mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/third_party/metrohash
 	mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/third_party/cwpack
+	rmdir ${wrksrc}/llpc/imported/llvm-dialects/
+	mv ${wrksrc}/llvm-dialects-${_llvm_dialects_commit}/ ${wrksrc}/llpc/imported/llvm-dialects/
 }
 
 pre_configure() {