[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa][debian-unstable] 3 commits: rules: Migrate to llvm-19.



Title: GitLab

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:

Changes:

  • debian/changelog
    1
    +mesa (24.2.2-1+exp1) experimental; urgency=medium
    
    2
    +
    
    3
    +  * rules: Migrate to llvm-19.
    
    4
    +  * clc-find-opencl-headers.diff: Fix finding the opencl headers with
    
    5
    +    llvm-19.
    
    6
    +
    
    7
    + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 17 Sep 2024 14:43:27 +0300
    
    8
    +
    
    1 9
     mesa (24.2.2-1) unstable; urgency=medium
    
    2 10
     
    
    3 11
       * New upstream release.
    

  • debian/control
    ... ... @@ -49,11 +49,11 @@ Build-Depends:
    49 49
      libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    50 50
      libwayland-dev (>= 1.15.0) [linux-any],
    
    51 51
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    
    52
    - llvm-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    53
    - libclang-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    54
    - libclang-cpp18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    55
    - libclc-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    56
    - libclc-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    52
    + llvm-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    53
    + libclang-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    54
    + libclang-cpp19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    55
    + libclc-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    56
    + libclc-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    57 57
      wayland-protocols (>= 1.34),
    
    58 58
      zlib1g-dev,
    
    59 59
      libglvnd-core-dev (>= 1.3.2),
    
    ... ... @@ -62,8 +62,8 @@ Build-Depends:
    62 62
      rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    
    63 63
      bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    
    64 64
      cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    
    65
    - llvm-spirv-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    
    66
    - libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    65
    + llvm-spirv-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    
    66
    + libllvmspirvlib-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    
    67 67
      librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    
    68 68
      librust-syn-dev (>= 2.0.68) [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    
    69 69
     Rules-Requires-Root: no
    
    ... ... @@ -419,7 +419,7 @@ Section: libs
    419 419
     Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    
    420 420
     Pre-Depends: ${misc:Pre-Depends}
    
    421 421
     Depends:
    
    422
    - libclc-18,
    
    422
    + libclc-19,
    
    423 423
      ocl-icd-libopencl1 | libopencl1,
    
    424 424
      ${shlibs:Depends},
    
    425 425
      ${misc:Depends},
    

  • debian/patches/clc-find-opencl-headers.diff
    1
    +From 1074d3ae313761e565f45709cb652f552d176291 Mon Sep 17 00:00:00 2001
    
    2
    +From: Lionel Landwerlin <llandwerlin@gmail.com>
    
    3
    +Date: Wed, 19 Jun 2024 23:52:57 +0300
    
    4
    +Subject: [PATCH] clc: find opencl headers from the installed llvm/clang
    
    5
    + location
    
    6
    +
    
    7
    +A number of people report the headers not being found when running
    
    8
    +intel-clc. I've run into the same issue but only on the most recent
    
    9
    +Ubuntu version.
    
    10
    +
    
    11
    +Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
    
    12
    +---
    
    13
    + src/compiler/clc/clc_helpers.cpp | 6 ++++++
    
    14
    + 1 file changed, 6 insertions(+)
    
    15
    +
    
    16
    +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
    
    17
    +index c95ed657038cf..49e3ea1ed0290 100644
    
    18
    +--- a/src/compiler/clc/clc_helpers.cpp
    
    19
    ++++ b/src/compiler/clc/clc_helpers.cpp
    
    20
    +@@ -900,6 +900,12 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
    
    21
    +    c->getHeaderSearchOpts().AddPath(clang_res_path.string(),
    
    22
    +                                     clang::frontend::Angled,
    
    23
    +                                     false, false);
    
    24
    ++
    
    25
    ++   auto clang_install_res_path =
    
    26
    ++      fs::path(LLVM_LIB_DIR) / "clang" / std::to_string(LLVM_VERSION_MAJOR) / "include";
    
    27
    ++   c->getHeaderSearchOpts().AddPath(clang_install_res_path.string(),
    
    28
    ++                                    clang::frontend::Angled,
    
    29
    ++                                    false, false);
    
    30
    + #endif
    
    31
    + 
    
    32
    +    // Enable/Disable optional OpenCL C features. Some can be toggled via `OpenCLExtensionsAsWritten`
    
    33
    +-- 
    
    34
    +GitLab
    
    35
    +

  • debian/patches/series
    1 1
     path_max.diff
    
    2 2
     src_glx_dri_common.h.diff
    
    3
    +clc-find-opencl-headers.diff

  • debian/rules
    ... ... @@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
    13 13
     DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    
    14 14
     
    
    15 15
     # for finding the correct llvm-config when meson doesn't know about it yet
    
    16
    -LLVM_VERSION = 18
    
    16
    +LLVM_VERSION = 19
    
    17 17
     export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
    
    18 18
     
    
    19 19
     export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
    


  • Reply to: