[PR PATCH] amdvlk: update to 2024.Q1.3.

[PR PATCH] amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

There is a new pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-amdvlk
https://github.com/void-linux/void-packages/pull/49649

amdvlk: update to 2024.Q1.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)




A patch file from https://github.com/void-linux/void-packages/pull/49649.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-amdvlk-49649.patch --]
[-- Type: text/x-diff, Size: 3425 bytes --]

From 4ae37f09fefb4934a922c0a9de883c50fc6654d3 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Mon, 1 Apr 2024 15:34:14 +0200
Subject: [PATCH] amdvlk: update to 2024.Q1.3.

---
 srcpkgs/amdvlk/template | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 3bfefd83e07128..0c1a625f29bff9 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,15 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2023.Q2.3
+version=2024.Q1.3
 revision=1
-_xgl_commit=6288905587fafc221b60045bceba73cf26e433ad
-_pal_commit=f01505f7fe4b38b573a41cb4d9d66d00e0c256f0
-_llpc_commit=f44e737f5e13eca803f465fc86532c24608c4daf
-_gpurt_commit=a1103572dfcc29c7baee04e2ececedca8fda86d7
-_llvm_project_commit=02394516f587d6bdb606b068fe604284f5c6a007
+_xgl_commit=b7100c18eb2d134098738f97d7cc3a26e485862f
+_pal_commit=42e29f4d3d528c6a59c2db77fb6d70127fb9ffab
+_llpc_commit=14535c028dc70a093d95a95efedb749812c1e77d
+_gpurt_commit=2e6d528610f45a99723d6e4f15f24da12fd6a1e5
+_llvm_project_commit=da55e9e39bc7868016b7b265aa535dff84b7d591
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
-_llvm_dialects_commit=e7464fe6373553fa1b1c1398417d7bb76d7931ef
+_llvm_dialects_commit=3f9e17f5f44e825de6450cc8a5aff7f3d5a32ef2
 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"
+ DirectXShaderCompiler-devel glslang-devel python3-Jinja2"
 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="0fd70d472200c98dabdf86b58a0cf7a1af1a46dd32d02d165676faa8dedf16f7
- 42bf8f0410e48f3e33ad4f728416f769e59d26089dfc259441a0d3f96a1e081a
- 629778956dcab9afe42450f3048e189c24b4c22862c90524df1de3910a5bbb86
- 53d5dbcbeae08809a5d7a0c109be07a24bb97bef1ff5099de0666dd72f57ccfb
- 75ec3380afa1cc3baf55897f72573c84849b70c0e97c36b311761bb2aa9fcb58
- a2054e610ef420b083f0ca071f62a9f51db29e3c246ba3de2f5d0437b722e611
+checksum="1d9c1d6db54f3f33882d01ce82bf6aa55f87e079d9ded460768392e07f0e939b
+ a1d1640d7db89be37b76a595ec5cee3882575edfbe14964b7bbbd2e414ba0eef
+ 87c28616b8ce88bdbe58b988c8f18368e7dd6ff047b33058f5d9c21ca3cd69e6
+ 9aa6ef9dbddc37b0dff73f8fefdceea21d1b2aed306652e288d0b09d774e2599
+ cbc83121e6a160d92b8f61c2911ea8fbf21e17c9310201fdb06c12cd356d854c
+ 6cf55ce86ff23d7e8924e145869af76905233d80b8f5cf5f1849f15e3b571236
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
  87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
- 6c1c0e9f7dae4848bf5106d4b89f310e4c269a575b74daced547933abd14c7ee"
+ 127ca534fcf8051aeba8cfe02d1dc309d0a6df2ba4d08508713ddea308370250"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 

Re: amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2032984308

Comment:
The issue with x64-musl happens after the update, the original version still builds fine.

Re: amdvlk: update to 2024.Q1.3.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2033137944

Comment:
The `errors` in the build logs seem to be mainly missuse of NULL and should be patched to be `OL`.

Most of the warnings can probably be ignored.

Re: amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2033556567

Comment:
> The `errors` in the build logs seem to be mainly missuse of NULL and should be patched to be `OL`.
> 
> Most of the warnings can probably be ignored.

Copy that. I'll see what i can do.

It's because of a misuse from Upstream and not a difference between glibc and musl?

Re: amdvlk: update to 2024.Q1.3.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2033571600

Comment:
Musl and Glibc differ at how they define NULL. (`std::nullptr` vs `(void*)0`).
Both of these choices are valid, but std::nullptr can't be implicitely used as a number.

Upstream amdvlk uses NULL as an integer and not a Pointer in a few places

Re: amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2033677159

Comment:
> Musl and Glibc differ at how they define NULL. (`std::nullptr` vs `(void*)0`). Both of these choices are valid, but std::nullptr can't be implicitely used as a number.
> 
> Upstream amdvlk uses NULL as an integer and not a Pointer in a few places

