diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch deleted file mode 100644 index c6b356b5497..00000000000 --- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: llvm-project/llvm/CMakeLists.txt -=================================================================== ---- a/llvm-project/llvm/CMakeLists.txt -+++ b/llvm-project/llvm/CMakeLists.txt -@@ -251,11 +251,6 @@ endif() - - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - --if (CMAKE_BUILD_TYPE AND -- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") -- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") --endif() -- - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - - set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -Index: xgl/CMakeLists.txt -=================================================================== ---- a/xgl/CMakeLists.txt -+++ b/xgl/CMakeLists.txt -@@ -181,11 +181,6 @@ if (CMAKE_CONFIGURATION_TYPES) - else() - string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE) - -- 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) ---- a/xgl/cmake/Modules/AmdCmakeHelper.cmake 2021-04-07 06:57:17.000000000 +0200 -+++ b/xgl/cmake/Modules/AmdCmakeHelper.cmake 2021-04-07 06:57:17.000000000 +0200 -@@ -35,11 +35,6 @@ - else() - string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE) - -- 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/patches/pal-missing-time-include.patch b/srcpkgs/amdvlk/patches/pal-missing-time-include.patch deleted file mode 100644 index eb45353fe25..00000000000 --- a/srcpkgs/amdvlk/patches/pal-missing-time-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pal/src/util/lnx/lnxUuid.cpp b/pal/src/util/lnx/lnxUuid.cpp -index 603db2a7..56c5d1f4 100644 ---- a/pal/src/util/lnx/lnxUuid.cpp -+++ b/pal/src/util/lnx/lnxUuid.cpp -@@ -29,6 +29,7 @@ - #include "util/imported/libuuid/libuuid.h" - - #include -+#include - #include - - namespace Util diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index a5aba8577b4..9c0a46c0dda 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,24 +1,24 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2022.Q1.2 +version=2022.Q4.1 revision=1 -_llpc_commit=a9be3c24b81816b092282f25948b966f6b35a877 -_xgl_commit=7f50fdca1959454bd6e27f984fa2b29e7d5a8789 -_pal_commit=b638e90ca4e6e5a6fc4f00029d62f8e064aa18eb -_llvm_project_commit=7a66188b14010f5fdb65a3edf1e2cb5ffef0da80 -_spvgen_commit=6c2f36bcf0f8ff7ba8d20c8b789ca6346d1e16b1 -_MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2 -_CWPack_commit=39f8940199e60c44d4211cf8165dfd12876316fa +_xgl_commit=8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9 +_pal_commit=c2af6fc4c14ea61273bcf5576f8a83a12b945dd7 +_llpc_commit=9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e +_gpurt_commit=2874e509b677d78ddb3faae90989dd45e60669b3 +_llvm_project_commit=d2b67605e4dd5dc50d0afbeb4f20f29cce97b207 +_MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3 +_CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026 archs="i686* x86_64*" create_wrksrc=yes build_wrksrc="xgl" build_style=cmake configure_args="-DBUILD_WAYLAND_SUPPORT=ON - -DXGL_METROHASH_PATH=../../metrohash - -DXGL_CWPACK_PATH=../../cwpack + -DCMAKE_BUILD_TYPE=Release -DLLVM_PARALLEL_LINK_JOBS=2" hostmakedepends="pkg-config python3 perl" -makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel wayland-devel" +makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel wayland-devel + DirectXShaderCompiler-devel glslang-devel" depends="vulkan-loader" short_desc="AMD Open Source Driver For Vulkan" maintainer="John " @@ -26,20 +26,20 @@ license="MIT" homepage="https://github.com/GPUOpen-Drivers/AMDVLK" distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/llpc/archive/${_llpc_commit}.tar.gz + https://github.com/GPUOpen-Drivers/gpurt/archive/${_gpurt_commit}.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-project/archive/${_llvm_project_commit}.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="9d639e5ba246894ad4ed33c0197c06c7231e799cccd24e1ae3e5baacec9f47e1 - 46f3242f6af8930ea85a8a2ce60902ac3f5070f2ba65b4b49ad2edd964ea1770 - 59197f412a87289c1a0c2c7c9b6de7acd03f03abc48ca205a3ff3d48fbb2e0de - 637448884d01eab5701a2e1195528d865f38840f6f8a457dc92fddb803ed9466 - e31275608ffbeec1edb2c90dc2bcecd197b492f261918f617fec38feff123bd7 - 010bbd5ec538663dc2921ecbfd541e6ab727c73777f888b25ceb13ef5d9a7c3f - cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a - 0f5f9e050bdd944b335b3dd5baafce8327b75d65ec5a2812cf0441d1172b03ea" +checksum="b72a1a977a0fadb57248af98278eac2916a63705881a8e6f86210a9f39652188 + 75e8aecf09b03dfe8a2c48dff3fd56d027e0ca1a45bf889be8ba597d52da104f + ef813719b5cdf1ae1b20c29ff0c1ccddb8153262ebfe6f45977b6faa98966528 + 5a97b3a714c0b508b9bc2ee4f8902bf32fdc8bef6cdb36f997bcb48e8b940888 + b0b18d2ae80b49b5d6992bd80cec87199fb4dd2f242bff20b088355b0a422836 + d777d461bbe0b84734702ed13d7f13e5ef5d7ed093a1be4ee9deba1f32fac65b + 141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a + 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484" nocross=yes lib32files="/usr/share/vulkan/icd.d/amd_icd32.json" @@ -47,15 +47,21 @@ 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 mv ${wrksrc}/pal-${_pal_commit} ${wrksrc}/pal mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc + mv ${wrksrc}/gpurt-${_gpurt_commit} ${wrksrc}/gpurt mv ${wrksrc}/llvm-project-${_llvm_project_commit} ${wrksrc}/llvm-project - mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen - mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash - mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack + mkdir ${wrksrc}/third_party + mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/third_party/metrohash + mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/third_party/cwpack } pre_configure() {