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

[Git][xorg-team/lib/mesa][debian-unstable] 4 commits: control, rules: Drop mipsel.

Title: GitLab

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

Commits:

  • 1598a818
    by Timo Aaltonen at 2023-09-19T19:40:19+03:00 
    control, rules: Drop mipsel.
  • 86b656fb
    by Timo Aaltonen at 2023-09-20T10:22:15+03:00 
    rules: Update archs which have rustc (add powerpc, ppc64, riscv64, x32)
  • c2fe48b3
    by Timo Aaltonen at 2023-09-20T15:47:57+03:00 
    egl-wayland-Always-initialise-fd_display_gpu.patch: Re-add the fix for gtk4 autopkgtests.
  • 721e1b17
    by Timo Aaltonen at 2023-09-20T16:06:47+03:00 
    release to sid

6 changed files:

Changes:

  • debian/changelog
    1 
    +mesa (23.2.0~rc3-3) unstable; urgency=medium
    2 
    +
    3 
    +  * control, rules: Drop mipsel.
    4 
    +  * rules: Update archs which have rustc (add powerpc, ppc64, riscv64,
    5 
    +    x32)
    6 
    +  * egl-wayland-Always-initialise-fd_display_gpu.patch: Re-add the fix
    7 
    +    for gtk4 autopkgtests.
    8 
    +
    9 
    + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 20 Sep 2023 15:49:02 +0300
    10 
    +
    1 11 
     mesa (23.2.0~rc3-2) unstable; urgency=medium
    2 12
    3 13 
       * Upload to unstable.

  • debian/control
    ... ... @@ -7,7 +7,7 @@ Standards-Version: 4.1.4
    7 7 
     Build-Depends:
    8 8 
      debhelper-compat (= 12),
    9 9 
      directx-headers-dev (>= 1.602.0) [linux-amd64 linux-arm64],
    10 
    - glslang-tools [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    10 
    + glslang-tools [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    11 11 
      meson (>= 0.45),
    12 12 
      quilt (>= 0.63-8.2~),
    13 13 
      pkg-config,
    ... ... @@ -20,7 +20,7 @@ Build-Depends:
    20 20 
      libxext-dev,
    21 21 
      libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
    22 22 
      libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
    23 
    - libvulkan-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    23 
    + libvulkan-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    24 24 
      x11proto-dev,
    25 25 
      linux-libc-dev (>= 2.6.31) [linux-any],
    26 26 
      libx11-xcb-dev,
    ... ... @@ -41,22 +41,22 @@ Build-Depends:
    41 41 
      python3-setuptools,
    42 42 
      flex,
    43 43 
      bison,
    44 
    - libelf-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    44 
    + libelf-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    45 45 
      libwayland-dev (>= 1.15.0) [linux-any],
    46 46 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    47 
    - llvm-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    48 
    - libclang-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    49 
    - libclang-cpp15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    50 
    - libclc-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    47 
    + llvm-15-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    48 
    + libclang-15-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    49 
    + libclang-cpp15-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    50 
    + libclc-15-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    51 51 
      wayland-protocols (>= 1.24),
    52 52 
      zlib1g-dev,
    53 53 
      libglvnd-core-dev (>= 1.3.2),
    54 
    - valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x],
    55 
    - rustc [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
    56 
    - bindgen [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
    57 
    - llvm-spirv-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
    58 
    - libclc-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
    59 
    - libllvmspirvlib-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
    54 
    + valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x],
    55 
    + rustc [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    56 
    + bindgen [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    57 
    + llvm-spirv-15 [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    58 
    + libclc-15 [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    59 
    + libllvmspirvlib-15-dev [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    60 60 
     Rules-Requires-Root: no
    61 61 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
    62 62 
     Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
    ... ... @@ -362,7 +362,7 @@ Description: Mesa VDPAU video acceleration drivers
    362 362
    363 363 
     Package: mesa-vulkan-drivers
    364 364 
     Section: libs
    365 
    -Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    365 
    +Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    366 366 
     Pre-Depends: ${misc:Pre-Depends}
    367 367 
     Depends:
    368 368 
      libvulkan1,
    ... ... @@ -377,7 +377,7 @@ Description: Mesa Vulkan graphics drivers
    377 377
    378 378 
     Package: mesa-opencl-icd
    379 379 
     Section: libs
    380 
    -Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    380 
    +Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    381 381 
     Pre-Depends: ${misc:Pre-Depends}
    382 382 
     Depends:
    383 383 
      libclc-15,
    ... ... @@ -394,7 +394,7 @@ Description: free implementation of the OpenCL API -- ICD runtime
    394 394
    395 395 
     Package: mesa-drm-shim
    396 396 
     Section: libs
    397 
    -Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    397 
    +Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
    398 398 
     Pre-Depends: ${misc:Pre-Depends}
    399 399 
     Depends:
    400 400 
      ${shlibs:Depends},

  • debian/control.in
    ... ... @@ -394,7 +394,7 @@ Description: free implementation of the OpenCL API -- ICD runtime
    394 394
    395 395 
     Package: mesa-drm-shim
    396 396 
     Section: libs
    397 
    -Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    397 
    +Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
    398 398 
     Pre-Depends: ${misc:Pre-Depends}
    399 399 
     Depends:
    400 400 
      ${shlibs:Depends},

  • debian/patches/egl-wayland-Always-initialise-fd_display_gpu.patch
    1 
    +From 449e5bad7c31f1099d1fdb7300071c007394c664 Mon Sep 17 00:00:00 2001
    2 
    +From: Daniel Stone <daniels@collabora.com>
    3 
    +Date: Thu, 27 Jul 2023 00:36:05 +0100
    4 
    +Subject: [PATCH] egl/wayland: Always initialise fd_display_gpu
    5 
    +
    6 
    +Set it to an invalid value, rather than leaving it to be stdout or
    7 
    +something.
    8 
    +
    9 
    +Signed-off-by: Daniel Stone <daniels@collabora.com>
    10 
    +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24347>
    11 
    +---
    12 
    + src/egl/drivers/dri2/platform_wayland.c | 1 +
    13 
    + 1 file changed, 1 insertion(+)
    14 
    +
    15 
    +diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
    16 
    +index fb4287fb654..572a00f30ff 100644
    17 
    +--- a/src/egl/drivers/dri2/platform_wayland.c
    18 
    ++++ b/src/egl/drivers/dri2/platform_wayland.c
    19 
    +@@ -2826,6 +2826,7 @@ dri2_initialize_wayland_swrast(_EGLDisplay *disp)
    20 
    +       return _eglError(EGL_BAD_ALLOC, "eglInitialize");
    21 
    +
    22 
    +    dri2_dpy->fd_render_gpu = -1;
    23 
    ++   dri2_dpy->fd_display_gpu = -1;
    24 
    +    disp->DriverData = (void *)dri2_dpy;
    25 
    +
    26 
    +    if (dri2_wl_formats_init(&dri2_dpy->formats) < 0)
    27 
    +--
    28 
    +2.39.2
    29 
    +

  • debian/patches/series
    1 1 
     07_gallium-fix-build-failure-on-powerpcspe.diff
    2 2 
     path_max.diff
    3 3 
     src_glx_dri_common.h.diff
    4 
    +egl-wayland-Always-initialise-fd_display_gpu.patch

  • debian/rules
    ... ... @@ -42,9 +42,9 @@ confflags_DRI3 = -Ddri3=disabled
    42 42 
     confflags_OSMESA =  -Dosmesa=true
    43 43 
     confflags_SSE2 = -Dsse2=true
    44 44
    45 
    -LLVM_ARCHS     = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    46 
    -RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
    47 
    -VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x
    45 
    +LLVM_ARCHS     = amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    46 
    +RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
    47 
    +VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
    48 48 
     WINE_ARCHS     = amd64 arm64 armel armhf i386 powerpc
    49 49
    50 50 
     # hurd doesn't do direct rendering
    ... ... @@ -62,7 +62,7 @@ else
    62 62
    63 63 
       # radv/lavapipe needs LLVM and the Vulkan loader, so only build on the subset of
    64 64 
       # arches where we have LLVM enabled and where the Vulkan loader is built.
    65 
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    65 
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64))
    66 66 
       # drop virtio from armel, it doesn't build
    67 67 
     	ifneq (,$(filter $(DEB_HOST_ARCH), armel))
    68 68 
     		VULKAN_DRIVERS += amd swrast

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

    Reply to: