From 61381c80e24f29cf696486171f9393e197bfaa50 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 30 Apr 2024 22:21:17 -0400 Subject: [PATCH 1/6] SPIRV-LLVM-Translator: update to 18.1.2, adopt. --- common/shlibs | 2 +- srcpkgs/SPIRV-LLVM-Translator/template | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 6f864b0d2b7a2a..28bbf9d10dc9b7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -990,7 +990,7 @@ libLLVM-12.so libllvm12-12.0.0_1 libLLVM-15.so libllvm15-15.0.7_4 libLLVM-17.so libllvm17-17.0.6_1 libLLVM.so.18.1 libllvm18-18.1.8_1 -libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1 +libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1 libomp.so.5 libomp-17.0.6_1 libomptarget.so.18.1 libomp-18.1.8_1 libisofs.so.6 libisofs-0.6.24_1 diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template index 6f1cf2bd6e4849..0df3ad41b333fd 100644 --- a/srcpkgs/SPIRV-LLVM-Translator/template +++ b/srcpkgs/SPIRV-LLVM-Translator/template @@ -1,20 +1,20 @@ # Template file for 'SPIRV-LLVM-Translator' pkgname=SPIRV-LLVM-Translator -version=17.0.0 +version=18.1.2 revision=1 build_style=cmake make_build_args="llvm-spirv" configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr" -hostmakedepends="clang llvm" -makedepends="clang-tools-extra llvm17-devel SPIRV-Headers" +hostmakedepends="clang18 llvm18" +makedepends="clang-tools-extra18 llvm18-devel SPIRV-Headers" short_desc="API and commands for processing SPIR-V modules" -maintainer="Orphaned " +maintainer="Daniel Martinez " license="NCSA" homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz" -checksum=eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2 +checksum=4724372934041c8feb8bcafea1c9d086ab2de9f323599068943ef61ddb0bca51 post_install() { vlicense LICENSE.TXT From 144a6bfd3cc6206ae792f1571216e8c7d4be9fdf Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 30 Apr 2024 22:22:28 -0400 Subject: [PATCH 2/6] SPIRV-Headers: update to 1.3.280.0, adopt. --- srcpkgs/SPIRV-Headers/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 6527729b3980b3..4cf2311240c0b0 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -1,15 +1,15 @@ # Template file for 'SPIRV-Headers' pkgname=SPIRV-Headers reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1" -version=1.3.268.0 +version=1.3.280.0 revision=1 build_style=cmake short_desc="Machine-readable files for the SPIR-V Registry" -maintainer="Orphaned " +maintainer="Daniel Martinez " license="MIT" homepage="https://github.com/KhronosGroup/SPIRV-Headers" distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${version}.tar.gz" -checksum=1022379e5b920ae21ccfb5cb41e07b1c59352a18c3d3fdcbf38d6ae7733384d4 +checksum=a00906b6bddaac1e37192eff2704582f82ce2d971f1aacee4d51d9db33b0f772 post_install() { vlicense LICENSE From d0d230a4267bfce93fff06ee66b0400f77e641ad Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 30 Apr 2024 22:22:47 -0400 Subject: [PATCH 3/6] SPIRV-Tools: update to 2024.3, adopt. --- srcpkgs/SPIRV-Tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index 283f80d34fd9a0..c0efb7b4fa7b1e 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-Tools' pkgname=SPIRV-Tools -version=2023.5 +version=2024.3 revision=1 build_style=cmake configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF @@ -8,12 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF hostmakedepends="python3" makedepends="SPIRV-Headers" short_desc="API and commands for processing SPIR-V modules" -maintainer="Orphaned " +maintainer="Daniel Martinez " license="Apache-2.0" homepage="https://github.com/KhronosGroup/SPIRV-Tools" changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES" distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${version}.rc1.tar.gz" -checksum=aed90b51ce884ce3ac267acec75e785ee743a1e1fd294c25be33b49c5804d77c +checksum=c639b53d2da17bac5a726df36d8da859a481739788bf67a5e4acfa7fab06d17e LDFLAGS="-Wl,--no-undefined" SPIRV-Tools-devel_package() { From 30176070da6b652af9fe262eed7eadec9862248e Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 30 Apr 2024 22:22:54 -0400 Subject: [PATCH 4/6] libclc: update to 18.1.8, adopt. --- srcpkgs/libclc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template index 714d6acbb404fc..da85a23c785549 100644 --- a/srcpkgs/libclc/template +++ b/srcpkgs/libclc/template @@ -1,19 +1,19 @@ # Template file for 'libclc' pkgname=libclc -version=17.0.6 +version=18.1.8 revision=1 build_style=cmake # disable clspv (failing tests, we don't ship it) configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-" -hostmakedepends="llvm17-devel python3 libedit-devel libffi-devel +hostmakedepends="llvm18-devel python3 libedit-devel libffi-devel ncurses-devel zlib-devel SPIRV-LLVM-Translator" short_desc="Open implementation of the OpenCL C programming language" -maintainer="Orphaned " +maintainer="Daniel Martinez " license="BSD-3-Clause, MIT" homepage="https://libclc.llvm.org" distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz" -checksum=122f641d94d5dfbb3c37534f2b76612fa59d15c36c2a4917369a85eaaca32148 +checksum=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e replaces="libclc-git>=0" do_configure() { From 8692d504346625f48a80846c83ad423049593242 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 16 May 2024 17:58:10 -0400 Subject: [PATCH 5/6] mesa: rebuild with llvm18 --- srcpkgs/mesa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 3acd6a2bca912a..8e3f5792215509 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,9 +1,9 @@ # Template file for 'mesa' pkgname=mesa version=24.1.2 -revision=1 +revision=2 build_style=meson -_llvmver=17 +_llvmver=18 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled From 8830f98fad4f8ff1f3e92311fab128f141b90aec Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 2 Jul 2024 10:18:01 -0400 Subject: [PATCH 6/6] skip --- srcpkgs/SPIRV-Tools/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index c0efb7b4fa7b1e..36d8ec098b450d 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -26,3 +26,4 @@ SPIRV-Tools-devel_package() { vmove "usr/lib/*.a" } } +foo