From 86f887dcdcff8ac9bc62e78aa751f63359c6eab3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 20:34:16 -0600 Subject: [PATCH] fix(mesa): Deprecate libglapi (#3807) * Pull in upstream changes Signed-off-by: Gilver * Bump release? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/mesa/mesa.spec | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index e8140d9b98..b28745bee9 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 1%?dist +Release: 2%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -264,6 +264,7 @@ Recommends: %{name}-va-drivers%{?_isa} Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 +Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 %description va-drivers %{summary}. @@ -335,18 +336,6 @@ Provides: libxatracker-devel%{?_isa} %{summary}. %endif -%package libglapi -Summary: Mesa shared glapi -Provides: libglapi -Provides: libglapi%{?_isa} -# 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-libglapi or 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 libglapi -%{summary}. - %if 0%{?with_opencl} %package libOpenCL Summary: Mesa OpenCL runtime library @@ -510,7 +499,6 @@ popd %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 @@ -520,10 +508,6 @@ popd %{_includedir}/EGL/eglext_angle.h %{_includedir}/EGL/eglmesaext.h -%files libglapi -%{_libdir}/libglapi.so.0 -%{_libdir}/libglapi.so.0.* - %files libOSMesa %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel