From c0be3e881c745a26ce6b15884c726db34e8dc77f Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 15 Sep 2019 10:36:11 +0200
Subject: [PATCH] amdvlk: update to 2019.Q3.5.

---
 srcpkgs/amdvlk/patches/musl.patch | 33 -------------------------------
 srcpkgs/amdvlk/template           | 31 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch
index 9cf3d74915f..5e4e1e9f18d 100644
--- a/srcpkgs/amdvlk/patches/musl.patch
+++ b/srcpkgs/amdvlk/patches/musl.patch
@@ -1,23 +1,3 @@
-From a9dc984a35f0f522e3a1ec0d310facb3246a5d0f Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Fri, 25 Jan 2019 13:47:21 +0000
-Subject: [PATCH] Fix Compilation against Musl libc
-
-diff --git pal/shared/gpuopen/inc/posix/ddPosixPlatform.h pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-index df54bfe..55d707c 100644
---- pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-+++ pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-@@ -72,6 +72,9 @@ static_assert(false, "Unknown platform detected")
- #else
- #define DD_AXIOMATICALLY_CANNOT_HAPPEN(expr) ((expr) ? DD_UNUSED(0) : __builtin_unreachable())
- #endif
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#include "rand48_r.h"
-+#endif
- 
- namespace DevDriver
- {
-
 --- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-03-01 15:31:04.000000000 +0100
 +++ -	2019-03-04 15:42:00.789284605 +0100
 @@ -34,12 +34,12 @@
@@ -35,16 +15,3 @@ index df54bfe..55d707c 100644
  #include <stdio.h>
  #include <stdlib.h>
  
---- pal/shared/gpuopen/CMakeLists.txt	2019-06-06 14:52:37.000000000 +0200
-+++ -	2019-06-10 19:23:05.932195923 +0200
-@@ -72,6 +72,10 @@
-     set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
-     target_link_libraries(${GPUOPEN_LIB_NAME} Threads::Threads)
-+    check_symbol_exists(seed48_r stdlib.h HAVE_RAND48)
-+    if(NOT HAVE_RAND48)
-+        target_link_libraries(${GPUOPEN_LIB_NAME} rand48_r)
-+    endif()
- endif()
- 
- ### Build Defines ######################################################################################################
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 58b7b030dc0..44ae7f87f26 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,17 +1,19 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2019.Q3.4
+version=2019.Q3.5
 revision=1
-_llpc_commit=0da6ca8e09f41639636a106f9b9ca74df50321ce
-_xgl_commit=9b632ef4f132bddc94769702ed8b49efbc39d89c
-_pal_commit=66e78b997748d03d77e1d706c10f1f17e18e5654
+_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101
+_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021
+_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c
 _llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830
 _spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc
+_metrohash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
 build_style=cmake
-configure_args="-DBUILD_WAYLAND_SUPPORT=ON"
+configure_args="-DBUILD_WAYLAND_SUPPORT=ON
+ -DXGL_METROHASH_PATH=../../metrohash"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel"
 depends="vulkan-loader"
@@ -24,20 +26,18 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz"
-checksum="01777c1cfe4df7dce4feb91e75658fbc865dd5c755ff79451191a0cf8de1c7a4
- 00bf10ff483ba5f6420fb3bfe34f7ce77c6d33515840df64ed1e2858e0eeb831
- 6baede0581d63bdf88cc72c8c496b0cef534ee244dd4f74bcb39a9e0e0beeacd
- e8a29b20a166cb7139157a40e88b8087ed33097871dcaee1bfda61b6a417886f
+ https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/MetroHash/archive/${_metrohash_commit}.tar.gz"
+checksum="383d43ddcff3295bb8dc85bce2a376fbde9f2aa3535be9e4dbf67f745c40ff41
+ abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584
+ 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906
+ 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627
  efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1
- cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401"
+ cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401
+ e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
-case $XBPS_TARGET_MACHINE in
-	*-musl) makedepends+=" rand48_r-devel"
-esac
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -45,6 +45,7 @@ post_extract() {
 	mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc
 	mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm
 	mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen
+	mv ${wrksrc}/MetroHash-${_metrohash_commit} ${wrksrc}/metrohash
 }
 
 pre_configure() {