From 60b9e9db891c344cb5d2f691a0701bf733be8163 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 2 Oct 2022 17:16:54 +0100 Subject: [PATCH] Rename mesa-vaapi-drivers to mesa-va-drivers If we are introducing a new package it makes sense to use the same name that Debian has for it. --- mesa.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mesa.spec b/mesa.spec index d9757ad..cae3143 100644 --- a/mesa.spec +++ b/mesa.spec @@ -2,7 +2,7 @@ %global with_hardware 1 %global with_vulkan_hw 1 %global with_vdpau 1 -%global with_vaapi 1 +%global with_va 1 %if !0%{?rhel} %global with_nine 1 %global with_omx 1 @@ -121,7 +121,7 @@ BuildRequires: flex %if 0%{?with_vdpau} BuildRequires: pkgconfig(vdpau) >= 1.1 %endif -%if 0%{?with_vaapi} +%if 0%{?with_va} BuildRequires: pkgconfig(libva) >= 0.38.0 %endif %if 0%{?with_omx} @@ -211,12 +211,13 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %{summary}. %endif -%if 0%{?with_vaapi} -%package vaapi-drivers -Summary: Mesa-based VAAPI drivers +%if 0%{?with_va} +%package va-drivers +Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 -%description vaapi-drivers +%description va-drivers %{summary}. %endif @@ -354,7 +355,7 @@ cp %{SOURCE1} docs/ -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ -Dgallium-xvmc=disabled \ -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ - -Dgallium-va=%{?with_vaapi:enabled}%{!?with_vaapi:disabled} \ + -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \ -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \ -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \ @@ -572,8 +573,8 @@ popd %{_libdir}/bellagio/libomx_mesa.so %endif -%if 0%{?with_vaapi} -%files vaapi-drivers +%if 0%{?with_va} +%files va-drivers %{_libdir}/dri/nouveau_drv_video.so %if 0%{?with_r600} %{_libdir}/dri/r600_drv_video.so