I see... Thanks for the explanation! If i got some time in the future i'll try to learn more about musl and glibc.

Re: amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 497 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2034325171

Comment:
I made a little test on the rush, replacing `NULL,` by `OL` returns `undefined` and `0L` (apparently it's a zero, long number type) returns another error.

I might have made a few mistakes here and there tho. I tried to changed the `NULL,` that was reported in the error to not create any new error. 

But which ones should i change in particular?

Re: [PR PATCH] [Updated] amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-amdvlk
https://github.com/void-linux/void-packages/pull/49649

amdvlk: update to 2024.Q1.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)




A patch file from https://github.com/void-linux/void-packages/pull/49649.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-amdvlk-49649.patch --]
[-- Type: text/x-diff, Size: 5900 bytes --]

From facf84ca86e059cd6aedba3e608a369716329dff Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Mon, 1 Apr 2024 15:34:14 +0200
Subject: [PATCH] amdvlk: update to 2024.Q1.3.

---
 srcpkgs/amdvlk/patches/fix-musl-build.patch | 22 +++++++++++++++
 srcpkgs/amdvlk/template                     | 30 ++++++++++-----------
 2 files changed, 37 insertions(+), 15 deletions(-)
 create 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
new file mode 100644
index 00000000000000..41a7a75c1812f9
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/fix-musl-build.patch
@@ -0,0 +1,22 @@
+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 3bfefd83e07128..0c1a625f29bff9 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,15 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2023.Q2.3
+version=2024.Q1.3
 revision=1
-_xgl_commit=6288905587fafc221b60045bceba73cf26e433ad
-_pal_commit=f01505f7fe4b38b573a41cb4d9d66d00e0c256f0
-_llpc_commit=f44e737f5e13eca803f465fc86532c24608c4daf
-_gpurt_commit=a1103572dfcc29c7baee04e2ececedca8fda86d7
-_llvm_project_commit=02394516f587d6bdb606b068fe604284f5c6a007
+_xgl_commit=b7100c18eb2d134098738f97d7cc3a26e485862f
+_pal_commit=42e29f4d3d528c6a59c2db77fb6d70127fb9ffab
+_llpc_commit=14535c028dc70a093d95a95efedb749812c1e77d
+_gpurt_commit=2e6d528610f45a99723d6e4f15f24da12fd6a1e5
+_llvm_project_commit=da55e9e39bc7868016b7b265aa535dff84b7d591
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
-_llvm_dialects_commit=e7464fe6373553fa1b1c1398417d7bb76d7931ef
+_llvm_dialects_commit=3f9e17f5f44e825de6450cc8a5aff7f3d5a32ef2
 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"
+ DirectXShaderCompiler-devel glslang-devel python3-Jinja2"
 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="0fd70d472200c98dabdf86b58a0cf7a1af1a46dd32d02d165676faa8dedf16f7
- 42bf8f0410e48f3e33ad4f728416f769e59d26089dfc259441a0d3f96a1e081a
- 629778956dcab9afe42450f3048e189c24b4c22862c90524df1de3910a5bbb86
- 53d5dbcbeae08809a5d7a0c109be07a24bb97bef1ff5099de0666dd72f57ccfb
- 75ec3380afa1cc3baf55897f72573c84849b70c0e97c36b311761bb2aa9fcb58
- a2054e610ef420b083f0ca071f62a9f51db29e3c246ba3de2f5d0437b722e611
+checksum="1d9c1d6db54f3f33882d01ce82bf6aa55f87e079d9ded460768392e07f0e939b
+ a1d1640d7db89be37b76a595ec5cee3882575edfbe14964b7bbbd2e414ba0eef
+ 87c28616b8ce88bdbe58b988c8f18368e7dd6ff047b33058f5d9c21ca3cd69e6
+ 9aa6ef9dbddc37b0dff73f8fefdceea21d1b2aed306652e288d0b09d774e2599
+ cbc83121e6a160d92b8f61c2911ea8fbf21e17c9310201fdb06c12cd356d854c
+ 6cf55ce86ff23d7e8924e145869af76905233d80b8f5cf5f1849f15e3b571236
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
  87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
- 6c1c0e9f7dae4848bf5106d4b89f310e4c269a575b74daced547933abd14c7ee"
+ 127ca534fcf8051aeba8cfe02d1dc309d0a6df2ba4d08508713ddea308370250"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 

Re: amdvlk: update to 2024.Q1.3.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/49649#issuecomment-2035444011

Comment:
[Nevermind, talked about it on the IRC: TL;DR available [here](https://github.com/GPUOpen-Drivers/AMDVLK/issues/357).]

Re: [PR PATCH] [Merged]: amdvlk: update to 2024.Q1.3.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

There's a merged pull request on the void-packages repository

amdvlk: update to 2024.Q1.3.
https://github.com/void-linux/void-packages/pull/49649

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)