pool/Mesa
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- add patches to fix compilation with Python 3.6 (SLE15 SP7, SLE16, Leap 15.6)

Browse Source 
* u_intel-drop-annotations-from-spv2hex.patch
  * u_meson-lower-python-version-requirement.patch
  --> credits go to "Mikhail Paulyshka" <me@mixaill.net>
- fix again build for s390x

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1373
This commit is contained in:
Stefan Dirsch
2025-02-20 15:41:08 +00:00
committed by Git OBS Bridge
parent e4bfeaa434
commit 3166e09211
4 changed files with 109 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Mesa.changes
View File

@@ -6,6 +6,10 @@ Thu Feb 20 12:58:48 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
- 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>

57
Mesa.spec
View File

@@ -203,6 +203,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
%endif
%ifnarch s390x
Patch1222040: u_mesa-CVE-2023-45913.patch
%else
Patch1222040: u_mesa-CVE-2023-45913-s390x.patch
@@ -380,6 +384,9 @@ 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}
@@ -549,6 +556,27 @@ 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.
%ifarch s390x
%package libglapi0
Summary: Free implementation of the GL API
Group: System/Libraries
%description libglapi0
The Mesa GL API module is responsible for dispatching all the gl*
functions. It is intended to be mainly used by the Mesa-libGLES*
packages.
%package libglapi-devel
Summary: Development files for the Mesa GL API implementation
Group: Development/Libraries/C and C++
Requires: Mesa-libglapi0 = %{version}
%description libglapi-devel
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.
%endif
%package -n libOSMesa-devel
Summary: Development files for the Mesa Offscreen Rendering extension
Group: Development/Libraries/C and C++
@@ -569,8 +597,8 @@ Supplements: Mesa
Provides: libvdpau_gallium = %{version}-%{release}
Obsoletes: libvdpau_gallium < %{version}-%{release}
# merged into libgallium in 25.0.0
Provides: Mesa-libglapi0 = %{version}-%{release}
Obsoletes: Mesa-libglapi0 < %{version}-%{release}
Provides: Mesa-libglapi0 = 25.0.0
Obsoletes: Mesa-libglapi0 < 25.0.0
%description -n Mesa-dri
This package contains Mesa DRI drivers for 3D acceleration.
@@ -865,6 +893,10 @@ cp %{SOURCE6} subprojects/packagecache/
%patch -P 100 -p1
%patch -P 400 -p1
%patch -P 500 -p1
%ifnarch s390x
%patch -P 700 -p1
%patch -P 701 -p1
%endif
%patch -P 1222040 -p1
%patch -P 1222041 -p1
%patch -P 1222042 -p1
@@ -1031,6 +1063,11 @@ rm -rf %{buildroot}/%{_includedir}/GLES3
rm -f %{buildroot}/%{_libdir}/libEGL_mesa.so*
rm -rf %{buildroot}/%{_datadir}/glvnd
# in Mesa-libglapi0
%ifarch s390x
rm %{buildroot}/%{_libdir}/libglapi.so*
%endif
# in libwayland-egl1
rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
@@ -1104,6 +1141,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%postun -n libxatracker2 -p /sbin/ldconfig
%ifarch s390x
%post libglapi0 -p /sbin/ldconfig
%postun libglapi0 -p /sbin/ldconfig
%endif
%post -n Mesa-libd3d -p /sbin/ldconfig
%postun -n Mesa-libd3d -p /sbin/ldconfig
@@ -1217,6 +1260,16 @@ 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*
%files libglapi-devel
%{_libdir}/libglapi.so
%endif
%endif
%if "%{flavor}" == "drivers"
%files -n Mesa-dri
%dir %{_datadir}/drirc.d

25
u_intel-drop-annotations-from-spv2hex.patch Normal file
View File

@@ -0,0 +1,25 @@
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

25
u_meson-lower-python-version-requirement.patch Normal file
View File

@@ -0,0 +1,25 @@
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