Update for new stable mesa

This commit is contained in:
ferreo 2024-11-26 11:21:43 +00:00
parent 97583ff944
commit 3229f15aec
19 changed files with 1725 additions and 320 deletions

291
debian/control vendored
View File

@ -10,11 +10,10 @@ Build-Depends:
directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
flatbuffers-compiler [linux-arm64],
glslang-tools [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
glslang-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
meson (>= 1.4.0),
quilt (>= 0.63-8.2~),
pkgconf,
libdrm-dev (>= 2.4.121),
libdrm-dev (>= 2.4.122),
libx11-dev,
libxxf86vm-dev,
libexpat1-dev,
@ -51,11 +50,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-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libclang-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libclang-cpp17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libclc-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libclc-17 [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),
@ -64,10 +63,10 @@ Build-Depends:
rustfmt [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
bindgen (>= 0.66.1~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
llvm-spirv-17 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
libllvmspirvlib-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
llvm-spirv-19 [amd64 arm64 armel armhf 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 ppc64 riscv64 x32],
librust-syn-dev [amd64 arm64 armhf ppc64 riscv64 x32],
librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf ppc64 riscv64 x32],
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
@ -88,79 +87,77 @@ Description: X acceleration library -- runtime
by the X server to do render, copy and video acceleration.
.
XA is intended to be used by the vmware driver for virtualized X acceleration.
Package: mesa-stable
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-stable:i386 (= ${binary:Version}) [amd64],
mesa-stable:amd64 (= ${binary:Version}) [i386],
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Multi-Arch: same
Description: a meta package to install the latest stable version of mesa.
Package: mesa-stable-no-march
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Provides: mesa-stable
Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
Package: mesa-stable
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-stable:i386 (= ${binary:Version}) [amd64],
mesa-stable:amd64 (= ${binary:Version}) [i386],
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Multi-Arch: same
Description: a meta package to install the latest stable version of mesa.
Package: mesa-stable-no-march
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Provides: mesa-stable
Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
Package: libmesa-stable
Section: libs
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
Multi-Arch: same
Description: mesa stable core.
Package: libmesa-stable
Section: libs
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
Multi-Arch: same
Description: mesa stable core.
Package: libxatracker-dev
Section: libdevel
@ -182,7 +179,7 @@ Description: X acceleration library -- development files
Package: libd3dadapter9-mesa
Section: libs
Architecture: amd64 arm64 armel armhf i386 powerpc
Architecture: amd64 arm64 armel armhf i386
Conflicts: libd3dadapter9-mesa-git
Replaces: libd3dadapter9-mesa-git
Depends: libmesa-stable,
@ -198,7 +195,7 @@ Description: state-tracker for Direct3D9
Package: libd3dadapter9-mesa-dev
Section: libdevel
Architecture: amd64 arm64 armel armhf i386 powerpc
Architecture: amd64 arm64 armel armhf i386
Depends: libmesa-stable,
libd3dadapter9-mesa (= ${binary:Version}),
libudev1 [linux-any],
@ -216,10 +213,11 @@ Description: state-tracker for Direct3D9 -- development files
Package: libgbm1
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-libgallium (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libgbm1-git
@ -232,8 +230,8 @@ Description: generic buffer management API -- runtime
Package: libgbm-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
Depends: libmesa-stable,
Architecture: linux-any
Depends: Depends: libmesa-stable,
libgbm1 (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
@ -251,10 +249,12 @@ Description: generic buffer management API -- development files
Package: libegl-mesa0
Section: libs
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libgbm1 (= ${binary:Version}) [!hurd-any],
mesa-libgallium (= ${binary:Version}),
Provides: libegl-vendor
Conflicts: libegl-mesa0-git
Replaces: libegl-mesa0-git
@ -267,18 +267,6 @@ Description: free implementation of the EGL API -- Mesa vendor library
.
This package contains the Mesa vendor library for EGL.
Package: libegl1-mesa
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libegl1,
${misc:Depends},
Conflicts: libegl1-mesa-git
Replaces: libegl1-mesa-git
Multi-Arch: same
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libegl1-mesa-dev
Section: libdevel
Architecture: any
@ -298,32 +286,6 @@ Description: free implementation of the EGL API -- development files
This package provides the development environment for compiling programs
against the EGL library.
Package: libwayland-egl1-mesa
Section: oldlibs
Architecture: linux-any
Depends: libmesa-stable,
${misc:Depends},
libegl1,
libwayland-egl1,
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libwayland-egl1-mesa-git
Replaces: libwayland-egl1-mesa-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgles2-mesa
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libgles2,
${misc:Depends},
Multi-Arch: same
Conflicts: libgles2-mesa-git
Replaces: libgles2-mesa-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgles2-mesa-dev
Section: oldlibs
Architecture: any
@ -359,6 +321,7 @@ Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libgl1-mesa-dri,
mesa-libgallium (= ${binary:Version}),
Provides: libglx-vendor
Breaks:
libopengl-perl (<< 0.6704+dfsg-2),
@ -382,34 +345,20 @@ Description: free implementation of the OpenGL API -- GLX vendor library
This package does not include the modules themselves: these can be found
in the libgl1-mesa-dri package.
Package: libgl1-mesa-glx
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libgl1,
libglx-mesa0,
${misc:Depends},
Multi-Arch: same
Conflicts: libgl1-mesa-glx-git
Replaces: libgl1-mesa-glx-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgl1-mesa-dri
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
libvulkan1 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
${shlibs:Depends},
${misc:Depends}
Recommends:
Recommends:
libgl1-amber-dri
Breaks:
libgl1-amber-dri (<< 21.3.9)
Replaces:
libgl1-amber-dri (<< 21.3.9), libgl1-mesa-dri-git
Provides:
mesa-libgallium (= ${binary:Version})
Conflicts: libgl1-mesa-dri-git
Multi-Arch: same
Description: free implementation of the OpenGL API -- DRI modules
@ -439,7 +388,8 @@ Description: transitional dummy package
Package: mesa-common-dev
Section: libdevel
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
libgl-dev,
libglx-dev,
libx11-dev,
@ -454,10 +404,27 @@ Description: Developer documentation for Mesa
extensions, the complete set of release notes and the development header
files common to all Mesa packages.
Package: mesa-libgallium-stable
Section: libs
Architecture: linux-any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-libgallium-git
Replaces: mesa-libgallium-git
Provides: mesa-libgallium (= ${binary:Version})
Multi-Arch: same
Description: shared infrastructure for Mesa drivers
This package contains libgallium, a private library shared between
multiple Mesa drivers. This library is an implementation detail of Mesa
and should not be used directly by user code.
Package: libosmesa6
Section: libs
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
@ -479,8 +446,8 @@ Depends: libmesa-stable,
libosmesa6 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}) | libgl-dev,
${misc:Depends},
Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Replaces: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Replaces: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Provides: libosmesa-dev
Multi-Arch: same
Description: Mesa Off-screen rendering extension -- development files
@ -489,9 +456,25 @@ Description: Mesa Off-screen rendering extension -- development files
.
For more information on OSmesa see the libosmesa6 package.
Package: mesa-teflon-delegate-stable
Section: libs
Architecture: arm64
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Provides: mesa-teflon-delegate (= ${binary:Version})
Conflicts: mesa-teflon-delegate-git
Replaces: mesa-teflon-delegate-git
Multi-Arch: same
Description: Mesa TensorFlow Lite external delegate
TensorFlow Lite delegate which can make use of NPUs to accelerate ML
inference. It is implemented in the form of a external delegate, a shared
library which the TensorFlow Lite runtime can load at startup.
Package: mesa-va-drivers
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Build-Profiles: <!pkg.mesa.nolibva>
Depends: libmesa-stable,
${shlibs:Depends},
@ -514,7 +497,7 @@ Description: Mesa VA-API video acceleration drivers
Package: mesa-vdpau-drivers
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Depends: libmesa-stable,
libvdpau1,
${shlibs:Depends},
@ -523,7 +506,7 @@ Enhances:
libvdpau1,
Provides:
vdpau-driver,
Replaces: mesa-vdpau-drivers-git
Replaces: mesa-vdpau-drivers-git
Conflicts: mesa-vdpau-drivers-git
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@ -536,7 +519,7 @@ Description: Mesa VDPAU video acceleration drivers
Package: mesa-vulkan-drivers
Section: libs
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
libvulkan1,
@ -553,10 +536,10 @@ Description: Mesa Vulkan graphics drivers
Package: mesa-opencl-icd
Section: libs
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
Architecture: amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
libclc-17,
libclc-19,
ocl-icd-libopencl1 | libopencl1,
${shlibs:Depends},
${misc:Depends},
@ -572,7 +555,7 @@ Description: free implementation of the OpenCL API -- ICD runtime
Package: mesa-drm-shim
Section: libs
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
${shlibs:Depends},
@ -581,7 +564,7 @@ Conflicts: mesa-drm-shim-git
Replaces: mesa-drm-shim-git
Multi-Arch: same
Description: DRM shim libraries
This package provides drm-shim libraries which can be used for testing DRM drivers when
none exists on the host
This package provides drm-shim libraries which can be used for testing DRM
drivers when none exists on the host.
# vim: tw=0

276
debian/control.in vendored
View File

@ -10,11 +10,10 @@ Build-Depends:
directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
flatbuffers-compiler [linux-arm64],
glslang-tools [@LLVM_ARCHS@],
glslang-dev [@LLVM_ARCHS@],
meson (>= 1.4.0),
quilt (>= 0.63-8.2~),
pkgconf,
libdrm-dev (>= 2.4.121),
libdrm-dev (>= 2.4.122),
libx11-dev,
libxxf86vm-dev,
libexpat1-dev,
@ -73,78 +72,6 @@ Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
Homepage: https://mesa3d.org/
Package: mesa-stable
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-stable:i386 (= ${binary:Version}) [amd64],
mesa-stable:amd64 (= ${binary:Version}) [i386],
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Multi-Arch: same
Description: a meta package to install the latest stable version of mesa.
Package: mesa-stable-no-march
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Provides: mesa-stable
Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
Package: libmesa-stable
Section: libs
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
Multi-Arch: same
Description: mesa stable core.
Package: libxatracker2
Section: libs
Architecture: amd64 i386 x32
@ -152,14 +79,85 @@ Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libxatracker2-git
Replaces: libxatracker2-git
Multi-Arch: same
Description: X acceleration library -- runtime
This package contains the XA (X acceleration) library. It is used exclusively
by the X server to do render, copy and video acceleration.
.
XA is intended to be used by the vmware driver for virtualized X acceleration.
Package: mesa-stable
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-stable:i386 (= ${binary:Version}) [amd64],
mesa-stable:amd64 (= ${binary:Version}) [i386],
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable-no-march, mesa-git-no-march, mesa-custom-no-march
Multi-Arch: same
Description: a meta package to install the latest stable version of mesa.
Package: mesa-stable-no-march
Section: libs
Architecture: any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libd3dadapter9-mesa (= ${binary:Version}),
libegl-mesa0 (= ${binary:Version}),
libegl1-mesa-dev (= ${binary:Version}),
libegl1-mesa (= ${binary:Version}),
libgbm-dev (= ${binary:Version}),
libgbm1 (= ${binary:Version}),
libgl1-mesa-dri (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libgles2-mesa (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libosmesa6 (= ${binary:Version}),
libxatracker2 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}),
mesa-va-drivers (= ${binary:Version}),
mesa-vdpau-drivers (= ${binary:Version}),
mesa-vulkan-drivers (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Replaces: mesa-hybrid, mesa-git, mesa-custom, mesa-hybrid-no-march, mesa-stable, mesa-git-no-march, mesa-custom-no-march
Provides: mesa-stable
Description: a meta package to install the latest stable version of mesa (no Multi-Arch Support).
Package: libmesa-stable
Section: libs
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libmesa-hybrid, libmesa-git, libmesa-custom
Replaces: libmesa-hybrid, libmesa-git, libmesa-custom
Multi-Arch: same
Description: mesa stable core.
Package: libxatracker-dev
Section: libdevel
@ -182,13 +180,13 @@ Description: X acceleration library -- development files
Package: libd3dadapter9-mesa
Section: libs
Architecture: @WINE_ARCHS@
Conflicts: libd3dadapter9-mesa-git
Replaces: libd3dadapter9-mesa-git
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libudev1 [linux-any],
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libd3dadapter9-mesa-git
Replaces: libd3dadapter9-mesa-git
Multi-Arch: same
Description: state-tracker for Direct3D9
This package contains a Gallium3D state tracker that implements the Direct3D9
@ -215,10 +213,11 @@ Description: state-tracker for Direct3D9 -- development files
Package: libgbm1
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
mesa-libgallium (= ${binary:Version}),
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libgbm1-git
@ -231,8 +230,8 @@ Description: generic buffer management API -- runtime
Package: libgbm-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
Depends: libmesa-stable,
Architecture: linux-any
Depends: Depends: libmesa-stable,
libgbm1 (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
@ -250,10 +249,12 @@ Description: generic buffer management API -- development files
Package: libegl-mesa0
Section: libs
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libgbm1 (= ${binary:Version}) [!hurd-any],
mesa-libgallium (= ${binary:Version}),
Provides: libegl-vendor
Conflicts: libegl-mesa0-git
Replaces: libegl-mesa0-git
@ -266,18 +267,6 @@ Description: free implementation of the EGL API -- Mesa vendor library
.
This package contains the Mesa vendor library for EGL.
Package: libegl1-mesa
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libegl1,
${misc:Depends},
Conflicts: libegl1-mesa-git
Replaces: libegl1-mesa-git
Multi-Arch: same
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libegl1-mesa-dev
Section: libdevel
Architecture: any
@ -297,32 +286,6 @@ Description: free implementation of the EGL API -- development files
This package provides the development environment for compiling programs
against the EGL library.
Package: libwayland-egl1-mesa
Section: oldlibs
Architecture: linux-any
Depends: libmesa-stable,
${misc:Depends},
libegl1,
libwayland-egl1,
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libwayland-egl1-mesa-git
Replaces: libwayland-egl1-mesa-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgles2-mesa
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libgles2,
${misc:Depends},
Multi-Arch: same
Conflicts: libgles2-mesa-git
Replaces: libgles2-mesa-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgles2-mesa-dev
Section: oldlibs
Architecture: any
@ -358,6 +321,7 @@ Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
libgl1-mesa-dri,
mesa-libgallium (= ${binary:Version}),
Provides: libglx-vendor
Breaks:
libopengl-perl (<< 0.6704+dfsg-2),
@ -381,34 +345,20 @@ Description: free implementation of the OpenGL API -- GLX vendor library
This package does not include the modules themselves: these can be found
in the libgl1-mesa-dri package.
Package: libgl1-mesa-glx
Section: oldlibs
Architecture: any
Depends: libmesa-stable,
libgl1,
libglx-mesa0,
${misc:Depends},
Multi-Arch: same
Conflicts: libgl1-mesa-glx-git
Replaces: libgl1-mesa-glx-git
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
Package: libgl1-mesa-dri
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
libvulkan1 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
${shlibs:Depends},
${misc:Depends}
Recommends:
Recommends:
libgl1-amber-dri
Breaks:
libgl1-amber-dri (<< 21.3.9)
Replaces:
libgl1-amber-dri (<< 21.3.9), libgl1-mesa-dri-git
Provides:
mesa-libgallium (= ${binary:Version})
Conflicts: libgl1-mesa-dri-git
Multi-Arch: same
Description: free implementation of the OpenGL API -- DRI modules
@ -438,7 +388,8 @@ Description: transitional dummy package
Package: mesa-common-dev
Section: libdevel
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
libgl-dev,
libglx-dev,
libx11-dev,
@ -453,10 +404,27 @@ Description: Developer documentation for Mesa
extensions, the complete set of release notes and the development header
files common to all Mesa packages.
Package: mesa-libgallium-stable
Section: libs
Architecture: linux-any
Depends: libmesa-stable,
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Conflicts: mesa-libgallium-git
Replaces: mesa-libgallium-git
Provides: mesa-libgallium (= ${binary:Version})
Multi-Arch: same
Description: shared infrastructure for Mesa drivers
This package contains libgallium, a private library shared between
multiple Mesa drivers. This library is an implementation detail of Mesa
and should not be used directly by user code.
Package: libosmesa6
Section: libs
Architecture: any
Depends: libmesa-stable,
Depends:
libmesa-stable,
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
@ -478,8 +446,8 @@ Depends: libmesa-stable,
libosmesa6 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}) | libgl-dev,
${misc:Depends},
Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Replaces: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Conflicts: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Replaces: libosmesa-dev, libosmesa6-git-dev, libosmesa-git-dev
Provides: libosmesa-dev
Multi-Arch: same
Description: Mesa Off-screen rendering extension -- development files
@ -488,9 +456,25 @@ Description: Mesa Off-screen rendering extension -- development files
.
For more information on OSmesa see the libosmesa6 package.
Package: mesa-teflon-delegate-stable
Section: libs
Architecture: arm64
Depends:
${shlibs:Depends},
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Provides: mesa-teflon-delegate (= ${binary:Version})
Conflicts: mesa-teflon-delegate-git
Replaces: mesa-teflon-delegate-git
Multi-Arch: same
Description: Mesa TensorFlow Lite external delegate
TensorFlow Lite delegate which can make use of NPUs to accelerate ML
inference. It is implemented in the form of a external delegate, a shared
library which the TensorFlow Lite runtime can load at startup.
Package: mesa-va-drivers
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Build-Profiles: <!pkg.mesa.nolibva>
Depends: libmesa-stable,
${shlibs:Depends},
@ -513,7 +497,7 @@ Description: Mesa VA-API video acceleration drivers
Package: mesa-vdpau-drivers
Section: libs
Architecture: linux-any kfreebsd-any
Architecture: linux-any
Depends: libmesa-stable,
libvdpau1,
${shlibs:Depends},
@ -522,7 +506,7 @@ Enhances:
libvdpau1,
Provides:
vdpau-driver,
Replaces: mesa-vdpau-drivers-git
Replaces: mesa-vdpau-drivers-git
Conflicts: mesa-vdpau-drivers-git
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@ -535,7 +519,7 @@ Description: Mesa VDPAU video acceleration drivers
Package: mesa-vulkan-drivers
Section: libs
Architecture: @LLVM_ARCHS@
Architecture: @LLVM_ARCHS@
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
libvulkan1,
@ -571,7 +555,7 @@ Description: free implementation of the OpenCL API -- ICD runtime
Package: mesa-drm-shim
Section: libs
Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
Architecture: amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el s390x sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends: libmesa-stable,
${shlibs:Depends},
@ -580,7 +564,7 @@ Conflicts: mesa-drm-shim-git
Replaces: mesa-drm-shim-git
Multi-Arch: same
Description: DRM shim libraries
This package provides drm-shim libraries which can be used for testing DRM drivers when
none exists on the host
This package provides drm-shim libraries which can be used for testing DRM
drivers when none exists on the host.
# vim: tw=0

2
debian/libegl-mesa0.symbols vendored Normal file
View File

@ -0,0 +1,2 @@
libEGL_mesa.so.0 libegl-mesa0 #MINVER#
__egl_Main@Base 17.0.0~

View File

@ -1 +1,2 @@
usr/lib/*/libgbm.so.1*
usr/lib/*/gbm/dri_gbm.so

42
debian/libgbm1.symbols vendored Normal file
View File

@ -0,0 +1,42 @@
dri_gbm.so libgbm1 #MINVER#
gbmint_get_backend@Base 24.3.0~rc1
libgbm.so.1 libgbm1 #MINVER#
| libgbm1-private
gbm_bo_create@Base 7.11~1
gbm_bo_create_with_modifiers2@Base 21.3.0~rc1
gbm_bo_create_with_modifiers@Base 17.1.0~rc2
gbm_bo_destroy@Base 7.11~1
gbm_bo_get_bpp@Base 17.3.0~rc1
gbm_bo_get_device@Base 8.1~0
gbm_bo_get_fd@Base 10.2~0
gbm_bo_get_fd_for_plane@Base 21.1.0
gbm_bo_get_format@Base 8.1~0
gbm_bo_get_handle@Base 7.11~1
gbm_bo_get_handle_for_plane@Base 17.1.0~rc2
gbm_bo_get_height@Base 7.11~1
gbm_bo_get_modifier@Base 17.1.0~rc2
gbm_bo_get_offset@Base 17.1.0~rc2
gbm_bo_get_plane_count@Base 17.1.0~rc2
gbm_bo_get_stride@Base 8.1~0
gbm_bo_get_stride_for_plane@Base 17.1.0~rc2
gbm_bo_get_user_data@Base 8.1~0
gbm_bo_get_width@Base 7.11~1
gbm_bo_import@Base 8.1~0
gbm_bo_map@Base 12.0.0~0
gbm_bo_set_user_data@Base 8.1~0
gbm_bo_unmap@Base 12.0.0~0
gbm_bo_write@Base 8.1~0
gbm_create_device@Base 7.11~1
gbm_device_destroy@Base 7.11~1
gbm_device_get_backend_name@Base 7.11~1
gbm_device_get_fd@Base 7.11~1
gbm_device_get_format_modifier_plane_count@Base 17.3.0~rc1
gbm_device_is_format_supported@Base 8.1~0
gbm_format_get_name@Base 19.0.0~rc5
gbm_surface_create@Base 8.1~0
gbm_surface_create_with_modifiers2@Base 21.3.0~rc1
gbm_surface_create_with_modifiers@Base 17.1.0~rc2
gbm_surface_destroy@Base 8.1~0
gbm_surface_has_free_buffers@Base 8.1~0
gbm_surface_lock_front_buffer@Base 8.1~0
gbm_surface_release_buffer@Base 8.1~0

View File

@ -1,2 +1 @@
usr/share/drirc.d/00-mesa-defaults.conf
usr/lib/*/libgallium-*.so

1305
debian/libglx-mesa0.symbols vendored Normal file

File diff suppressed because it is too large Load Diff

6
debian/libglx-mesa0.symbols.hurd vendored Normal file
View File

@ -0,0 +1,6 @@
libGLX_mesa.so.0 libglx-mesa0
__glx_Main@Base 17.0.0~
glAreTexturesResidentEXT@Base 0
glDeleteTexturesEXT@Base 0
glGenTexturesEXT@Base 0
glIsTextureEXT@Base 0

35
debian/libxatracker2.symbols vendored Normal file
View File

@ -0,0 +1,35 @@
libxatracker.so.2 libxatracker2 #MINVER#
xa_composite_allocation@Base 0
xa_composite_check_accelerated@Base 0
xa_composite_done@Base 0
xa_composite_prepare@Base 0
xa_composite_rect@Base 0
xa_context_create@Base 0
xa_context_default@Base 0
xa_context_destroy@Base 0
xa_context_flush@Base 0
xa_copy@Base 0
xa_copy_done@Base 0
xa_copy_prepare@Base 0
xa_fence_destroy@Base 0
xa_fence_get@Base 0
xa_fence_wait@Base 0
xa_format_check_supported@Base 0
xa_solid@Base 0
xa_solid_done@Base 0
xa_solid_prepare@Base 0
xa_surface_create@Base 0
xa_surface_dma@Base 0
xa_surface_format@Base 0
xa_surface_from_handle2@Base 11.1.0~
xa_surface_from_handle@Base 0
xa_surface_handle@Base 0
xa_surface_map@Base 0
xa_surface_redefine@Base 0
xa_surface_ref@Base 0
xa_surface_unmap@Base 0
xa_surface_unref@Base 0
xa_tracker_create@Base 0
xa_tracker_destroy@Base 0
xa_tracker_version@Base 0
xa_yuv_planar_blit@Base 0

1
debian/mesa-libgallium.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/*/libgallium-*.so

View File

@ -0,0 +1 @@
package-name-doesnt-match-sonames libgallium-*

13
debian/rules vendored
View File

@ -13,11 +13,10 @@ 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 = 17
LLVM_VERSION = 19
export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
DEB_CFLAGS_MAINT_APPEND := -Wall
DEB_CXXFLAGS_MAINT_APPEND := -Wall
@ -44,11 +43,10 @@ buildflags = $(shell \
dpkg-buildflags --export=configure)
EGL_PLATFORMS = x11
GALLIUM_DRIVERS =
GALLIUM_DRIVERS = softpipe
VULKAN_DRIVERS =
VULKAN_LAYERS =
confflags_DRI3 = -Ddri3=disabled
confflags_OSMESA = -Dosmesa=true
confflags_SSE2 = -Dsse2=true
confflags_TEFLON = -Dteflon=false
@ -61,7 +59,6 @@ WINE_ARCHS = amd64 arm64 armel armhf i386
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
GALLIUM_DRIVERS += softpipe
confflags_DIRECT_RENDERING = -Dglx-direct=false
confflags_GBM = -Dgbm=disabled
else
@ -72,7 +69,6 @@ else
GALLIUM_DRIVERS += nouveau r300 r600 virgl
confflags_DIRECT_RENDERING = -Dglx-direct=true
confflags_DRI3 = -Ddri3=enabled
confflags_GBM = -Dgbm=enabled
confflags_GALLIUM += -Dgallium-extra-hud=true
confflags_GALLIUM += -Dgallium-vdpau=enabled
@ -139,6 +135,7 @@ else
endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
VULKAN_DRIVERS += nouveau
endif
@ -147,7 +144,6 @@ else
confflags_GALLIUM += -Dgallium-nine=true
endif
else
GALLIUM_DRIVERS += softpipe
confflags_GALLIUM += -Dllvm=disabled
endif
@ -183,19 +179,16 @@ confflags_GALLIUM += -Dgallium-drivers="[$(GALLIUM_DRIVERS_LIST)]"
confflags += \
-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
-Dplatforms="[$(EGL_PLATFORMS_LIST)]" \
-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
-Dvulkan-layers="[$(VULKAN_LAYERS_LIST)]" \
-Dglvnd=enabled \
-Dshared-glapi=enabled \
-Dgallium-omx=disabled \
-Db_ndebug=true \
-Dbuild-tests=true \
-Dtools=drm-shim \
$(confflags_DIRECT_RENDERING) \
$(confflags_GBM) \
$(confflags_DRI3) \
$(confflags_GALLIUM) \
$(confflags_GLES) \
$(confflags_OSMESA) \

View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)

4
debian/upstream/metadata vendored Normal file
View File

@ -0,0 +1,4 @@
Bug-Database: https://gitlab.freedesktop.org/mesa/mesa/-/issues
Bug-Submit: https://gitlab.freedesktop.org/mesa/mesa/-/issues/new
Repository: https://gitlab.freedesktop.org/mesa/mesa.git
Repository-Browse: https://gitlab.freedesktop.org/mesa/mesa

1
debian/watch vendored
View File

@ -1,4 +1,3 @@
#git=git://anongit.freedesktop.org/mesa/mesa
version=3
opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+repack//,pgpsigurlmangle=s/$/.sig/,pasv" \
https://mesa.freedesktop.org/archive/mesa-(.*)\.tar\.xz

View File

@ -0,0 +1,49 @@
From e34357015cfbe0bb2545f6509d66c76da3232e7b Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Fri, 15 Nov 2024 14:38:54 +1100
Subject: glsl: fix compiler global temp collisions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
glsl ir creates these temps to copy global initialiser values for
example. To avoid collisions during linking due to 2 shaders in the same
stage having temps with the same name we make sure to define these as
function variables not shader globals. This will put the temps into the
global instructions wrapper created in 7c5b21c03230.
Fixes: cbfc225e2bda ("glsl: switch to a full nir based linker")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12136
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32202>
---
src/compiler/glsl/glsl_to_nir.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 49db6d17e015..5e47477c8d9b 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -481,11 +481,14 @@ nir_visitor::visit(ir_variable *ir)
switch(ir->data.mode) {
case ir_var_auto:
- case ir_var_temporary:
- if (is_global)
+ if (is_global) {
var->data.mode = nir_var_shader_temp;
- else
- var->data.mode = nir_var_function_temp;
+ break;
+ }
+
+ FALLTHROUGH;
+ case ir_var_temporary:
+ var->data.mode = nir_var_function_temp;
break;
case ir_var_function_in:
--
cgit v1.2.3

View File

@ -1,6 +1,6 @@
--- a/src/util/tests/cache_test.cpp
+++ b/src/util/tests/cache_test.cpp
@@ -82,8 +82,8 @@ check_directories_created(void *mem_ctx,
@@ -84,8 +84,8 @@ check_directories_created(void *mem_ctx,
{
bool sub_dirs_created = false;

View File

@ -1,3 +1,4 @@
0001_glsl:_fix_compiler_global_temp_collisions.patch
path_max.diff
src_glx_dri_common.h.diff
radvaabb.diff

View File

@ -1,8 +1,8 @@
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -57,6 +57,10 @@ extern struct glx_config *driConvertConf
@@ -56,6 +56,10 @@ extern struct glx_config *driConvertConf
extern void driDestroyConfigs(const __DRIconfig **configs);
extern void driDestroyConfigs(const struct dri_config **configs);
+#ifndef __GLXDRIdrawable
+typedef struct __GLXDRIdrawableRec __GLXDRIdrawable;