diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..d3967299657d7de3c1bd60c612b6287e771f7d80 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/mesa diff --git a/mesa-24.3.1.tar.xz b/mesa-24.3.1.tar.xz deleted file mode 100644 index 9da37adfe4d61b7182d469e38ee32c77dc8ce853..0000000000000000000000000000000000000000 Binary files a/mesa-24.3.1.tar.xz and /dev/null differ diff --git a/mesa-25.0.7.tar.xz b/mesa-25.0.7.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..22227323e16a69928626d452dbe056acf047e6f3 --- /dev/null +++ b/mesa-25.0.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:592272df3cf01e85e7db300c449df5061092574d099da275d19e97ef0510f8a6 +size 46849080 diff --git a/mesa.spec b/mesa.spec index ce36eb52cf34506260146e1926d4e2e888274015..a11b8ca3062dca5f42375056adff30cc56bf38f8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -64,8 +64,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 24.3.1 -Release: 2 +Version: 25.0.7 +Release: 1 License: MIT URL: https://www.mesa3d.org @@ -122,12 +122,11 @@ BuildRequires: python3-mako %ifarch %{valgrind_arches} BuildRequires: pkgconfig(valgrind) %endif -BuildRequires: pkgconfig(libglvnd) >= 1.2.0 +BuildRequires: pkgconfig(libglvnd) >= 1.3.2 %if 0%{?with_intel_clc} BuildRequires: python3-ply %endif BuildRequires: glslang -BuildRequires: cmake BuildRequires: python3-pyyaml %description @@ -144,8 +143,8 @@ Obsoletes: mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release} %package libGL Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-glx%{?_isa} >= 1:1.2.0-1 +Requires: libglvnd-glx%{?_isa} >= 1:1.3.2 +Requires: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libGL %{summary}. @@ -153,7 +152,7 @@ Requires: libglvnd-glx%{?_isa} >= 1:1.2.0-1 %package libGL-devel Summary: Mesa libGL development package Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 +Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 Provides: libGL-devel Provides: libGL-devel%{?_isa} @@ -162,15 +161,17 @@ Provides: libGL-devel%{?_isa} %package libEGL Summary: Mesa libEGL runtime libraries -Requires: libglvnd-egl%{?_isa} >= 1:1.2.0-1 +Requires: libglvnd-egl%{?_isa} >= 1:1.3.2 +Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libEGL %{summary}. %package libEGL-devel Summary: Mesa libEGL development package -Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 +Requires: (%{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-libEGL%{?_isa}) +Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 Provides: libEGL-devel Provides: libEGL-devel%{?_isa} @@ -181,6 +182,7 @@ Provides: libEGL-devel%{?_isa} Summary: Mesa-based DRI drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libdrm >= 2.4.103 +Obsoletes: %{name}-libglapi < 25.0.0 %description dri-drivers %{summary}. @@ -205,7 +207,6 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %package libOSMesa Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libOSMesa Provides: libOSMesa%{?_isa} @@ -223,6 +224,11 @@ Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele Summary: Mesa gbm runtime library Provides: libgbm Provides: libgbm%{?_isa} +Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using +# older mesa-dri-drivers together with a newer mesa-libgbm and its dependants. +# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 . +Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa}) %description libgbm %{summary}. @@ -255,14 +261,6 @@ Provides: libxatracker-devel%{?_isa} %{summary}. %endif -%package libglapi -Summary: Mesa shared glapi -Provides: libglapi -Provides: libglapi%{?_isa} - -%description libglapi -%{summary}. - %if 0%{?with_opencl} %package libOpenCL Summary: Mesa OpenCL runtime library @@ -300,6 +298,8 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release %package vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan%{_isa} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description vulkan-drivers The drivers with support for the Vulkan API. @@ -405,7 +405,6 @@ done %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc -%{_libdir}/libglapi.so %files libEGL %{_datadir}/glvnd/egl_vendor.d/50_mesa.json @@ -415,10 +414,6 @@ done %{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglext_angle.h -%files libglapi -%{_libdir}/libglapi.so.0 -%{_libdir}/libglapi.so.0.* - %files libOSMesa %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel @@ -595,6 +590,9 @@ done %endif %changelog +* Sat Sep 13 2025 Funda Wang - 25.0.7-1 +- update to 25.0.7 + * Wed Jun 04 2025 lingsheng - 24.3.1-2 - Only enable orcjit on no mcjit support architectures