Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 69ff522f21 |
160
Mesa.changes
160
Mesa.changes
@@ -1,162 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 30 17:53:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Thu Jul 24 07:00:09 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
|
||||
|
||||
- Update to release 25.0.5
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.5
|
||||
- U_loader_wayland-Fix-missing-timespec.h-include.patch
|
||||
* fixes build with wayland-protocols 1.45
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 18 17:14:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Fri Jul 4 08:56:49 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 25.0.4
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.4
|
||||
- U_0001-svga-add-svga_resource_create_with_modifiers-functio.patch
|
||||
U_0002-svga-fix-printing-64-bit-value-for-32-bit-build.patch
|
||||
* fixes Wayland session when using SP7 as vmware guest (bsc#1245034)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 19:20:37 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Sat May 24 09:34:58 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- let Mesa-dri only require libvulkan1, libvulkan_lvp if build
|
||||
of vulkan drivers is enabled on this platform
|
||||
- U_gbm-fix-get_back_bo-failure-with-gbm_surface-and-imp.patch
|
||||
* should fix hangup on "Started GNOME Display Manager" in a VM
|
||||
on VMware Fusion Pro (bsc#1241370)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 14:37:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Fri May 16 12:22:03 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- let Mesa-dri also require libvulkan_lvp; fixes startup of Wayland
|
||||
sessions with Mesa 25.0.3 (boo#1240854)
|
||||
- aarch64: enable panfrost vulkan driver on Leap 16.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 09:54:36 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Fri Apr 25 10:39:34 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- U_clover-Don-t-include-libclc-headers.patch
|
||||
* don't break clover with libclc 20.1.0 update (boo#1240848)
|
||||
- U_egl-never-select-swrast-for-vmwgfx.patch
|
||||
* fixes crash in libgallium on virtualbox (bsc#1241701)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 6 09:24:16 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Thu Mar 20 14:54:39 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 25.0.3
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.3
|
||||
- fixed build on SLE16
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 4 12:23:19 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- require llvm20/clang20
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 31 16:20:27 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- don't apply revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
|
||||
on s390x, which is not affected by that issue (different Mesa
|
||||
version)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 25 09:07:24 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
|
||||
|
||||
- Fix regression in winsys/amdgpu (boo#1239657)
|
||||
revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
|
||||
https://gitlab.freedesktop.org/mesa/mesa/-/issues/12809
|
||||
https://gitlab.freedesktop.org/mesa/mesa/-/commit/8c91624614c1f939974fe0d2d1a3baf83335cecb
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 20 15:10:52 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 25.0.2
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 9 11:06:22 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Make build recipe POSIX sh compatible
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 7 13:40:43 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- enabled Raytracing (vulkan) support for intel ARC GPUs
|
||||
(boo#1238732)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 7 09:56:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- no longer hardcode CXX, but instead make use of %gcc_version,
|
||||
which is implicitely set in prjconf, which I wasn't aware of ...
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 6 22:21:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- CXX needs to be set to an existing g++ compiler; otherwise you get
|
||||
meson.build:4:0: ERROR: Unknown compiler(s): [['c++'], ['g++'], ['clang++'], ['nvc++'], ['pgc++'], ['icpc'], ['icpx']]
|
||||
The following exception(s) were encountered:
|
||||
Running `c++ --version` gave "[Errno 2] No such file or directory: 'c++'"
|
||||
Running `g++ --version` gave "[Errno 2] No such file or directory: 'g++'"
|
||||
Running `clang++ --version` gave "[Errno 2] No such file or directory: 'clang++'"
|
||||
Running `nvc++ --version` gave "[Errno 2] No such file or directory: 'nvc++'"
|
||||
Running `pgc++ --version` gave "[Errno 2] No such file or directory: 'pgc++'"
|
||||
Running `icpc --version` gave "[Errno 2] No such file or directory: 'icpc'"
|
||||
Running `icpx --version` gave "[Errno 2] No such file or directory: 'icpx'"
|
||||
Since there is no 'g++' available I take 'g++-14', i.e.
|
||||
export CXX=g++-14
|
||||
I don't care if gcc gets updated and Mesa fails then. I much more
|
||||
often need to update Mesa than we see a gcc update ...
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 6 14:58:51 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- fixed build for TW
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 6 13:51:52 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Thu Mar 6 13:48:38 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Build with GCC 13 on Leap/SLES 15 (bsc#1238713)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 5 22:13:36 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Thu Mar 6 01:32:40 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 25.0.1
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.1
|
||||
- reverted previous change; n_remove-llvm17-wa-option.patch didn't
|
||||
help at all ...
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 5 13:16:20 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
Wed Mar 5 13:33:53 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- don't obsolete Mesa-libglapi0 on s390x since this is still on
|
||||
Mesa 24.1.7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 14:04:21 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add explanation for the "CM" in "GLESv1_CM".
|
||||
- Drop idempotent %if..%endif guards that do nothing.
|
||||
- Combine some rm calls in the build recipe.
|
||||
- Add -v argument to all rm calls to see the result of the
|
||||
deletion in the build log.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 20 12:58:48 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 25.0.0
|
||||
--> https://docs.mesa3d.org/relnotes/25.0.0
|
||||
- adjusted u_dep_xcb.patch
|
||||
- supersedes U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch
|
||||
- libglapi merged into libgallium
|
||||
- add patches to fix compilation with Python 3.6 (SLE15 SP7, SLE16, Leap 15.6)
|
||||
* u_intel-drop-annotations-from-spv2hex.patch
|
||||
* u_meson-lower-python-version-requirement.patch
|
||||
--> credits go to "Mikhail Paulyshka" <me@mixaill.net>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 31 23:39:37 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch
|
||||
* Fixes: 58b512ddd6e - radeonsi: execute clears at resource
|
||||
allocation using compute instead of gfx
|
||||
* Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 22 22:10:01 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- Update to release 24.3.4
|
||||
--> https://docs.mesa3d.org/relnotes/24.3.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 12 20:38:28 UTC 2025 - Mikhail Paulyshka <me@mixaill.net>
|
||||
|
||||
- aarch64: enable build of panvk driver
|
||||
- n_remove-llvm17-wa-option.patch
|
||||
* no longer use --llvm17-wa option when running intel_clc;
|
||||
hopefully this fixes again Mesa's build after we updated
|
||||
llvm 19.1.5 to 19.1.7 and building it now with gcc13 instead of
|
||||
gcc7 (bsc#1238713)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 4 20:46:28 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
221
Mesa.spec
221
Mesa.spec
@@ -43,7 +43,7 @@
|
||||
%define glamor 1
|
||||
%define _name_archive mesa
|
||||
%ifnarch s390x
|
||||
%define _version 25.0.5
|
||||
%define _version 24.3.3
|
||||
%else
|
||||
%define _version 24.1.7
|
||||
%endif
|
||||
@@ -89,9 +89,13 @@
|
||||
%ifarch %{arm} aarch64
|
||||
%define with_vulkan 1
|
||||
%if 0%{?suse_version} > 1600
|
||||
%define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk,nouveau,panfrost
|
||||
%define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk,nouveau,panfrost
|
||||
%else
|
||||
%define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk
|
||||
%if 0%{?suse_version} == 1600 && 0%{?is_opensuse}
|
||||
%define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk,panfrost
|
||||
%else
|
||||
%define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%ifarch riscv64
|
||||
@@ -150,13 +154,13 @@
|
||||
|
||||
# Leap 15 and SLES 15 defaults to GCC 7, which does not have stable C++17 ABI.
|
||||
# See https://bugzilla.suse.com/show_bug.cgi?id=1235697
|
||||
%if 0%{?gcc_version} < 13
|
||||
%if 0%{?suse_version} < 1600
|
||||
%define gcc_version 13
|
||||
%endif
|
||||
|
||||
Name: Mesa%{psuffix}
|
||||
%ifnarch s390x
|
||||
Version: 25.0.5
|
||||
Version: 24.3.3
|
||||
%else
|
||||
Version: 24.1.7
|
||||
%endif
|
||||
@@ -187,8 +191,8 @@ Source9: manual-pages.tar.bz2
|
||||
Source10: Mesa-rpmlintrc
|
||||
Source11: Mesa.keyring
|
||||
Source12: README-suse-maintenance.md
|
||||
Source20: https://archive.mesa3d.org/%{_name_archive}-25.0.5.tar.xz
|
||||
Source21: https://archive.mesa3d.org/%{_name_archive}-25.0.5.tar.xz.sig
|
||||
Source20: https://archive.mesa3d.org/%{_name_archive}-24.3.3.tar.xz
|
||||
Source21: https://archive.mesa3d.org/%{_name_archive}-24.3.3.tar.xz.sig
|
||||
Patch2: n_add-Mesa-headers-again.patch
|
||||
Patch11: u_0001-intel-genxml-Drop-from-__future__-import-annotations.patch
|
||||
Patch12: u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch
|
||||
@@ -199,6 +203,7 @@ Patch13: python36-buildfix1-s390x.patch
|
||||
%endif
|
||||
Patch14: python36-buildfix2.patch
|
||||
Patch17: tlsdesc_test.patch
|
||||
Patch18: U_loader_wayland-Fix-missing-timespec.h-include.patch
|
||||
# never to be upstreamed
|
||||
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
|
||||
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
||||
@@ -209,9 +214,10 @@ Patch500: u_dep_xcb.patch
|
||||
Patch500: u_dep_xcb-s390x.patch
|
||||
%endif
|
||||
%ifnarch s390x
|
||||
Patch700: u_meson-lower-python-version-requirement.patch
|
||||
Patch701: u_intel-drop-annotations-from-spv2hex.patch
|
||||
Patch702: U_clover-Don-t-include-libclc-headers.patch
|
||||
Patch600: U_egl-never-select-swrast-for-vmwgfx.patch
|
||||
Patch700: U_gbm-fix-get_back_bo-failure-with-gbm_surface-and-imp.patch
|
||||
Patch801: U_0001-svga-add-svga_resource_create_with_modifiers-functio.patch
|
||||
Patch802: U_0002-svga-fix-printing-64-bit-value-for-32-bit-build.patch
|
||||
%endif
|
||||
%ifnarch s390x
|
||||
Patch1222040: u_mesa-CVE-2023-45913.patch
|
||||
@@ -221,11 +227,6 @@ Patch1222040: u_mesa-CVE-2023-45913-s390x.patch
|
||||
Patch1222041: u_mesa-CVE-2023-45919.patch
|
||||
Patch1222042: u_mesa-CVE-2023-45922.patch
|
||||
|
||||
# Reverts a possible regression
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/-/commit/8c91624614c1f939974fe0d2d1a3baf83335cecb
|
||||
# https://bugzilla.opensuse.org/show_bug.cgi?id=1239657
|
||||
Patch2000000: revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
|
||||
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: DirectX-Headers >= 1.613.0
|
||||
%endif
|
||||
@@ -321,15 +322,15 @@ BuildRequires: libelf-devel
|
||||
%endif
|
||||
%endif
|
||||
# Requirements for wayland bumped up from 17.0
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.11
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= 1.8
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.11
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.18
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= 1.38
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.18
|
||||
%if 0%{with_llvm}
|
||||
%if 0%{?suse_version} >= 1550
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: llvm-devel >= 15
|
||||
%else
|
||||
%if 0%{?sle_version} >= 150600
|
||||
BuildRequires: llvm20-devel
|
||||
BuildRequires: llvm19-devel
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
@@ -339,7 +340,7 @@ BuildRequires: llvm20-devel
|
||||
BuildRequires: clang-devel
|
||||
%else
|
||||
%if 0%{?sle_version} >= 150600
|
||||
BuildRequires: clang20-devel
|
||||
BuildRequires: clang19-devel
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: libclc
|
||||
@@ -393,9 +394,7 @@ Requires: Mesa-libEGL-devel = %{version}
|
||||
Requires: Mesa-libGL-devel = %{version}
|
||||
Requires: Mesa-libGLESv1_CM-devel = %{version}
|
||||
Requires: Mesa-libGLESv2-devel = %{version}
|
||||
%ifarch s390x
|
||||
Requires: Mesa-libglapi-devel = %{version}
|
||||
%endif
|
||||
Requires: libOSMesa-devel = %{version}
|
||||
Requires: libgbm-devel = %{version}
|
||||
Provides: Mesa-devel-static = %{version}
|
||||
@@ -502,7 +501,7 @@ This package includes headers and static libraries for compiling
|
||||
programs with Mesa.
|
||||
|
||||
%package libGLESv1_CM-devel
|
||||
Summary: Development files for the OpenGL ES 1.x Common Profile API
|
||||
Summary: Development files for the OpenGL ES 1.x API
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: Mesa-KHR-devel = %{version}
|
||||
Requires: libglvnd-devel >= 0.1.0
|
||||
@@ -517,7 +516,7 @@ extensions for the special needs of embedded systems.
|
||||
OpenGL|ES 1.x provides an API for fixed-function hardware.
|
||||
|
||||
This package provides a development environment for building programs
|
||||
using the OpenGL|ES 1.x Common Profile APIs.
|
||||
using the OpenGL|ES 1.x APIs.
|
||||
|
||||
%package libGLESv2-devel
|
||||
Summary: Development files for the OpenGL ES 2.x API
|
||||
@@ -565,6 +564,16 @@ OSmesa is a Mesa extension that allows programs to render to an
|
||||
off-screen buffer using the OpenGL API without having to create a
|
||||
rendering context on an X Server. It uses a pure software renderer.
|
||||
|
||||
%package -n libOSMesa-devel
|
||||
Summary: Development files for the Mesa Offscreen Rendering extension
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libOSMesa8 = %{version}
|
||||
|
||||
%description -n libOSMesa-devel
|
||||
Development files for the OSmesa Mesa extension that allows programs to render to an
|
||||
off-screen buffer using the OpenGL API without having to create a
|
||||
rendering context on an X Server. It uses a pure software renderer.
|
||||
|
||||
%package libglapi0
|
||||
Summary: Free implementation of the GL API
|
||||
Group: System/Libraries
|
||||
@@ -584,32 +593,15 @@ Development files for the Mesa GL API module which is responsible for
|
||||
dispatching all the gl* functions. It is intended to be mainly used by
|
||||
the Mesa-libGLES* packages.
|
||||
|
||||
%package -n libOSMesa-devel
|
||||
Summary: Development files for the Mesa Offscreen Rendering extension
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libOSMesa8 = %{version}
|
||||
|
||||
%description -n libOSMesa-devel
|
||||
Development files for the OSmesa Mesa extension that allows programs to render to an
|
||||
off-screen buffer using the OpenGL API without having to create a
|
||||
rendering context on an X Server. It uses a pure software renderer.
|
||||
|
||||
%package -n Mesa-dri
|
||||
Summary: DRI plug-ins for 3D acceleration
|
||||
Group: System/Libraries
|
||||
Requires: Mesa = %{version}
|
||||
%if 0%{with_vulkan}
|
||||
Requires: libvulkan1
|
||||
Requires: libvulkan_lvp
|
||||
%endif
|
||||
Supplements: Mesa
|
||||
# merged into libgallium in 24.2.3
|
||||
Provides: libvdpau_gallium = %{version}-%{release}
|
||||
Obsoletes: libvdpau_gallium < %{version}-%{release}
|
||||
# merged into libgallium in 25.0.0
|
||||
%ifnarch s390x
|
||||
Obsoletes: Mesa-libglapi0 < 25.0.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-dri
|
||||
This package contains Mesa DRI drivers for 3D acceleration.
|
||||
@@ -826,13 +818,6 @@ Group: System/Libraries
|
||||
|
||||
%description -n libvulkan_freedreno
|
||||
This package contains the Vulkan parts for Mesa.
|
||||
|
||||
%package -n libvulkan_panfrost
|
||||
Summary: Mesa vulkan driver for ARM Mali
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libvulkan_panfrost
|
||||
This package contains the Vulkan parts for Mesa.
|
||||
%endif
|
||||
|
||||
%package -n Mesa-vulkan-device-select
|
||||
@@ -897,6 +882,7 @@ cp %{SOURCE6} subprojects/packagecache/
|
||||
%patch -P 14 -p1
|
||||
%endif
|
||||
%patch -P 17 -p1
|
||||
%patch -P 18 -p1
|
||||
# no longer needed since gstreamer-plugins-vaapi 1.18.4
|
||||
%if 0%{?suse_version} < 1550
|
||||
%patch -P 54 -p1
|
||||
@@ -905,16 +891,14 @@ cp %{SOURCE6} subprojects/packagecache/
|
||||
%patch -P 400 -p1
|
||||
%patch -P 500 -p1
|
||||
%ifnarch s390x
|
||||
%patch -P 600 -p1
|
||||
%patch -P 700 -p1
|
||||
%patch -P 701 -p1
|
||||
%patch -P 702 -p1
|
||||
%patch -P 801 -p1
|
||||
%patch -P 802 -p1
|
||||
%endif
|
||||
%patch -P 1222040 -p1
|
||||
%patch -P 1222041 -p1
|
||||
%patch -P 1222042 -p1
|
||||
%ifnarch s390x
|
||||
%patch -P 2000000 -p1
|
||||
%endif
|
||||
# Remove requires to vulkan libs from baselibs.conf on platforms
|
||||
# where vulkan build is disabled; ugly ...
|
||||
%if 0%{?with_vulkan} == 0
|
||||
@@ -927,8 +911,10 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
|
||||
%ifarch ppc64 ppc64le
|
||||
%limit_build -m 1024
|
||||
%endif
|
||||
export CC=gcc-%{gcc_version}
|
||||
export CXX=g++-%{gcc_version}
|
||||
%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1600
|
||||
export CC=gcc-13
|
||||
export CXX=g++-13
|
||||
%endif
|
||||
|
||||
egl_platforms=x11,wayland
|
||||
|
||||
@@ -1001,7 +987,6 @@ egl_platforms=x11,wayland
|
||||
-Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,svga,virgl,iris,crocus,i915,d3d12,zink \
|
||||
-Dgallium-d3d12-video=enabled \
|
||||
-Dgallium-d3d12-graphics=enabled \
|
||||
-Dintel-rt=enabled \
|
||||
%else
|
||||
%ifarch %{arm} aarch64
|
||||
%if 0%{?suse_version} >= 1550
|
||||
@@ -1046,82 +1031,79 @@ export MESON_PACKAGE_CACHE_DIR="%{_sourcedir}"
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
# libwayland-egl is provided by wayland itself
|
||||
rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \
|
||||
%{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
|
||||
rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
|
||||
rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
|
||||
|
||||
%if "%{flavor}" == "drivers"
|
||||
# Delete things that we do not package in the Mesa-drivers variant, but can
|
||||
# not disable from buildling and installing.
|
||||
|
||||
rm -fv %{buildroot}/%{_libdir}/libEGL.so*
|
||||
rm -f %{buildroot}/%{_libdir}/libEGL.so*
|
||||
# in Mesa-libEGL-devel
|
||||
rm -v %{buildroot}/%{_includedir}/EGL/egl.h \
|
||||
%{buildroot}/%{_includedir}/EGL/eglext.h \
|
||||
%{buildroot}/%{_includedir}/EGL/eglext_angle.h \
|
||||
%{buildroot}/%{_includedir}/EGL/eglmesaext.h \
|
||||
%{buildroot}/%{_includedir}/EGL/eglplatform.h
|
||||
rm %{buildroot}/%{_includedir}/EGL/egl.h
|
||||
rm %{buildroot}/%{_includedir}/EGL/eglext.h
|
||||
rm %{buildroot}/%{_includedir}/EGL/eglext_angle.h
|
||||
rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h
|
||||
rm %{buildroot}/%{_includedir}/EGL/eglplatform.h
|
||||
|
||||
# in Mesa-libGL-devel
|
||||
rm -Rfv %{buildroot}/%{_includedir}/GL
|
||||
rm -rf %{buildroot}/%{_includedir}/GL
|
||||
|
||||
#in Mesa-libGLESv1_CM-devel
|
||||
rm -Rfv %{buildroot}/%{_includedir}/GLES
|
||||
rm -rf %{buildroot}/%{_includedir}/GLES
|
||||
|
||||
#in Mesa-libGLESv2-devel
|
||||
rm -Rfv %{buildroot}/%{_includedir}/GLES2
|
||||
rm -rf %{buildroot}/%{_includedir}/GLES2
|
||||
|
||||
#in Mesa-libGLESv3-devel
|
||||
rm -Rfv %{buildroot}/%{_includedir}/GLES3
|
||||
rm -rf %{buildroot}/%{_includedir}/GLES3
|
||||
|
||||
#in Mesa-libEGL1
|
||||
rm -Rfv %{buildroot}/%{_libdir}/libEGL_mesa.so* \
|
||||
%{buildroot}/%{_datadir}/glvnd
|
||||
rm -f %{buildroot}/%{_libdir}/libEGL_mesa.so*
|
||||
rm -rf %{buildroot}/%{_datadir}/glvnd
|
||||
|
||||
# in Mesa-libglapi0
|
||||
%ifarch s390x
|
||||
rm -v %{buildroot}/%{_libdir}/libglapi.so*
|
||||
%endif
|
||||
rm %{buildroot}/%{_libdir}/libglapi.so*
|
||||
|
||||
# in libwayland-egl1
|
||||
rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \
|
||||
%{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
|
||||
rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
|
||||
rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
|
||||
|
||||
# in Mesa-dri-devel
|
||||
rm -v %{buildroot}/%{_libdir}/pkgconfig/dri.pc
|
||||
rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc
|
||||
|
||||
# in KHR-devel
|
||||
rm -Rfv %{buildroot}/%{_includedir}/KHR
|
||||
rm -rf %{buildroot}/%{_includedir}/KHR
|
||||
|
||||
# in libgbm-devel
|
||||
rm -fv %{buildroot}%{_includedir}/gbm.h \
|
||||
%{buildroot}%{_libdir}/libgbm.so* \
|
||||
%{buildroot}%{_libdir}/pkgconfig/gbm.pc
|
||||
rm -f %{buildroot}%{_includedir}/gbm.h
|
||||
rm -f %{buildroot}%{_libdir}/libgbm.so*
|
||||
rm -f %{buildroot}%{_libdir}/pkgconfig/gbm.pc
|
||||
|
||||
%else
|
||||
# package in Mesa-dri
|
||||
rm -Rfv %{buildroot}/%{_datadir}/drirc.d
|
||||
rm -rf %{buildroot}/%{_datadir}/drirc.d
|
||||
|
||||
rm -Rfv %{buildroot}/%{_libdir}/dri/*_dri.so \
|
||||
%{buildroot}%{_libdir}/libgallium-*.so \
|
||||
%{buildroot}%{_libdir}/gbm/ \
|
||||
%{buildroot}%{_libdir}/libGLES*
|
||||
rm -f %{buildroot}/%{_libdir}/dri/*_dri.so
|
||||
rm -f %{buildroot}%{_libdir}/libgallium-*.so
|
||||
rm -rf %{buildroot}%{_libdir}/gbm/
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/libGLES*
|
||||
# glvnd needs a default provider for indirect rendering where it cannot
|
||||
# determine the vendor
|
||||
ln -sv %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
|
||||
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
|
||||
|
||||
# pickup pkgconfig files from libglvnd build
|
||||
for i in gl egl glesv1_cm glesv2; do
|
||||
rm -fv "%{buildroot}/%{_libdir}/pkgconfig/$i.pc"
|
||||
install -vm 0644 "%{_docdir}/libglvnd/pkgconfig/$i.pc" \
|
||||
%{buildroot}/%{_libdir}/pkgconfig/
|
||||
done
|
||||
rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
|
||||
install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
|
||||
%{buildroot}/%{_libdir}/pkgconfig/
|
||||
|
||||
for dir in GL/gl GL/glx; do
|
||||
cd "../xc/doc/man/$dir"
|
||||
for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
|
||||
pushd $dir
|
||||
xmkmf -a
|
||||
%make_build V=1
|
||||
make %{?_smp_mflags} V=1
|
||||
make install.man DESTDIR=%{buildroot} MANPATH=%{_mandir} LIBMANSUFFIX=3gl
|
||||
cd -
|
||||
popd
|
||||
done
|
||||
%endif
|
||||
|
||||
@@ -1132,14 +1114,37 @@ done
|
||||
echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch}
|
||||
%endif
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%ldconfig_scriptlets libEGL1
|
||||
%ldconfig_scriptlets libGL1
|
||||
%ldconfig_scriptlets -n libOSMesa8
|
||||
%ldconfig_scriptlets -n libgbm1
|
||||
%ldconfig_scriptlets -n libxatracker2
|
||||
%ldconfig_scriptlets libglapi0
|
||||
%ldconfig_scriptlets -n Mesa-libd3d
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%post libEGL1 -p /sbin/ldconfig
|
||||
|
||||
%postun libEGL1 -p /sbin/ldconfig
|
||||
|
||||
%post libGL1 -p /sbin/ldconfig
|
||||
|
||||
%postun libGL1 -p /sbin/ldconfig
|
||||
|
||||
%post -n libOSMesa8 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libOSMesa8 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgbm1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgbm1 -p /sbin/ldconfig
|
||||
|
||||
%post -n libxatracker2 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libxatracker2 -p /sbin/ldconfig
|
||||
|
||||
%post libglapi0 -p /sbin/ldconfig
|
||||
|
||||
%postun libglapi0 -p /sbin/ldconfig
|
||||
|
||||
%post -n Mesa-libd3d -p /sbin/ldconfig
|
||||
|
||||
%postun -n Mesa-libd3d -p /sbin/ldconfig
|
||||
|
||||
%if "%{flavor}" != "drivers"
|
||||
%files
|
||||
@@ -1250,7 +1255,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
%if "%{flavor}" != "drivers"
|
||||
%files libglapi0
|
||||
%{_libdir}/libglapi.so.0*
|
||||
@@ -1258,7 +1262,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
|
||||
%files libglapi-devel
|
||||
%{_libdir}/libglapi.so
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "drivers"
|
||||
%files -n Mesa-dri
|
||||
@@ -1401,12 +1404,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
|
||||
%dir %{_datadir}/vulkan
|
||||
%dir %{_datadir}/vulkan/icd.d
|
||||
%{_datadir}/vulkan/icd.d/freedreno_icd.*.json
|
||||
|
||||
%files -n libvulkan_panfrost
|
||||
%{_libdir}/libvulkan_panfrost.so
|
||||
%dir %{_datadir}/vulkan
|
||||
%dir %{_datadir}/vulkan/icd.d
|
||||
%{_datadir}/vulkan/icd.d/panfrost_icd.*.json
|
||||
%endif
|
||||
|
||||
%files -n Mesa-vulkan-device-select
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
From b13e2a495e9e3da56add7d852ca01b2cd7eef52d Mon Sep 17 00:00:00 2001
|
||||
From: Brian Paul <brian.paul@broadcom.com>
|
||||
Date: Thu, 9 Jan 2025 22:45:34 -0700
|
||||
Subject: [PATCH] svga: add svga_resource_create_with_modifiers() function
|
||||
|
||||
The dri_create_image() function returns early if the gallium
|
||||
driver does not implement this function. Surface creation has
|
||||
been broken for some time up to this fix.
|
||||
|
||||
Signed-off-by: Brian Paul <brian.paul@broadcom.com>
|
||||
Reviewed-by: Neha Bhende <neha.Bhende@broadcom.com>
|
||||
Reviewed-by: Neha Bhende <None>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32976>
|
||||
---
|
||||
src/gallium/drivers/svga/svga_resource.c | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/src/gallium/drivers/svga/svga_resource.c b/src/gallium/drivers/svga/svga_resource.c
|
||||
index 80a4311854e..1775b65fab1 100644
|
||||
--- a/src/gallium/drivers/svga/svga_resource.c
|
||||
+++ b/src/gallium/drivers/svga/svga_resource.c
|
||||
@@ -52,6 +52,22 @@ svga_resource_from_handle(struct pipe_screen * screen,
|
||||
}
|
||||
|
||||
|
||||
+static struct pipe_resource *
|
||||
+svga_resource_create_with_modifiers(struct pipe_screen *screen,
|
||||
+ const struct pipe_resource *templat,
|
||||
+ const uint64_t *modifiers, int count)
|
||||
+{
|
||||
+ /* Not sure, but it seems there's no format modifiers
|
||||
+ * to deal with here.
|
||||
+ */
|
||||
+ if (count > 0 && modifiers != NULL && modifiers[0] != 0) {
|
||||
+ debug_printf("vmware: unexpected format modifier 0x%lx\n",
|
||||
+ modifiers[0]);
|
||||
+ }
|
||||
+ return svga_resource_create(screen, templat);
|
||||
+}
|
||||
+
|
||||
+
|
||||
/**
|
||||
* Check if a resource (texture, buffer) of the given size
|
||||
* and format can be created.
|
||||
@@ -121,6 +137,7 @@ void
|
||||
svga_init_screen_resource_functions(struct svga_screen *is)
|
||||
{
|
||||
is->screen.resource_create = svga_resource_create;
|
||||
+ is->screen.resource_create_with_modifiers = svga_resource_create_with_modifiers;
|
||||
is->screen.resource_from_handle = svga_resource_from_handle;
|
||||
is->screen.resource_get_handle = svga_resource_get_handle;
|
||||
is->screen.resource_destroy = svga_resource_destroy;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
39
U_0002-svga-fix-printing-64-bit-value-for-32-bit-build.patch
Normal file
39
U_0002-svga-fix-printing-64-bit-value-for-32-bit-build.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
From 24107f2f67aab1e7304c0bbff77b1cef014673b9 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Paul <brian.paul@broadcom.com>
|
||||
Date: Mon, 13 Jan 2025 06:36:48 -0700
|
||||
Subject: [PATCH] svga: fix printing 64-bit value for 32-bit build
|
||||
|
||||
Closes: #12449, #12451
|
||||
Fixes: b13e2a495e ("svga: add svga_resource_create_with_modifiers() function")
|
||||
Signed-off-by: Brian Paul <brian.paul@broadcom.com>
|
||||
Reviewed-by: Neha Bhende <neha.Bhende@broadcom.com>
|
||||
Reviewed-by: Neha Bhende <None>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32995>
|
||||
---
|
||||
src/gallium/drivers/svga/svga_resource.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/svga/svga_resource.c b/src/gallium/drivers/svga/svga_resource.c
|
||||
index 1775b65fab1..aa145de9ffe 100644
|
||||
--- a/src/gallium/drivers/svga/svga_resource.c
|
||||
+++ b/src/gallium/drivers/svga/svga_resource.c
|
||||
@@ -5,6 +5,7 @@
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
+#include <inttypes.h>
|
||||
#include "util/u_debug.h"
|
||||
|
||||
#include "svga_resource.h"
|
||||
@@ -61,7 +62,7 @@ svga_resource_create_with_modifiers(struct pipe_screen *screen,
|
||||
* to deal with here.
|
||||
*/
|
||||
if (count > 0 && modifiers != NULL && modifiers[0] != 0) {
|
||||
- debug_printf("vmware: unexpected format modifier 0x%lx\n",
|
||||
+ debug_printf("vmware: unexpected format modifier 0x%" PRIx64 "\n",
|
||||
modifiers[0]);
|
||||
}
|
||||
return svga_resource_create(screen, templat);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,144 +0,0 @@
|
||||
From e4eb5e80c316c0af3fff310ca89e1175d81556c1 Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <npopov@redhat.com>
|
||||
Date: Thu, 27 Feb 2025 15:44:27 +0100
|
||||
Subject: [PATCH] clover: Don't include libclc headers
|
||||
|
||||
Per https://github.com/llvm/llvm-project/issues/119967 these
|
||||
headers are internal implementation details of libclc and were
|
||||
never supposed to be installed. They are not available anymore
|
||||
since LLVM 20. Instead opencl-c.h should be used.
|
||||
|
||||
There already ise a code path for including opencl-c.h, so always
|
||||
use it.
|
||||
|
||||
This didn't work for me out of the box, because the build system
|
||||
currently hardcodes the clang resource directory, which is incorrect
|
||||
for Fedora at least. Fix this by using GetResourcePath +
|
||||
CLANG_RESOURCE_DIR provided by clang instead. This is basically
|
||||
the same as what is done in clc_helper.c
|
||||
|
||||
I've still retained the old behavior as a fallback just in case
|
||||
(e.g. if clang is linked statically?)
|
||||
|
||||
Reviewed-by: Karol Herbst <kherbst@redhat.com>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33805>
|
||||
---
|
||||
.../frontends/clover/llvm/invocation.cpp | 53 +++++++++++++------
|
||||
src/gallium/frontends/clover/meson.build | 5 +-
|
||||
2 files changed, 39 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
index 3cbb05baecf..ca030b404d7 100644
|
||||
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
|
||||
@@ -24,6 +24,8 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
+#include <dlfcn.h>
|
||||
+
|
||||
#include <llvm/IR/DiagnosticPrinter.h>
|
||||
#include <llvm/IR/DiagnosticInfo.h>
|
||||
#include <llvm/IR/LLVMContext.h>
|
||||
@@ -39,6 +41,8 @@
|
||||
#include <clang/Frontend/TextDiagnosticBuffer.h>
|
||||
#include <clang/Frontend/TextDiagnosticPrinter.h>
|
||||
#include <clang/Basic/TargetInfo.h>
|
||||
+#include <clang/Config/config.h>
|
||||
+#include <clang/Driver/Driver.h>
|
||||
|
||||
#if LLVM_VERSION_MAJOR >= 20
|
||||
#include <llvm/Support/VirtualFileSystem.h>
|
||||
@@ -323,6 +327,30 @@ namespace {
|
||||
return c;
|
||||
}
|
||||
|
||||
+ std::string getResourceDirectory() {
|
||||
+ Dl_info info;
|
||||
+ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) {
|
||||
+ return FALLBACK_CLANG_RESOURCE_DIR;
|
||||
+ }
|
||||
+
|
||||
+ char *libclang_path = realpath(info.dli_fname, NULL);
|
||||
+ if (libclang_path == nullptr) {
|
||||
+ return FALLBACK_CLANG_RESOURCE_DIR;
|
||||
+ }
|
||||
+
|
||||
+ // GetResourcePath is a way to retrieve the actual libclang resource dir based on a given
|
||||
+ // binary or library.
|
||||
+ std::string clang_resource_dir =
|
||||
+#if LLVM_VERSION_MAJOR >= 20
|
||||
+ clang::driver::Driver::GetResourcesPath(std::string(libclang_path));
|
||||
+#else
|
||||
+ clang::driver::Driver::GetResourcesPath(std::string(libclang_path), CLANG_RESOURCE_DIR);
|
||||
+#endif
|
||||
+ free(libclang_path);
|
||||
+
|
||||
+ return clang_resource_dir;
|
||||
+ }
|
||||
+
|
||||
std::unique_ptr<Module>
|
||||
compile(LLVMContext &ctx, clang::CompilerInstance &c,
|
||||
const std::string &name, const std::string &source,
|
||||
@@ -331,25 +359,18 @@ namespace {
|
||||
c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
|
||||
c.getHeaderSearchOpts().UseBuiltinIncludes = true;
|
||||
c.getHeaderSearchOpts().UseStandardSystemIncludes = true;
|
||||
- c.getHeaderSearchOpts().ResourceDir = CLANG_RESOURCE_DIR;
|
||||
|
||||
- if (use_libclc) {
|
||||
- // Add libclc generic search path
|
||||
- c.getHeaderSearchOpts().AddPath(LIBCLC_INCLUDEDIR,
|
||||
- clang::frontend::Angled,
|
||||
- false, false);
|
||||
+ std::string clang_resource_dir = getResourceDirectory();
|
||||
+ c.getHeaderSearchOpts().ResourceDir = clang_resource_dir;
|
||||
|
||||
- // Add libclc include
|
||||
- c.getPreprocessorOpts().Includes.push_back("clc/clc.h");
|
||||
- } else {
|
||||
- // Add opencl-c generic search path
|
||||
- c.getHeaderSearchOpts().AddPath(CLANG_RESOURCE_DIR,
|
||||
- clang::frontend::Angled,
|
||||
- false, false);
|
||||
+ // Add opencl-c generic search path
|
||||
+ std::string clang_include_path = clang_resource_dir + "/include";
|
||||
+ c.getHeaderSearchOpts().AddPath(clang_include_path,
|
||||
+ clang::frontend::Angled,
|
||||
+ false, false);
|
||||
|
||||
- // Add opencl include
|
||||
- c.getPreprocessorOpts().Includes.push_back("opencl-c.h");
|
||||
- }
|
||||
+ // Add opencl include
|
||||
+ c.getPreprocessorOpts().Includes.push_back("opencl-c.h");
|
||||
|
||||
// Add definition for the OpenCL version
|
||||
const auto dev_version = dev.device_version();
|
||||
diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
|
||||
index e569b86a1be..56a9894f0db 100644
|
||||
--- a/src/gallium/frontends/clover/meson.build
|
||||
+++ b/src/gallium/frontends/clover/meson.build
|
||||
@@ -10,7 +10,6 @@ clover_opencl_cpp_args = [
|
||||
'-DCL_USE_DEPRECATED_OPENCL_2_0_APIS',
|
||||
'-DCL_USE_DEPRECATED_OPENCL_2_1_APIS',
|
||||
'-DCL_USE_DEPRECATED_OPENCL_2_2_APIS',
|
||||
- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')),
|
||||
'-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir'))
|
||||
]
|
||||
clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux]
|
||||
@@ -43,9 +42,9 @@ libclllvm = static_library(
|
||||
cpp_args : [
|
||||
clover_cpp_args,
|
||||
clover_opencl_cpp_args,
|
||||
- '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
|
||||
+ '-DFALLBACK_CLANG_RESOURCE_DIR="@0@"'.format(join_paths(
|
||||
dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir'), 'clang',
|
||||
- dep_llvm.version(), 'include',
|
||||
+ dep_llvm.version()
|
||||
)),
|
||||
],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
--
|
||||
2.43.0
|
||||
|
||||
30
U_egl-never-select-swrast-for-vmwgfx.patch
Normal file
30
U_egl-never-select-swrast-for-vmwgfx.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From f3b8d7da46a6ab2e63589bede37b35b0ae861af9 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
||||
Date: Mon, 20 Jan 2025 09:06:03 -0500
|
||||
Subject: [PATCH] egl: never select swrast for vmwgfx
|
||||
|
||||
ForceSoftware will be true in this case from the high-level fallback,
|
||||
but this isn't really swrast
|
||||
|
||||
Fixes: 1de7c86bc1a ("dri: pass through a type enum for creating screen instead of driver_extensions")
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33123>
|
||||
---
|
||||
src/egl/drivers/dri2/egl_dri2.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
|
||||
index 6a43ad73d21..e813aa61f52 100644
|
||||
--- a/src/egl/drivers/dri2/egl_dri2.c
|
||||
+++ b/src/egl/drivers/dri2/egl_dri2.c
|
||||
@@ -592,7 +592,7 @@ dri2_load_driver(_EGLDisplay *disp)
|
||||
|
||||
dri2_dpy->kopper = disp->Options.Zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false);
|
||||
dri2_dpy->kopper_without_modifiers = dri2_dpy->kopper && debug_get_bool_option("LIBGL_KOPPER_DRI2", false);
|
||||
- dri2_dpy->swrast = (disp->Options.ForceSoftware && !dri2_dpy->kopper) ||
|
||||
+ dri2_dpy->swrast = (disp->Options.ForceSoftware && !dri2_dpy->kopper && strcmp(dri2_dpy->driver_name, "vmwgfx")) ||
|
||||
!dri2_dpy->driver_name || strstr(dri2_dpy->driver_name, "swrast");
|
||||
dri2_dpy->swrast_not_kms = dri2_dpy->swrast && (!dri2_dpy->driver_name || strcmp(dri2_dpy->driver_name, "kms_swrast"));
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
47
U_gbm-fix-get_back_bo-failure-with-gbm_surface-and-imp.patch
Normal file
47
U_gbm-fix-get_back_bo-failure-with-gbm_surface-and-imp.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
From 5a19323d0e3969de24ea6bd89ba62f2a5c37296e Mon Sep 17 00:00:00 2001
|
||||
From: Simon Ser <contact@emersion.fr>
|
||||
Date: Thu, 19 Dec 2024 17:35:46 +0100
|
||||
Subject: [PATCH] gbm: fix get_back_bo() failure with gbm_surface and implicit
|
||||
modifiers
|
||||
|
||||
Before 361f3622587e ("dri: Unify createImage and
|
||||
createImageWithModifiers"), gbm_surface_create_with_modifiers() would
|
||||
fail with ENOSYS on drivers missing explicit modifiers support. After
|
||||
that commit, it succeeds and fails later when it tries to allocate a
|
||||
new back buffer.
|
||||
|
||||
Restore the previous behavior.
|
||||
|
||||
Signed-off-by: Simon Ser <contact@emersion.fr>
|
||||
Fixes: 105fcb9cfdb4 ("dri: revert INVALID modifier special-casing")
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12283
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32726>
|
||||
---
|
||||
src/gbm/backends/dri/gbm_dri.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
|
||||
index 9e2761c33b0..316b251dd74 100644
|
||||
--- a/src/gbm/backends/dri/gbm_dri.c
|
||||
+++ b/src/gbm/backends/dri/gbm_dri.c
|
||||
@@ -1078,11 +1078,17 @@ gbm_dri_surface_create(struct gbm_device *gbm,
|
||||
uint32_t format, uint32_t flags,
|
||||
const uint64_t *modifiers, const unsigned count)
|
||||
{
|
||||
+ struct gbm_dri_device *dri = gbm_dri_device(gbm);
|
||||
struct gbm_dri_surface *surf;
|
||||
|
||||
if (count)
|
||||
assert(modifiers);
|
||||
|
||||
+ if (count > 0 && !dri->screen->base.screen->resource_create_with_modifiers) {
|
||||
+ errno = ENOSYS;
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
/* It's acceptable to create an image with INVALID modifier in the list,
|
||||
* but it cannot be on the only modifier (since it will certainly fail
|
||||
* later). While we could easily catch this after modifier creation, doing
|
||||
--
|
||||
2.43.0
|
||||
|
||||
38
U_loader_wayland-Fix-missing-timespec.h-include.patch
Normal file
38
U_loader_wayland-Fix-missing-timespec.h-include.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From 54928d643ec0d201bf0101d67437b53d7fdbafad Mon Sep 17 00:00:00 2001
|
||||
From: Karmjit Mahil <karmjit.mahil@igalia.com>
|
||||
Date: Thu, 6 Feb 2025 10:34:49 +0100
|
||||
Subject: [PATCH] loader/wayland: Fix missing timespec.h include
|
||||
|
||||
`loader_wayland_dispatch()` also makes use of `timespec` so we
|
||||
need `timespec.h`. Otherwise it fails to build due to
|
||||
`timespec_sub_saturate()` missing.
|
||||
|
||||
Signed-off-by: Karmjit Mahil <karmjit.mahil@igalia.com>
|
||||
Fixes: 90effcceab7 ("wsi/wayland: refactor wayland dispatch")
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12580
|
||||
Reviewed-by: Eric Engestrom <None>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33423>
|
||||
---
|
||||
src/loader/loader_wayland_helper.h | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/loader/loader_wayland_helper.h b/src/loader/loader_wayland_helper.h
|
||||
index 45f412a6c7ba1..0d7c49a15f246 100644
|
||||
--- a/src/loader/loader_wayland_helper.h
|
||||
+++ b/src/loader/loader_wayland_helper.h
|
||||
@@ -23,11 +23,10 @@
|
||||
#ifndef LOADER_WAYLAND_HELPER_HEADER_H
|
||||
#define LOADER_WAYLAND_HELPER_HEADER_H
|
||||
|
||||
+#include <util/timespec.h>
|
||||
#include <wayland-client.h>
|
||||
|
||||
#ifndef HAVE_WL_DISPATCH_QUEUE_TIMEOUT
|
||||
-
|
||||
-#include <util/timespec.h>
|
||||
int
|
||||
wl_display_dispatch_queue_timeout(struct wl_display *display,
|
||||
struct wl_event_queue *queue,
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -20,6 +20,7 @@ Mesa-devel
|
||||
requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
|
||||
requires "Mesa-libGLESv2-devel-<targettype> = <version>"
|
||||
requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
|
||||
requires "Mesa-libglapi-devel-<targettype> = <version>"
|
||||
requires "libOSMesa-devel-<targettype> = <version>"
|
||||
requires "libgbm-devel-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
@@ -65,6 +66,9 @@ libOSMesa-devel
|
||||
libgbm1
|
||||
libgbm-devel
|
||||
requires "libgbm1-<targettype> = <version>"
|
||||
Mesa-libglapi0
|
||||
Mesa-libglapi-devel
|
||||
requires "Mesa-libglapi0-<targettype> = <version>"
|
||||
Mesa-libd3d
|
||||
provides "d3dadapter9.so.1"
|
||||
Mesa-libd3d-devel
|
||||
|
||||
BIN
mesa-24.3.3.tar.xz
LFS
Normal file
BIN
mesa-24.3.3.tar.xz
LFS
Normal file
Binary file not shown.
BIN
mesa-24.3.3.tar.xz.sig
Normal file
BIN
mesa-24.3.3.tar.xz.sig
Normal file
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
|
||||
size 46793824
|
||||
Binary file not shown.
@@ -1,14 +0,0 @@
|
||||
--- b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
|
||||
+++ a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
|
||||
@@ -608,11 +608,6 @@
|
||||
if (flags & RADEON_FLAG_GTT_WC)
|
||||
request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC;
|
||||
|
||||
- if (aws->info.has_local_buffers &&
|
||||
- initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) &&
|
||||
- flags & RADEON_FLAG_NO_INTERPROCESS_SHARING)
|
||||
- request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID;
|
||||
-
|
||||
if (flags & RADEON_FLAG_DISCARDABLE &&
|
||||
aws->info.drm_minor >= 47)
|
||||
request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE;
|
||||
@@ -1,15 +1,15 @@
|
||||
Index: mesa-25.0.0/meson.build
|
||||
Index: mesa-24.3.0/meson.build
|
||||
===================================================================
|
||||
--- mesa-25.0.0.orig/meson.build
|
||||
+++ mesa-25.0.0/meson.build
|
||||
@@ -2150,8 +2150,10 @@ if with_platform_x11
|
||||
--- mesa-24.3.0.orig/meson.build
|
||||
+++ mesa-24.3.0/meson.build
|
||||
@@ -2103,8 +2103,10 @@ if with_platform_x11
|
||||
endif
|
||||
endif
|
||||
if with_dri_platform == 'drm'
|
||||
+ dep_x11_xcb = dependency('x11-xcb')
|
||||
dep_xcb_dri2 = dependency('xcb-dri2', version : dep_xcb_dri2_version, required : with_x11_dri2)
|
||||
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8', required : with_x11_dri2)
|
||||
|
||||
+ dep_xcb = dependency('xcb')
|
||||
dep_xcb_dri3 = dependency('xcb-dri3', version : dep_xcb_dri3_version)
|
||||
dep_xcb_present = dependency('xcb-present', version : dep_xcb_present_version)
|
||||
dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13')
|
||||
dep_xcb_present = dependency('xcb-present', version : '>= 1.13')
|
||||
if (dep_xcb_dri3.version().version_compare('>= 1.17') and
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 93d7b176c290c8fce39349d9f320b1b302d79e83 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Paulyshka <me@mixaill.net>
|
||||
Date: Thu, 20 Feb 2025 15:53:39 +0300
|
||||
Subject: [PATCH 1/1] intel: drop annotations from spv2hex
|
||||
|
||||
fixes compatibility with python 2.6
|
||||
---
|
||||
src/intel/shaders/spv2hex.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/intel/shaders/spv2hex.py b/src/intel/shaders/spv2hex.py
|
||||
index f07e4bfa375..59a66e05a79 100644
|
||||
--- a/src/intel/shaders/spv2hex.py
|
||||
+++ b/src/intel/shaders/spv2hex.py
|
||||
@@ -2,7 +2,6 @@
|
||||
# Copyright © 2025 Intel Corporation
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
-from __future__ import annotations
|
||||
import argparse
|
||||
import binascii
|
||||
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From accbfc5464112a8cd368f0293a7f1e91ff769304 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Paulyshka <me@mixaill.net>
|
||||
Date: Thu, 20 Feb 2025 15:17:05 +0300
|
||||
Subject: [PATCH 1/1] meson: lower python version requirement
|
||||
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1bd2bbc0a64..14cbe5b13d2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -936,7 +936,7 @@ if get_option('allow-kcmp') \
|
||||
endif
|
||||
|
||||
# On Windows, a venv has no versioned aliased to 'python'.
|
||||
-prog_python = find_program('python3', 'python', version : '>= 3.8')
|
||||
+prog_python = find_program('python3', 'python', version : '>= 3.6')
|
||||
|
||||
has_mako = run_command(
|
||||
prog_python, '-c',
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user