From 551e4fcc4a4fb946d2b4ebdc8400bde6569a5360 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Apr 2021 13:58:29 +0200
Subject: [PATCH] amdvlk: update to 2021.Q2.1.

---
 .../patches/cmake-build-type-none.patch       | 24 ++++++++++---------
 srcpkgs/amdvlk/template                       | 22 ++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index 7a629e58548..897bbe44b14 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -46,15 +46,17 @@ Index: xgl/CMakeLists.txt
      if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
          set(CMAKE_BUILD_TYPE_DEBUG ON)
          set(CMAKE_BUILD_TYPE_RELEASE OFF)
-Index: xgl/icd/CMakeLists.txt
-===================================================================
---- xgl/icd/CMakeLists.txt.orig
-+++ xgl/icd/CMakeLists.txt
-@@ -84,7 +84,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl
-     endif()
+--- xgl/cmake/Modules/AmdCmakeHelper.cmake	2021-04-07 06:57:17.000000000 +0200
++++ -	2021-04-26 14:11:03.415683706 +0200
+@@ -35,11 +35,6 @@
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
  
-     if(CMAKE_BUILD_TYPE_RELEASE)
--        target_compile_options(xgl PRIVATE -O3)
-         if(XGL_ENABLE_LTO)
-             if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-                 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 4de14e89343..a525ce00ae1 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q1.4
+version=2021.Q2.1
 revision=1
-_llpc_commit=2692228d80d8be2221641b719eb7135f52bc34aa
-_xgl_commit=e5c5ad454049892ed803b0adcc15ef6fb27ec50e
-_pal_commit=575d41ff01c856d9566168d65b31e4b49db4734b
-_llvm_project_commit=90d06712ff54e242b7bd225321e4fc8629292d46
+_llpc_commit=a8ec3c6e6372dcfd812a2ea592141a821e9584b1
+_xgl_commit=e1be7ee14c39d3a36d9d1aacd00caf3acc437cde
+_pal_commit=83635fbee82fb21662a4737e34437c41172c6fe0
+_llvm_project_commit=b0392f639492720b268697f4261aaccfa3459537
 _spvgen_commit=59823e6c3557cb7f3fae4a9f2760ad3f6b694997
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -18,7 +18,7 @@ configure_args="-DBUILD_WAYLAND_SUPPORT=ON
  -DXGL_CWPACK_PATH=../../cwpack
  -DLLVM_PARALLEL_LINK_JOBS=2"
 hostmakedepends="pkg-config python3 perl"
-makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel"
+makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel wayland-devel"
 depends="vulkan-loader"
 short_desc="AMD Open Source Driver For Vulkan"
 maintainer="John <me@johnnynator.dev>"
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_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="c88b946a0dd8d9442e798ce3a182b6f23ffab0b96e9967292ad6ba84c74d9273
- 1e043aee70e5690bc5934a2352a19c182e5d27c59ac9870089d979ce59c125cc
- 571fdf549864eea95e716149bbc54d6906ac74d5d5811c46047b4483256590e6
- 42e048a5ea32fb44f26ad96b538754bbffdcd9f20a019bacd1efd2302a3502ac
- e7e9a943486fb16426fb5584a992a227a3e014142bdc70e25ce18a7ccdb830f5
+checksum="c491929f959404527816ec9a88755916282aceeb191cd7bfb0440682e202e186
+ f585fd7d43985cb396f8470781f80229018bedc96aae7939b979015ce1caf064
+ a999ff6400b0e16b4f47dd9fb063b071ec5b8226f5bca84d58e6a9f52a36966c
+ ad36dab535943239357fc6101e9d4be532e950366d97f761f8cb63a6f4ee755d
+ 18665c4ba9bc80179315f18c877c3a9e9790e53e2ceb3090c03bc2510f30652e
  124e37608f2ef49a980c3fff9cc73bcb154c9724ee00397e0dee6cc8cf1b4244
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"