Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] amdvlk: update to 2022.Q4.1
@ 2022-11-03 22:59 Johnnynator
  2022-11-04 19:04 ` [PR PATCH] [Updated] " Johnnynator
  2022-11-04 19:41 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 2 replies; 3+ messages in thread
From: Johnnynator @ 2022-11-03 22:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Johnnynator/void-packages amdvlk
https://github.com/void-linux/void-packages/pull/40323

amdvlk: update to 2022.Q4.1
- amdvlk: update to 2022.Q4.1.
- New package: DirectXShaderCompiler-1.7.2207

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

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f53497f9dba5dc831e70f1f38acadad1d9140da1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 14 Oct 2022 16:29:47 +0200
Subject: [PATCH 1/2] amdvlk: update to 2022.Q4.1.

---
 .../patches/cmake-build-type-none.patch       | 46 ----------------
 .../patches/pal-missing-time-include.patch    | 12 -----
 srcpkgs/amdvlk/template                       | 52 +++++++++++--------
 3 files changed, 29 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/amdvlk/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/amdvlk/patches/pal-missing-time-include.patch

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 c6b356b54976..000000000000
--- 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 eb45353fe253..000000000000
--- 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 <random>
-+#include <time.h>
- #include <unistd.h>
- 
- namespace Util
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a5aba8577b4e..9c0a46c0ddae 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 <me@johnnynator.dev>"
@@ -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() {

From 8c8b76a40c5e9f1cb44feb33025e2d6768c1be43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 14 Oct 2022 21:26:41 +0200
Subject: [PATCH 2/2] New package: DirectXShaderCompiler-1.7.2207

---
 common/shlibs                          |  1 +
 srcpkgs/DirectXShaderCompiler-devel    |  1 +
 srcpkgs/DirectXShaderCompiler/template | 62 ++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/DirectXShaderCompiler-devel
 create mode 100644 srcpkgs/DirectXShaderCompiler/template

diff --git a/common/shlibs b/common/shlibs
index 15943b843377..3a836fd73a84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1819,6 +1819,7 @@ libmateweather.so.1 libmateweather-1.8.0_1
 libmate-panel-applet-4.so.1 libmate-panel-1.8.0_1
 libslab.so.0 libmate-control-center-1.8.2_1
 liblz4.so.1 liblz4-1.8.2_1
+libdxcompiler.so.3.7 DirectXShaderCompiler-1.7.2207_1
 libatrilview.so.3 libatril-1.8.0_1
 libatrildocument.so.3 libatril-1.8.0_1
 libjawt.so openjdk8-jre-8u20_2
diff --git a/srcpkgs/DirectXShaderCompiler-devel b/srcpkgs/DirectXShaderCompiler-devel
new file mode 120000
index 000000000000..9ead4a1bd207
--- /dev/null
+++ b/srcpkgs/DirectXShaderCompiler-devel
@@ -0,0 +1 @@
+DirectXShaderCompiler
\ No newline at end of file
diff --git a/srcpkgs/DirectXShaderCompiler/template b/srcpkgs/DirectXShaderCompiler/template
new file mode 100644
index 000000000000..a9e18c6e29ab
--- /dev/null
+++ b/srcpkgs/DirectXShaderCompiler/template
@@ -0,0 +1,62 @@
+# Template file for 'DirectXShaderCompiler'
+pkgname=DirectXShaderCompiler
+version=1.7.2207
+revision=1
+build_style=cmake
+configure_args="-C ../cmake/caches/PredefinedParams.cmake "
+hostmakedepends="python3 git"
+short_desc="DirectX Shader Compiler based on LLVM/Clang. "
+maintainer="Joshua Woodie <joshua.t.woodie@gmail.com>"
+license="LLVM"
+homepage="https://github.com/microsoft/DirectXShaderCompiler"
+_SPIRV_Headers_commit=b2a156e1c0434bc8c99aaebba1c7be98be7ac580
+_SPIRV_Tools_commit=b930e734ea198b7aabbbf04ee1562cf6f57962f0
+_re2_commit=3e9622e0cd94ebba6e04d5c50b7af32029e330d8
+_effcee_commit=ddf5e2bb92957dc8a12c5392f8495333d6844133
+distfiles="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${version}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Headers/archive/${_SPIRV_Headers_commit}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Tools/archive/${_SPIRV_Tools_commit}.tar.gz
+ https://github.com/google/re2/archive/${_re2_commit}.tar.gz
+ https://github.com/google/effcee/archive/${_effcee_commit}.tar.gz"
+checksum="a52aad3830b4d3e39734455ad7f288ad24e32c006e256d987a0ed44fc54fbd26
+ b200990e1c07894906e298368e7e56d5ab9d728d851f9292587ec740c2b4d409
+ 9cddc845f99d7daa65940ff9deb6754cd71b67987ec9860bb0ef2af8a8732c84
+ 218e0f8d100ba09a089582de7a54ae0ebfa08fd8e43b4c8035ef2faa5e0d284a
+ 5809b2f80b67dc231c52da743be37bb46c5ce4a59dde344761f7c4295119750c"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# Tests on musl would require some patching to be done
+	configure_args+="-DCLANG_INCLUDE_TESTS=FALSE -DHLSL_INCLUDE_TESTS=FALSE"
+fi
+nocross="fun with cmake and bunlded llvm"
+
+post_extract() {
+	rmdir -v ${wrksrc}/external/SPIRV-Headers
+	mv ${wrksrc}/../SPIRV-Headers-${_SPIRV_Headers_commit} ${wrksrc}/external/SPIRV-Headers
+	rmdir -v ${wrksrc}/external/SPIRV-Tools
+	mv ${wrksrc}/../SPIRV-Tools-${_SPIRV_Tools_commit} ${wrksrc}/external/SPIRV-Tools
+	rmdir -v ${wrksrc}/external/re2
+	mv ${wrksrc}/../re2-${_re2_commit} ${wrksrc}/external/re2
+	rmdir -v ${wrksrc}/external/effcee
+	mv ${wrksrc}/../effcee-${_effcee_commit} ${wrksrc}/external/effcee
+}
+
+do_install() {
+	for f in build/lib/libdxcompiler.so*; do
+		vinstall $f 644 usr/lib
+	done
+	vbin build/bin/dxc
+	vmkdir usr/include
+	vcopy include/dxc usr/include/
+	vlicense LICENSE.TXT
+	vlicense ThirdPartyNotices.txt
+}
+
+DirectXShaderCompiler-devel_package() {
+	short_desc+="${short_desc} - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin/dxc
+	}
+}

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] amdvlk: update to 2022.Q4.1
  2022-11-03 22:59 [PR PATCH] amdvlk: update to 2022.Q4.1 Johnnynator
@ 2022-11-04 19:04 ` Johnnynator
  2022-11-04 19:41 ` [PR PATCH] [Merged]: " Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2022-11-04 19:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Johnnynator/void-packages amdvlk
https://github.com/void-linux/void-packages/pull/40323

amdvlk: update to 2022.Q4.1
- amdvlk: update to 2022.Q4.1.
- New package: DirectXShaderCompiler-1.7.2207

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

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 97287f448bf40296ebd00acd795f525427226a27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 14 Oct 2022 16:29:47 +0200
Subject: [PATCH 1/2] amdvlk: update to 2022.Q4.1.

---
 .../patches/cmake-build-type-none.patch       | 46 ----------------
 .../patches/pal-missing-time-include.patch    | 12 -----
 srcpkgs/amdvlk/template                       | 52 +++++++++++--------
 3 files changed, 29 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/amdvlk/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/amdvlk/patches/pal-missing-time-include.patch

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 c6b356b54976..000000000000
--- 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 eb45353fe253..000000000000
--- 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 <random>
-+#include <time.h>
- #include <unistd.h>
- 
- namespace Util
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a5aba8577b4e..9c0a46c0ddae 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 <me@johnnynator.dev>"
@@ -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() {

From 4e2a757a680d5a39afc6d8977d64f6ea62a230b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 14 Oct 2022 21:26:41 +0200
Subject: [PATCH 2/2] New package: DirectXShaderCompiler-1.7.2207

---
 common/shlibs                          |  1 +
 srcpkgs/DirectXShaderCompiler-devel    |  1 +
 srcpkgs/DirectXShaderCompiler/template | 63 ++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 120000 srcpkgs/DirectXShaderCompiler-devel
 create mode 100644 srcpkgs/DirectXShaderCompiler/template

diff --git a/common/shlibs b/common/shlibs
index 71450853c6b1..a350b6d0bb79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1819,6 +1819,7 @@ libmateweather.so.1 libmateweather-1.8.0_1
 libmate-panel-applet-4.so.1 libmate-panel-1.8.0_1
 libslab.so.0 libmate-control-center-1.8.2_1
 liblz4.so.1 liblz4-1.8.2_1
+libdxcompiler.so.3.7 DirectXShaderCompiler-1.7.2207_1
 libatrilview.so.3 libatril-1.8.0_1
 libatrildocument.so.3 libatril-1.8.0_1
 libjawt.so openjdk8-jre-8u20_2
diff --git a/srcpkgs/DirectXShaderCompiler-devel b/srcpkgs/DirectXShaderCompiler-devel
new file mode 120000
index 000000000000..9ead4a1bd207
--- /dev/null
+++ b/srcpkgs/DirectXShaderCompiler-devel
@@ -0,0 +1 @@
+DirectXShaderCompiler
\ No newline at end of file
diff --git a/srcpkgs/DirectXShaderCompiler/template b/srcpkgs/DirectXShaderCompiler/template
new file mode 100644
index 000000000000..0307ce0ccee6
--- /dev/null
+++ b/srcpkgs/DirectXShaderCompiler/template
@@ -0,0 +1,63 @@
+# Template file for 'DirectXShaderCompiler'
+pkgname=DirectXShaderCompiler
+version=1.7.2207
+revision=1
+build_style=cmake
+configure_args="-C ../cmake/caches/PredefinedParams.cmake"
+hostmakedepends="python3 git"
+short_desc="DirectX Shader Compiler based on LLVM/Clang. "
+maintainer="Joshua Woodie <joshua.t.woodie@gmail.com>"
+license="LLVM"
+homepage="https://github.com/microsoft/DirectXShaderCompiler"
+_SPIRV_Headers_commit=b2a156e1c0434bc8c99aaebba1c7be98be7ac580
+_SPIRV_Tools_commit=b930e734ea198b7aabbbf04ee1562cf6f57962f0
+_re2_commit=3e9622e0cd94ebba6e04d5c50b7af32029e330d8
+_effcee_commit=ddf5e2bb92957dc8a12c5392f8495333d6844133
+distfiles="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${version}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Headers/archive/${_SPIRV_Headers_commit}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Tools/archive/${_SPIRV_Tools_commit}.tar.gz
+ https://github.com/google/re2/archive/${_re2_commit}.tar.gz
+ https://github.com/google/effcee/archive/${_effcee_commit}.tar.gz"
+checksum="a52aad3830b4d3e39734455ad7f288ad24e32c006e256d987a0ed44fc54fbd26
+ b200990e1c07894906e298368e7e56d5ab9d728d851f9292587ec740c2b4d409
+ 9cddc845f99d7daa65940ff9deb6754cd71b67987ec9860bb0ef2af8a8732c84
+ 218e0f8d100ba09a089582de7a54ae0ebfa08fd8e43b4c8035ef2faa5e0d284a
+ 5809b2f80b67dc231c52da743be37bb46c5ce4a59dde344761f7c4295119750c"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# Tests on musl would require some patching to be done
+	# Also some fun with Mutexes. so mt is disabled for now
+	configure_args+=" -DCLANG_INCLUDE_TESTS=FALSE -DHLSL_INCLUDE_TESTS=FALSE -DLLVM_ENABLE_THREADS=OFF"
+fi
+nocross="fun with cmake and bunlded llvm"
+
+post_extract() {
+	rmdir -v ${wrksrc}/external/SPIRV-Headers
+	mv ${wrksrc}/../SPIRV-Headers-${_SPIRV_Headers_commit} ${wrksrc}/external/SPIRV-Headers
+	rmdir -v ${wrksrc}/external/SPIRV-Tools
+	mv ${wrksrc}/../SPIRV-Tools-${_SPIRV_Tools_commit} ${wrksrc}/external/SPIRV-Tools
+	rmdir -v ${wrksrc}/external/re2
+	mv ${wrksrc}/../re2-${_re2_commit} ${wrksrc}/external/re2
+	rmdir -v ${wrksrc}/external/effcee
+	mv ${wrksrc}/../effcee-${_effcee_commit} ${wrksrc}/external/effcee
+}
+
+do_install() {
+	for f in build/lib/libdxcompiler.so*; do
+		vinstall $f 644 usr/lib
+	done
+	vbin build/bin/dxc
+	vmkdir usr/include
+	vcopy include/dxc usr/include/
+	vlicense LICENSE.TXT
+	vlicense ThirdPartyNotices.txt
+}
+
+DirectXShaderCompiler-devel_package() {
+	short_desc+="${short_desc} - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin/dxc
+	}
+}

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: amdvlk: update to 2022.Q4.1
  2022-11-03 22:59 [PR PATCH] amdvlk: update to 2022.Q4.1 Johnnynator
  2022-11-04 19:04 ` [PR PATCH] [Updated] " Johnnynator
@ 2022-11-04 19:41 ` Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2022-11-04 19:41 UTC (permalink / raw)
  To: ml

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

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

amdvlk: update to 2022.Q4.1
https://github.com/void-linux/void-packages/pull/40323

Description:
- amdvlk: update to 2022.Q4.1.
- New package: DirectXShaderCompiler-1.7.2207

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

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-11-04 19:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-03 22:59 [PR PATCH] amdvlk: update to 2022.Q4.1 Johnnynator
2022-11-04 19:04 ` [PR PATCH] [Updated] " Johnnynator
2022-11-04 19:41 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).