Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits: 8e8cde25 by Timo Aaltonen at 2024-09-17T14:42:22+03:00 rules: Migrate to llvm-19. - - - - - 1c6a0812 by Timo Aaltonen at 2024-09-17T14:43:25+03:00 clc-find-opencl-headers.diff: Fix finding the opencl headers with llvm-19. - - - - - 4912411e by Timo Aaltonen at 2024-09-17T14:43:46+03:00 releasing package mesa version 24.2.2-1+exp1 - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/clc-find-opencl-headers.diff - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +mesa (24.2.2-1+exp1) experimental; urgency=medium + + * rules: Migrate to llvm-19. + * clc-find-opencl-headers.diff: Fix finding the opencl headers with + llvm-19. + + -- Timo Aaltonen <[email protected]> Tue, 17 Sep 2024 14:43:27 +0300 + mesa (24.2.2-1) unstable; urgency=medium * New upstream release. ===================================== debian/control ===================================== @@ -49,11 +49,11 @@ Build-Depends: libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], libwayland-dev (>= 1.15.0) [linux-any], libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-cpp18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], wayland-protocols (>= 1.34), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), @@ -62,8 +62,8 @@ Build-Depends: rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - llvm-spirv-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-spirv-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + libllvmspirvlib-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32], librust-syn-dev (>= 2.0.68) [amd64 arm64 armhf i386 ppc64 riscv64 x32], Rules-Requires-Root: no @@ -419,7 +419,7 @@ Section: libs Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: - libclc-18, + libclc-19, ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, ===================================== debian/patches/clc-find-opencl-headers.diff ===================================== @@ -0,0 +1,35 @@ +From 1074d3ae313761e565f45709cb652f552d176291 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin <[email protected]> +Date: Wed, 19 Jun 2024 23:52:57 +0300 +Subject: [PATCH] clc: find opencl headers from the installed llvm/clang + location + +A number of people report the headers not being found when running +intel-clc. I've run into the same issue but only on the most recent +Ubuntu version. + +Signed-off-by: Lionel Landwerlin <[email protected]> +--- + src/compiler/clc/clc_helpers.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp +index c95ed657038cf..49e3ea1ed0290 100644 +--- a/src/compiler/clc/clc_helpers.cpp ++++ b/src/compiler/clc/clc_helpers.cpp +@@ -900,6 +900,12 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, + c->getHeaderSearchOpts().AddPath(clang_res_path.string(), + clang::frontend::Angled, + false, false); ++ ++ auto clang_install_res_path = ++ fs::path(LLVM_LIB_DIR) / "clang" / std::to_string(LLVM_VERSION_MAJOR) / "include"; ++ c->getHeaderSearchOpts().AddPath(clang_install_res_path.string(), ++ clang::frontend::Angled, ++ false, false); + #endif + + // Enable/Disable optional OpenCL C features. Some can be toggled via `OpenCLExtensionsAsWritten` +-- +GitLab + ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ path_max.diff src_glx_dri_common.h.diff +clc-find-opencl-headers.diff ===================================== debian/rules ===================================== @@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) # for finding the correct llvm-config when meson doesn't know about it yet -LLVM_VERSION = 18 +LLVM_VERSION = 19 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH) export DEB_BUILD_MAINT_OPTIONS=optimize=-lto View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8ed5e6f406607552dc33385e3599639aaf56df81...4912411ee7efb6fe04d696ad37de52d653940af2 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8ed5e6f406607552dc33385e3599639aaf56df81...4912411ee7efb6fe04d696ad37de52d653940af2 You're receiving this email because of your account on salsa.debian.org.
