Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2025-02-22 19:04:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new.1873 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa" Sat Feb 22 19:04:31 2025 rev:531 rq:1247809 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2025-02-03 21:46:43.434445991 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new.1873/Mesa.changes 2025-02-22 19:04:36.705939394 +0100 @@ -1,0 +2,22 @@ +Fri Feb 21 14:04:21 UTC 2025 - Jan Engelhardt <jeng...@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 <sndir...@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" <m...@mixaill.net> + +------------------------------------------------------------------- Old: ---- U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch mesa-24.3.4.tar.xz mesa-24.3.4.tar.xz.sig New: ---- mesa-25.0.0.tar.xz mesa-25.0.0.tar.xz.sig u_intel-drop-annotations-from-spv2hex.patch u_meson-lower-python-version-requirement.patch BETA DEBUG BEGIN: Old:- adjusted u_dep_xcb.patch - supersedes U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch - libglapi merged into libgallium BETA DEBUG END: BETA DEBUG BEGIN: New:- 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 New: * u_intel-drop-annotations-from-spv2hex.patch * u_meson-lower-python-version-requirement.patch --> credits go to "Mikhail Paulyshka" <m...@mixaill.net> BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.aLvr1q/_old 2025-02-22 19:04:43.294213760 +0100 +++ /var/tmp/diff_new_pack.aLvr1q/_new 2025-02-22 19:04:43.326215093 +0100 @@ -43,7 +43,7 @@ %define glamor 1 %define _name_archive mesa %ifnarch s390x -%define _version 24.3.4 +%define _version 25.0.0 %else %define _version 24.1.7 %endif @@ -150,7 +150,7 @@ Name: Mesa%{psuffix} %ifnarch s390x -Version: 24.3.4 +Version: 25.0.0 %else Version: 24.1.7 %endif @@ -181,8 +181,8 @@ Source10: Mesa-rpmlintrc Source11: Mesa.keyring Source12: README-suse-maintenance.md -Source20: https://archive.mesa3d.org/%{_name_archive}-24.3.4.tar.xz -Source21: https://archive.mesa3d.org/%{_name_archive}-24.3.4.tar.xz.sig +Source20: https://archive.mesa3d.org/%{_name_archive}-25.0.0.tar.xz +Source21: https://archive.mesa3d.org/%{_name_archive}-25.0.0.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 @@ -203,7 +203,8 @@ Patch500: u_dep_xcb-s390x.patch %endif %ifnarch s390x -Patch600: U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch +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 @@ -383,7 +384,9 @@ 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} @@ -490,7 +493,7 @@ programs with Mesa. %package libGLESv1_CM-devel -Summary: Development files for the OpenGL ES 1.x API +Summary: Development files for the OpenGL ES 1.x Common Profile API Group: Development/Libraries/C and C++ Requires: Mesa-KHR-devel = %{version} Requires: libglvnd-devel >= 0.1.0 @@ -505,7 +508,7 @@ 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 APIs. +using the OpenGL|ES 1.x Common Profile APIs. %package libGLESv2-devel Summary: Development files for the OpenGL ES 2.x API @@ -553,16 +556,6 @@ 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 @@ -582,6 +575,16 @@ 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 @@ -591,6 +594,8 @@ # merged into libgallium in 24.2.3 Provides: libvdpau_gallium = %{version}-%{release} Obsoletes: libvdpau_gallium < %{version}-%{release} +# merged into libgallium in 25.0.0 +Obsoletes: Mesa-libglapi0 < 25.0.0 %description -n Mesa-dri This package contains Mesa DRI drivers for 3D acceleration. @@ -886,7 +891,8 @@ %patch -P 400 -p1 %patch -P 500 -p1 %ifnarch s390x -%patch -P 600 -p1 +%patch -P 700 -p1 +%patch -P 701 -p1 %endif %patch -P 1222040 -p1 %patch -P 1222041 -p1 @@ -1023,77 +1029,78 @@ find %{buildroot} -type f -name "*.la" -delete -print # libwayland-egl is provided by wayland itself -rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* -rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \ + %{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 -f %{buildroot}/%{_libdir}/libEGL.so* +rm -fv %{buildroot}/%{_libdir}/libEGL.so* # in Mesa-libEGL-devel -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 +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 # in Mesa-libGL-devel -rm -rf %{buildroot}/%{_includedir}/GL +rm -Rfv %{buildroot}/%{_includedir}/GL #in Mesa-libGLESv1_CM-devel -rm -rf %{buildroot}/%{_includedir}/GLES +rm -Rfv %{buildroot}/%{_includedir}/GLES #in Mesa-libGLESv2-devel -rm -rf %{buildroot}/%{_includedir}/GLES2 +rm -Rfv %{buildroot}/%{_includedir}/GLES2 #in Mesa-libGLESv3-devel -rm -rf %{buildroot}/%{_includedir}/GLES3 +rm -Rfv %{buildroot}/%{_includedir}/GLES3 #in Mesa-libEGL1 -rm -f %{buildroot}/%{_libdir}/libEGL_mesa.so* -rm -rf %{buildroot}/%{_datadir}/glvnd +rm -Rfv %{buildroot}/%{_libdir}/libEGL_mesa.so* \ + %{buildroot}/%{_datadir}/glvnd # in Mesa-libglapi0 -rm %{buildroot}/%{_libdir}/libglapi.so* +%ifarch s390x +rm -v %{buildroot}/%{_libdir}/libglapi.so* +%endif # in libwayland-egl1 -rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* -rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \ + %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # in Mesa-dri-devel -rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc +rm -v %{buildroot}/%{_libdir}/pkgconfig/dri.pc # in KHR-devel -rm -rf %{buildroot}/%{_includedir}/KHR +rm -Rfv %{buildroot}/%{_includedir}/KHR # in libgbm-devel -rm -f %{buildroot}%{_includedir}/gbm.h -rm -f %{buildroot}%{_libdir}/libgbm.so* -rm -f %{buildroot}%{_libdir}/pkgconfig/gbm.pc +rm -fv %{buildroot}%{_includedir}/gbm.h \ + %{buildroot}%{_libdir}/libgbm.so* \ + %{buildroot}%{_libdir}/pkgconfig/gbm.pc %else # package in Mesa-dri -rm -rf %{buildroot}/%{_datadir}/drirc.d - -rm -f %{buildroot}/%{_libdir}/dri/*_dri.so -rm -f %{buildroot}%{_libdir}/libgallium-*.so -rm -rf %{buildroot}%{_libdir}/gbm/ +rm -Rfv %{buildroot}/%{_datadir}/drirc.d -rm -f %{buildroot}%{_libdir}/libGLES* +rm -Rfv %{buildroot}/%{_libdir}/dri/*_dri.so \ + %{buildroot}%{_libdir}/libgallium-*.so \ + %{buildroot}%{_libdir}/gbm/ \ + %{buildroot}%{_libdir}/libGLES* # glvnd needs a default provider for indirect rendering where it cannot # determine the vendor -ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 +ln -sv %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 # pickup pkgconfig files from libglvnd build -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 \ +rm -fv %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc +install -vm 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \ %{buildroot}/%{_libdir}/pkgconfig/ for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a - make %{?_smp_mflags} V=1 + %make_build V=1 make install.man DESTDIR=%{buildroot} MANPATH=%{_mandir} LIBMANSUFFIX=3gl popd done @@ -1106,37 +1113,14 @@ 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 -%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 +%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 %if "%{flavor}" != "drivers" %files @@ -1247,6 +1231,7 @@ %endif %endif +%ifarch s390x %if "%{flavor}" != "drivers" %files libglapi0 %{_libdir}/libglapi.so.0* @@ -1254,6 +1239,7 @@ %files libglapi-devel %{_libdir}/libglapi.so %endif +%endif %if "%{flavor}" == "drivers" %files -n Mesa-dri ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.aLvr1q/_old 2025-02-22 19:04:44.514264569 +0100 +++ /var/tmp/diff_new_pack.aLvr1q/_new 2025-02-22 19:04:44.546265902 +0100 @@ -20,7 +20,6 @@ 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" @@ -66,9 +65,6 @@ 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 ++++++ mesa-24.3.4.tar.xz -> mesa-25.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/Mesa/mesa-24.3.4.tar.xz /work/SRC/openSUSE:Factory/.Mesa.new.1873/mesa-25.0.0.tar.xz differ: char 26, line 1 ++++++ u_dep_xcb.patch ++++++ --- /var/tmp/diff_new_pack.aLvr1q/_old 2025-02-22 19:04:45.474304550 +0100 +++ /var/tmp/diff_new_pack.aLvr1q/_new 2025-02-22 19:04:45.510306049 +0100 @@ -1,16 +1,16 @@ -Index: mesa-24.3.0/meson.build +Index: mesa-25.0.0/meson.build =================================================================== ---- mesa-24.3.0.orig/meson.build -+++ mesa-24.3.0/meson.build -@@ -2103,8 +2103,10 @@ if with_platform_x11 +--- mesa-25.0.0.orig/meson.build ++++ mesa-25.0.0/meson.build +@@ -2150,8 +2150,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 : '>= 1.8', required : with_x11_dri2) + dep_xcb_dri2 = dependency('xcb-dri2', version : dep_xcb_dri2_version, required : with_x11_dri2) + dep_xcb = dependency('xcb') - dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13') - dep_xcb_present = dependency('xcb-present', version : '>= 1.13') + dep_xcb_dri3 = dependency('xcb-dri3', version : dep_xcb_dri3_version) + dep_xcb_present = dependency('xcb-present', version : dep_xcb_present_version) if (dep_xcb_dri3.version().version_compare('>= 1.17') and ++++++ u_intel-drop-annotations-from-spv2hex.patch ++++++ >From 93d7b176c290c8fce39349d9f320b1b302d79e83 Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka <m...@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 ++++++ u_meson-lower-python-version-requirement.patch ++++++ >From accbfc5464112a8cd368f0293a7f1e91ff769304 Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka <m...@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
