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

[Git][xorg-team/lib/mesa][debian-experimental] 10 commits: mips64el has latest LLVM already for some time

Title: GitLab

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

Commits:

  • ab194bbf
    by Adrian Bunk at 2024-08-01T21:21:05+03:00 
    mips64el has latest LLVM already for some time
  • 50a69790
    by Timo Aaltonen at 2024-08-02T09:57:51+03:00 
    changelog update
  • 4b961700
    by Timo Aaltonen at 2024-08-02T10:16:16+03:00 
    rules: Fix FTBFS by only cleaning some nvk test binaries if they actually get built.
  • 4a538097
    by Timo Aaltonen at 2024-08-02T11:11:24+03:00 
    rules: Add a new NVK_ARCHS which is a subset of RUSTICL_ARCHS, strip powerpc, ppc64el and s390x from it.
  • 4e4a7308
    by Timo Aaltonen at 2024-08-02T11:24:49+03:00 
    control: Add lua5.4 to build-depends for arm* in order to work around FTBFS caused by setting MESON_PACKAGE_CACHE_DIR for nvk. (Closes: #1077729)
  • 14abd529
    by Timo Aaltonen at 2024-08-02T11:27:45+03:00 
    release to sid
  • ee33af6e
    by Timo Aaltonen at 2024-08-02T11:32:41+03:00 
    Merge branch 'debian-unstable' into debian-experimental
  • 976a5b50
    by Timo Aaltonen at 2024-08-02T11:50:04+03:00 
    start over, upload rejected as requested
  • 7dbc76f9
    by Timo Aaltonen at 2024-08-02T11:53:53+03:00 
    control, rules: Bump llvm to 18. (Closes: #1072901)
  • 140bab65
    by Timo Aaltonen at 2024-08-02T11:54:58+03:00 
    release to experimental

4 changed files:

Changes:

  • debian/changelog
    1 
    -mesa (24.2.0~rc3-1) unstable; urgency=medium
    1 
    +mesa (24.2.0~rc3-1) experimental; urgency=medium
    2 2
    3 3 
       [ Timo Aaltonen ]
    4 4 
       * New upstream release candidate.
    5 5 
       * control: Migrate to pkgconf.
    6 6 
       * Add some lintian-overrides.
    7 7 
       * control: Fix drm-shim description.
    8 
    +  * control, rules: Bump llvm to 18. (Closes: #1072901)
    8 9
    9 10 
       [ Simon McVittie ]
    10 11 
       * d/rules: Replace deprecated swrast with softpipe and llvmpipe
    ... ... @@ -12,7 +13,23 @@ mesa (24.2.0~rc3-1) unstable; urgency=medium
    12 13 
       * libglx-mesa0.symbols: Update for new symbols
    13 14 
       * Add a new private shared library package for libgallium.so
    14 15
    15 
    - -- Timo Aaltonen <tjaalton@debian.org>  Thu, 01 Aug 2024 14:16:38 +0300
    16 
    + -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Aug 2024 11:53:58 +0300
    17 
    +
    18 
    +mesa (24.1.5-2) unstable; urgency=medium
    19 
    +
    20 
    +  [ Adrian Bunk ]
    21 
    +  * control, rules: mips64el has latest LLVM already for some time
    22 
    +
    23 
    +  [ Timo Aaltonen ]
    24 
    +  * rules: Fix FTBFS by only cleaning some nvk test binaries if they
    25 
    +    actually get built.
    26 
    +  * rules: Add a new NVK_ARCHS which is a subset of RUSTICL_ARCHS, strip
    27 
    +    powerpc, ppc64el and s390x from it.
    28 
    +  * control: Add lua5.4 to build-depends for arm* in order to work
    29 
    +    around FTBFS caused by setting MESON_PACKAGE_CACHE_DIR for nvk.
    30 
    +    (Closes: #1077729)
    31 
    +
    32 
    + -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Aug 2024 11:25:02 +0300
    16 33
    17 34 
     mesa (24.1.5-1) unstable; urgency=medium
    18 35

  • debian/control
    ... ... @@ -8,7 +8,7 @@ Build-Depends:
    8 8 
      debhelper-compat (= 13),
    9 9 
      directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
    10 10 
      flatbuffers-compiler [linux-arm64],
    11 
    - glslang-tools [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    11 
    + glslang-tools [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    12 12 
      meson (>= 1.4.0),
    13 13 
      quilt (>= 0.63-8.2~),
    14 14 
      pkgconf,
    ... ... @@ -22,7 +22,7 @@ Build-Depends:
    22 22 
      libxext-dev,
    23 23 
      libva-dev (>= 1.6.0) [linux-any] <!pkg.mesa.nolibva>,
    24 24 
      libvdpau-dev (>= 1.5) [linux-any],
    25 
    - libvulkan-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    25 
    + libvulkan-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    26 26 
      x11proto-dev,
    27 27 
      linux-libc-dev (>= 2.6.31) [linux-any],
    28 28 
      libx11-xcb-dev,
    ... ... @@ -38,6 +38,7 @@ Build-Depends:
    38 38 
      libxshmfence-dev (>= 1.1),
    39 39 
      libxtensor-dev [linux-arm64],
    40 40 
      libzstd-dev,
    41 
    + lua5.4 [arm64 armel armhf],
    41 42 
      python3,
    42 43 
      python3-mako,
    43 44 
      python3-ply,
    ... ... @@ -45,26 +46,26 @@ Build-Depends:
    45 46 
      python3-setuptools,
    46 47 
      flex,
    47 48 
      bison,
    48 
    - libelf-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    49 
    + libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    49 50 
      libwayland-dev (>= 1.15.0) [linux-any],
    50 51 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    51 
    - llvm-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    52 
    - libclang-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    53 
    - libclang-cpp17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    54 
    - libclc-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    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],
    55 56 
      wayland-protocols (>= 1.34),
    56 57 
      zlib1g-dev,
    57 58 
      libglvnd-core-dev (>= 1.3.2),
    58 59 
      valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x],
    59 
    - rustc (>= 1.73) [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    60 
    - rustfmt [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    61 
    - bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    62 
    - cbindgen [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    63 
    - llvm-spirv-17 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    64 
    - libclc-17 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32],
    65 
    - libllvmspirvlib-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    66 
    - librust-paste-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    67 
    - librust-syn-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    60 
    + rustc (>= 1.73) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    61 
    + rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    62 
    + bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    63 
    + cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    64 
    + llvm-spirv-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    65 
    + libclc-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],
    67 
    + librust-paste-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    68 
    + librust-syn-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    68 69 
     Rules-Requires-Root: no
    69 70 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
    70 71 
     Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
    ... ... @@ -254,7 +255,7 @@ Section: libs
    254 255 
     Architecture: any
    255 256 
     Pre-Depends: ${misc:Pre-Depends}
    256 257 
     Depends:
    257 
    - libvulkan1 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    258 
    + libvulkan1 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    258 259 
      ${shlibs:Depends},
    259 260 
      ${misc:Depends}
    260 261 
     Multi-Arch: same
    ... ... @@ -400,7 +401,7 @@ Description: Mesa VDPAU video acceleration drivers
    400 401
    401 402 
     Package: mesa-vulkan-drivers
    402 403 
     Section: libs
    403 
    -Architecture: amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    404 
    +Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    404 405 
     Pre-Depends: ${misc:Pre-Depends}
    405 406 
     Depends:
    406 407 
      libvulkan1,
    ... ... @@ -415,10 +416,10 @@ Description: Mesa Vulkan graphics drivers
    415 416
    416 417 
     Package: mesa-opencl-icd
    417 418 
     Section: libs
    418 
    -Architecture: amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    419 
    +Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    419 420 
     Pre-Depends: ${misc:Pre-Depends}
    420 421 
     Depends:
    421 
    - libclc-17,
    422 
    + libclc-18,
    422 423 
      ocl-icd-libopencl1 | libopencl1,
    423 424 
      ${shlibs:Depends},
    424 425 
      ${misc:Depends},

  • debian/control.in
    ... ... @@ -38,6 +38,7 @@ Build-Depends:
    38 38 
      libxshmfence-dev (>= 1.1),
    39 39 
      libxtensor-dev [linux-arm64],
    40 40 
      libzstd-dev,
    41 
    + lua5.4 [arm64 armel armhf],
    41 42 
      python3,
    42 43 
      python3-mako,
    43 44 
      python3-ply,

  • 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 = 17
    16 
    +LLVM_VERSION = 18
    17 17 
     export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
    18 18
    19 19 
     export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
    ... ... @@ -44,8 +44,9 @@ confflags_OSMESA = -Dosmesa=true
    44 44 
     confflags_SSE2 = -Dsse2=true
    45 45 
     confflags_TEFLON = -Dteflon=false
    46 46
    47 
    -LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    48 
    -RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32
    47 
    +LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    48 
    +RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
    49 
    +NVK_ARCHS      = amd64 arm64 armel armhf i386 loong64 mips64el ppc64 riscv64 x32
    49 50 
     VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
    50 51 
     WINE_ARCHS     = amd64 arm64 armel armhf i386
    51 52
    ... ... @@ -125,9 +126,12 @@ else
    125 126 
     	confflags_GALLIUM += -Dllvm=enabled
    126 127 
     	confflags_GALLIUM += -Dgallium-opencl=icd
    127 128
    128 
    -	# Build rusticl and nvk for archs where rustc is available
    129 
    +	# Build rusticl for archs where rustc is available
    129 130 
     	ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
    130 131 
     		confflags_GALLIUM += -Dgallium-rusticl=true
    132 
    +	endif
    133 
    +
    134 
    +	ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
    131 135 
     		VULKAN_DRIVERS += nouveau
    132 136 
     	endif
    133 137
    ... ... @@ -253,8 +257,10 @@ override_dh_install:
    253 257 
     	rm debian/tmp/usr/lib/*/libglapi.so
    254 258 
     	rm debian/tmp/usr/lib/*/libEGL_mesa.so
    255 259 
     	rm debian/tmp/usr/lib/*/libGLX_mesa.so
    260 
    +  ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
    256 261 
     	rm debian/tmp/usr/bin/mme_fermi_sim_hw_test
    257 262 
     	rm debian/tmp/usr/bin/mme_tu104_sim_hw_test
    263 
    +  endif
    258 264 
     	# use -f here though
    259 265 
     	rm -f debian/tmp/usr/lib/*/libgrl.a
    260 266

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: