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

[Git][xorg-team/lib/mesa][debian-experimental] 4 commits: Build with llvm-12.

Title: GitLab

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa

Commits:

4 changed files:

Changes:

  • debian/changelog
    1 
    -mesa (21.1.0-1) UNRELEASED; urgency=medium
    1 
    +mesa (21.1.0-1) experimental; urgency=medium
    2 2
    3 3 
       * New upstream release.
    4 
    +  * Build with llvm-12.
    5 
    +  * path_max.diff: Refreshed.
    6 
    +  * rules: vulkan_intel.h is gone.
    4 7
    5 
    - -- Timo Aaltonen <tjaalton@debian.org>  Thu, 06 May 2021 09:29:33 +0300
    8 
    + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 06 May 2021 16:05:12 +0300
    6 9
    7 10 
     mesa (21.0.3-1) experimental; urgency=medium
    8 11

  • debian/control
    ... ... @@ -44,10 +44,10 @@ Build-Depends:
    44 44 
      libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    45 45 
      libwayland-dev (>= 1.15.0) [linux-any],
    46 46 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    47 
    - llvm-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    48 
    - libclang-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    49 
    - libclang-cpp11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    50 
    - libclc-dev (>= 0.2.0+git20190827-7~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    47 
    + llvm-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    48 
    + libclang-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    49 
    + libclang-cpp12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    50 
    + libclc-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    51 51 
      wayland-protocols (>= 1.9),
    52 52 
      zlib1g-dev,
    53 53 
      libglvnd-dev (>= 1.3.2),
    ... ... @@ -416,8 +416,7 @@ Section: libs
    416 416 
     Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    417 417 
     Pre-Depends: ${misc:Pre-Depends}
    418 418 
     Depends:
    419 
    - libclc-r600 (>= 0.2.0+git20180312-1~),
    420 
    - libclc-amdgcn (>= 0.2.0+git20180312-1~),
    419 
    + libclc-12,
    421 420 
      ocl-icd-libopencl1 | libopencl1,
    422 421 
      ${shlibs:Depends},
    423 422 
      ${misc:Depends},

  • debian/patches/path_max.diff
    1 
    ---- a/src/compiler/glsl/tests/cache_test.c
    2 
    -+++ b/src/compiler/glsl/tests/cache_test.c
    3 
    -@@ -132,8 +132,8 @@ check_directories_created(const char *ca
    1 
    +--- a/src/util/tests/cache/cache_test.c
    2 
    ++++ b/src/util/tests/cache/cache_test.c
    3 
    +@@ -141,8 +141,8 @@ check_directories_created(const char *ca
    4 4 
      {
    5 5 
         bool sub_dirs_created = false;
    6 6
    ... ... @@ -11,7 +11,7 @@
    11 11 
            char *full_path = NULL;
    12 12 
            if (asprintf(&full_path, "%s%s", buf, ++cache_dir) != -1 ) {
    13 13 
               struct stat sb;
    14 
    -@@ -142,6 +142,7 @@ check_directories_created(const char *ca
    14 
    +@@ -151,6 +151,7 @@ check_directories_created(const char *ca
    15 15
    16 16 
               free(full_path);
    17 17 
            }
    ... ... @@ -34,7 +34,7 @@
    34 34 
      static void
    35 35 
     --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
    36 36 
     +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
    37 
    -@@ -42,6 +42,10 @@
    37 
    +@@ -43,6 +43,10 @@
    38 38 
      #define PATH_MAX _MAX_PATH
    39 39 
      #endif
    40 40

  • 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 
    -export PATH:=/usr/lib/llvm-11/bin/:$(PATH)
    16 
    +export PATH:=/usr/lib/llvm-12/bin/:$(PATH)
    17 17
    18 18 
     ifeq (,$(filter $(DEB_HOST_ARCH), armhf sh3 sh4))
    19 19 
     buildflags = \
    ... ... @@ -224,7 +224,6 @@ override_dh_install:
    224 224 
       # Remove vulkan headers only where they get installed in tmp
    225 225 
       # We ship those headers via src:vulkan / libvulkan-dev
    226 226 
       ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32))
    227 
    -	rm debian/tmp/usr/include/vulkan/vulkan_intel.h
    228 227 
     	rmdir debian/tmp/usr/include/vulkan
    229 228 
       endif
    230 229

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: